From 476a2d1c5af25afe5173916bddb69ee3bff93b30 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Mon, 18 Jul 2016 10:01:51 +0100 Subject: [PATCH] Dump laravel-elixir, use gulp natively to compile sass, autoprefix declarations, and compress assets. --- gulpfile.js | 4 +++- package.json | 1 + public/assets/css/global.css | 2 +- public/assets/css/global.css.br | Bin 1002 -> 1002 bytes public/assets/css/global.css.gz | Bin 1186 -> 1211 bytes public/assets/css/maps/global.css.map | 2 +- resources/assets/sass/components/fonts.scss | 5 +++++ resources/assets/sass/global.scss | 1 + resources/assets/sass/layout.scss | 10 ++++++++++ 9 files changed, 22 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 13cfb54a..35220c94 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,14 +2,16 @@ var gulp = require('gulp'); var sass = require('gulp-sass'); -var zopfli = require('gulp-zopfli'); var brotli = require('gulp-brotli'); +var zopfli = require('gulp-zopfli'); var sourcemaps = require('gulp-sourcemaps'); +var autoprefixer = require('gulp-autoprefixer'); gulp.task('sass', function () { return gulp.src('./resources/assets/sass/global.scss') .pipe(sourcemaps.init()) .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)) + .pipe(autoprefixer({browsers: ['last 2 version']})) .pipe(sourcemaps.write('./maps')) .pipe(gulp.dest('./public/assets/css')); }); diff --git a/package.json b/package.json index 3aa11016..26d366d5 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "license": "CC0-1.0", "devDependencies": { "gulp": "~3.9", + "gulp-autoprefixer": "^3.1.0", "gulp-brotli": "^1.0.1", "gulp-sass": "^2.3.2", "gulp-sourcemaps": "^1.6.0", diff --git a/public/assets/css/global.css b/public/assets/css/global.css index dde2b38c..5da3c3cd 100644 --- a/public/assets/css/global.css +++ b/public/assets/css/global.css @@ -1,3 +1,3 @@ -html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:flex;flex-flow:row}#topheader a{padding:0.5em 1em}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em;fill:#268bd2}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} +html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:-ms-flexbox;display:flex;-ms-flex-flow:row;flex-flow:row}#topheader a{padding:0.5em 1em}#topheader h1{font-size:1em;margin:0}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em;fill:#268bd2}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}article h1{font-size:1.2em;margin-bottom:0}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}code{font-family:"Operator Mono","Monaco","Inconsolata",monospace;font-weight:200}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} /*# sourceMappingURL=maps/global.css.map */ diff --git a/public/assets/css/global.css.br b/public/assets/css/global.css.br index 720840d768853ae3d942c4dce0fbffc32f33b79e..98698a2079f09ecd0a18e2f0460bf3d6d13fe842 100644 GIT binary patch literal 1002 zcmb2<;9-zq-`7jMqc-)3N@ zR_Um|vrG8(>eiV*%y0{-yL;%;&$4}?i^MgnCIz3q z5*ho#caHtzi*hISomezc^hHznrIZ-^-wff;CgeU>O1eDNt@u;&d_NZ5_0#|UO~3NY zZ0pL2W~l~^KR5HX{*Jp4bmES7OtF#Sa<+wMZ?`PXC|D<)z2NYwSBtZng0puU9EGOLMf=c(1(8;w7>AEsqkjTv8l61M@;Rz1WWBhkiD`$)0$!g=dG6 zRovL`nA!xs=OZHEv!(VLowZ5(E3#&2`VqL#N%q(gS6KkVBr@@=- zH{1zY&t`d^%o9A-(D)+Z-nkZ@=PPoAPjVI4GJNvk5|(kk)BAO4{SvX4GKaDzGJTi1 zC4OwC*iV)WXPH`!pcmEceYLM*vApMf{9tbR zV>zihTg~??goN)L%C|LSi(}i+&54yefC~ zOh1ED|F$tNj=lG0Qs}~vcW(=|X1>;Al%JY+;`RSSTZ-?+evodzyHLbpk$%TRHJiPv z;dvW2dEM0xf5EY|_4DtV`O$ZF+;drT{;92R^rwR+w)TlU=jZ)dzNP#6vHp*XW@d3} zt-Ye$u*Bzmh5s~_(&Fb%sYY|{zwS3btPyQD^{t;5^R*~+*IvGC?x|;$N26vgtLW*LG)ajPTzc*U+dGYuerj!OyLaB% zpIkEUSLTjQ<=Rj78BgBEH~*Jst4GOm&KGHa;=#d_|DH zsjKS=rHgrUShg;2IREe43}@CI>Tk+V8^^~=JUiLDekuQBJMa4;+t(C%-MqtlL?lP$ zbBe9|SFhN)x1*z`yWa?Ed7AY6y2zWp4vj+bvXH_pli$6|FplQl)R4aUhoaTT^%mT> W_T4XbpLj!_{ao+9yfywdM~nfwzAg8$ktpxpB1a$1KW}HPx_s*4ly6rWQcc!KZu7ZOrTK(q#ndo{K*lJY zSl&eoE?@gDd-&V4h=rn)Hy0=U%(P;#a5#}))v$!&?jO$A{>KycIZGEDxX<)OevWH~ zuI!wpa~3Hv-L~lK@7mV?w?|2Ljvb#^?ezODc`m0qU3M>8{#mWrR?)O|{ru}C>NPc{ z=2{Q+eubW!x!;5LbMAD_^10rg-ToCa@!NMyEv=T2*#ClOcG5P%{bsU-`x4lcCrVsi zr?Ou~aZ#4h+x({JhwRU6wj8_aw4>8RaHhZ8kwr$S@>7@co^Im!T<#H@|EuV7Tvg<@ zP$%0J_Z75NKdD}OSFEv6(tFZFOEVoN5yJ;dB4&0*DcSvW-_p0^`N}rM3(I4YIoh81 zJYSN@^5x;#b8PYIVZRj~J$cF>%s$iHE?DYP-%_V`rNk*buA;|H8@Me~Is!{2zN&2V ziaR)idv5opqkDt28w^X27v64NoLl*R;~(uNQHjWx-SRj7%crY;J$tqA*<^ux*Hbs$ zUFX`ab6EaB_+s9WJqt5#+gQDrk-Vie~!mB+fU@# zM4n`xDdpmPc>DP$;vMz2fBvgfUMgpKw86al;N#Rg-pD>(^;#B%B z^m#>vvZIC1!k8|p4c^_7{~pG7Z!LE`FtMh9|L)Ik6Xb-X_N7TxuTM2`2wiz7QuEh= zWcI>alWul2iamedn|J;8jd|(WUf12WC1yvTyj8yb>M5)8WvBE1ZrL6!ziaK{+dg?4 z*I%*!x_95!l^lgvjiqyzZv7@{R&dQEtAX+3zp1-5j}$!MH{(}-vT&l#owRCr~$tXBNkANd}}w4IT8$2k|iyLC)B@sNqg zNw(G-_cvZ#EO$_1l{hTYYQMHZ>i`CFhUtGYpkpqh~1f+D1xa%VPJYI+q)Jtj-7T zE^;;eyhf;aPF7Ea@rB1lGo;_;Uf(`_+q5$;q}4AdW*%eQditl^H6^~#q)F#|=KWKg X5$2-doX_mt5Oeg_pQ&QYp0EG__0H(^ diff --git a/public/assets/css/global.css.gz b/public/assets/css/global.css.gz index be655c01a3ca89bd9a733e61e6bb6fecc555cc63..b1bb48219ea86db39a2613c29109a435db51b8f4 100644 GIT binary patch literal 1211 zcmb2|=3oE;Cg!NESEtL|n9v`EcK>W9%DvQll|{Q@UE?ANp`#aduN{j=g@}-kZCLBES>yp%$NvBobsjm4OmiGAWH#;M(=L$0(w9UK2<33k|lPV&(o_{;h(yc*gSJW%EwjeZP}j{kQ0}q^fG7fSu-K z&Z+A!ZPY28#m$n-?Kt&z*3=ssu^W2Z)J~cl>f(KUQBqObuvtxWr`eHDUEPajZ|I2C zSv_$9!={Qo3$$h)|M*{R*NLewa}*ndYz-{GLBVlGq_Ua9g;aQjVnn+(sN z$vmQ(I|WYW6n>u|+HH5~M#tRrr>)w!zpiim)}*s6AbOqTh7$?P1w__w9`N9%U#L`E7UJ zwOuSPxX>w0>cmAio~?EY0yo;;sok3QDRQyeyygUjA3%!paElINY7fA!IscXEx+Y>_M!vdDFLUwTtbJa>=8yGb9Urk$AbOygu{P*&*X zy*t|<$}llsf3dt}PNL0h?REEyzi7F1U;bd1HAV4Q>dIY@wI5yEB0Qsj>EP!~ZR6>h zQY}q$thf(V~$BzL_mzy2R~Q!$w)^K9v7lUTktKi1tn{WNn!Wz7wbbC;%j3BEdf;`QVc zwWr^Nc;~hy-+iB#Gw;ggozgdKE;p`SUi|$>#k{_|2ELDU_Fa1}f3!Fz-#=l^(+RI% z%D(;WBWnHqMdlRNR|}ViI`7#g{wz4=QxCVFb$O;2OO~lovy0g|m4&%Z9Pa8@V&1Ib z+{w$NR+xOqJ6Z7bmlxZ^!cYfn=kyTKUu1G(v&TE6WVsp;C#ZJoH*m4K1Xmw>Y>cZ)@k~RKMypm zkLM~hwSV`_?oia)Eh55+=M&Y%>?n)>sp^ z-oIygyve(empin&Kk=>iPrteFaQ{r{+h%=!K`XaTos*;WJ%TrXGp7KLk#=*|OOvg~ zZ4@4TgR#y!cVY`%Z^@7th~WQ+4i*eQvDZ{!dyv z%jcNQ;V@myyQp4K=kMZ7;Xm!ydoQs}in~?x?DOLKudiMurFma`C1byNO78QT?_Za{ gzjk59>ZJja9UA6pn_fS7^y;d-l=o>vP96pZ06-K`d;kCd literal 1186 zcmb2|=3oE;Cg!!_&zqj8@%-EG|M1MRylE?=Z8P~NsCyiDlhbZK$mr```Tf8H%N+jl zmF3Z`Dt5I_so7a6-){R(6WwzsujiiT#B^(A`*~+}Y;`DWJDbL~ZOy@kzp3n(!*bQ; zui0#$m$!^J|NJ)72g{b(MBALZ{rIQGuB+~8AHzdt-}#%vA`$jtL2-F~@$~1cA-4|v zbdM99p{*VAE^Eo=le#arvFTZvHg22xXG;3imdCd^|CEP$)}An4%%3b=XO^{7ApQ8~ zm&ztLnPzRC_vrUO!{W5LUL99o3GGY~(&hc45~BC%sjF{hli>U{SAu5S>}G8c|F~n{ zk?`V&jpy$EZ+)yAz3cq#>!R@=j{f3WKHcO_P5^64_rKQKS6*v5rZk(JRC{gb-g@O} z+1=CEYTjN|EqEO4T>9m@Vd(|84b2bNTALr(euld$DmdY8ZshFn44sXe+%)HW6nJAJ zwUMoZ+wU%~#)@;XKR)xj>8xIBn;jBV+KiQDy_FaMv} zUf8qe)Bj8{qtdApUcOp%dx2Bf=1H?BY+vWWE52j%x#ij~%!AygS1%6p7PvP6(o9-E`g{5`2<;R2I*DmyY|#0pt1>v#VMdwlz7 zTYf`k^MV!0+l_W5#>vgI{eE!w@1*rU5Bd%r@U94xT@)6bv|<&5#@8=RJ${!sC+;{> zbZ2qI`T5HyOmB30F3p_7JW2Rn;)2Vo>pHjXZoas(HR8s_#2QiCNlNW^i+jR99m?9N z{Na*A+y9l`G51S3>?0Q?Zs=KlKdWwL-R9kE7#nShKVMR~@g}eAbLfPcI~MM;+tTwt zc$PD_nVIg&G35W@Ui$b6W2=9&nt|u-&{Jk7n%{m|Qocod!RB`fwzg-SdA~YUb1k%7 zEx}>Gsr%^b*YRvZHGKzIDj6>Cy_qm)o^8G4$K+R&6#U(6w6EwO==z3(Osbb&`bLHv$V_jDR4CeY%{RGI+OCspk7MPhB!}fEXErs@y^}7+ z6Sg>Q{|DRBJ*Tg92h6B{dq!GqYczA$mQP(Vkz!jPo7S7gAHMdbZ$&G2^`tD%uaER= z+_@Wn@4wQUuViHYBK^XP`5)JdH9GFnkG@^APbbX3@tB9#r#C@l84q*#f^gpNHad4PiQdA%OrellL%T3H8(JIGo zi|u&0s>Nb^);d9jc-7=F8Uob7PKa<0D zhspWqm%gAGN=+`09Z^2oVUnNzc}ahr+9|11xeNOzzrTO#wX5pETpOOJ65`Dr zn*U-&E|yHPJ6#xeiLvv5ffYl{tr`6$8(CA{Ctl8Sj=8uy=l;Ifs@3+4vXjmDBKa5? E0JWG*O8@`> diff --git a/public/assets/css/maps/global.css.map b/public/assets/css/maps/global.css.map index 7cd76bae..1ffcfb9f 100644 --- a/public/assets/css/maps/global.css.map +++ b/public/assets/css/maps/global.css.map @@ -1 +1 @@ -{"version":3,"file":"global.css","sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\n//boxes\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n fill: $blue;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"],"mappings":"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","names":[],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"names":[],"mappings":"AA0BA,KACI,6CAAe,CAClB,KAGG,YAAc,CACjB,KC5BG,qBAAuB,CAC1B,qBAKG,kBAAoB,CACvB,WAGG,oBAAA,AACA,aAAA,kBAAA,AAAe,aAAA,CAClB,aAGG,iBAAmB,CACtB,cAGG,cACA,QAAU,CACb,IAGG,iBAAmB,CACtB,aAGG,gBAAkB,CACrB,MAGG,yBACA,gCACA,cACA,cAAgB,CACnB,aAGG,YACA,cACA,SACA,UAAY,CACf,QAGG,oBAAsB,CACzB,+BAGG,YAAc,CACjB,eAGG,UAAY,CACf,cAGG,WAAa,CAChB,gBAGG,oBAAsB,CACzB,MAGG,WACA,WACA,YDnDe,CCoDlB,OAGG,gBACA,iBACA,gBACA,aAAe,CAClB,UAGG,gBACA,iBACA,gBACA,eAAiB,CACpB,gBAGG,gBAAkB,CACrB,aAGG,kBACA,yBACA,gBACA,qBACA,iBACA,kBAAoB,CACvB,iBAGG,WACA,kBACA,0BAA4B,CAC/B,YAGG,aAAe,CAClB,kBAGG,iBACA,kBAAoB,CACvB,gBAGG,aAAe,CAClB,YAGG,WACA,YACA,4BAA8B,CACjC,eAKG,iBACA,mBAAqB,CACxB,WAGG,gBACA,eAAiB,CACpB,WAGG,gBACA,kBACA,iBAAmB,CACtB,SAIG,iBAAmB,CACtB,eAGG,oBAAsB,CACzB,aAGG,YACA,UACA,kBACA,MACA,MAAQ,CACX,cAGG,eAAiB,CACpB,KAGG,YAAc,CACjB,0BAIG,KACI,iBACA,iBAAmB,CACtB,OAGG,iBACA,iBAAmB,CACtB,SAGG,YACA,YAAc,CACjB,CAGL,0BACI,KACI,iBACA,iBAAmB,CACtB,QAGG,oBAAsB,CACzB,OAGG,iBACA,iBAAmB,CACtB,SAGG,WACA,WAAa,CAChB,CC5ML,KACI,kCACA,6BACA,iCACA,eAAiB,CACpB,KAGG,6DACA,eAAiB,CACpB,cAGG,gCFZmC,CEatC,GAGG,gCFfsC,CEgBzC,aAGG,oBAAsB,CACzB,IAGG,4BAA8B,CACjC,oBAGG,oBAAsB,CACzB,cAGG,oBAAsB,CACzB,OAGG,eAAiB,CACpB,OAGG,WACA,UAAY,CACf,KC3CG,aHMe,CGLlB,SAGG,aHEe,CGDlB,EAGG,aHWe,CGVlB,KCRG,UAAY,CACf,SAGG,YACA,UAAY,CACf,+CAKG,UAAY,CACf,sBAKG,wBACA,qBACA,yBACA,cACA,yBACA,iBAAmB,CACtB,aAGG,4BACA,yBACA,aJvBe,CIwBlB,gBAGG,yBACA,aJ5Be,CI6BlB,uBAGG,4BACA,wBAA0B,CAC7B,OAGG,mBACA,cACA,WAAa,CAChB,wBC7CG,0BAA4B,CAC/B,8BAGG,YAAc,CACjB","file":"global.css","sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n$font-stack-code: \"Operator Mono\", \"Monaco\", \"Inconsolata\", monospace;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\n//boxes\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\n#topheader h1 {\n font-size: 1em;\n margin: 0;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n fill: $blue;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\narticle h1 {\n font-size: 1.2em;\n margin-bottom: 0;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\ncode {\n font-family: $font-stack-code;\n font-weight: 200;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/resources/assets/sass/components/fonts.scss b/resources/assets/sass/components/fonts.scss index 5c0816e4..36fd94f3 100644 --- a/resources/assets/sass/components/fonts.scss +++ b/resources/assets/sass/components/fonts.scss @@ -7,6 +7,11 @@ body { font-size: 1.2em; } +code { + font-family: $font-stack-code; + font-weight: 200; +} + #topheader h1 { font-family: $font-stack-body; } diff --git a/resources/assets/sass/global.scss b/resources/assets/sass/global.scss index 358398b1..7318eb60 100644 --- a/resources/assets/sass/global.scss +++ b/resources/assets/sass/global.scss @@ -3,6 +3,7 @@ //variables $font-stack-body: "leitura-news", serif; $font-stack-headers: "prenton", sans-serif; +$font-stack-code: "Operator Mono", "Monaco", "Inconsolata", monospace; //solarized variables TERMCOL $base03: #002b36;//brblack diff --git a/resources/assets/sass/layout.scss b/resources/assets/sass/layout.scss index b97bab26..ed697f48 100644 --- a/resources/assets/sass/layout.scss +++ b/resources/assets/sass/layout.scss @@ -20,6 +20,11 @@ html { padding: 0.5em 1em; } +#topheader h1 { + font-size: 1em; + margin: 0; +} + nav { padding-top: 0.5em; } @@ -127,6 +132,11 @@ article header { margin-bottom: 0.8em; } +article h1 { + font-size: 1.2em; + margin-bottom: 0; +} + .post-info { font-size: 0.8em; font-style: italic;