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 zcmVLWehy- zYyc(c^hSSTPSY$~iv zsoMlf7_03JA_E>`UIzdJp++uUh^NB&f$VFM$%G8JGC`zd1s(yQpu?wIWtAb+KvKU& zL~Hp%!}LAAh3$ThR(diL1+Sql1%WRKFzjpW3t%ednn}rS5z2sp=wRN?gbe4X zY!k@}bA15vObQbmL)?w^rGKOr=^VmpkplM|+84%|7Wo8dLmYi5Qs{e!j(zHwg{%ca zTfiOl4~-L;3#wsGg_9hid`X@J?+xSNop<9N8h$+~@2L{$OwLG?WTMfK8wmq-)j6h3 z+d1rOyzsqWmHOC7R9q>~74}q>dBs|prg)5t88l>C5v9)X z2JR@yP9}y1ySd!IV|1SSX}Gd?E9Aa2leP|@`bmXIbms}^4ymd<4nABaj9m?D7MYh1 z^<7_KUe9<^FEvF)$Rg2hoCLL}fY1K+m_r4)C+v62Ghba8=E;q(r4QpiOW#ztta3`( z+zrGOY$Wq!JxBFQU7g!oT9-%IQiSDV=hqbMj)*967j{%}w3F`cXfs<2vVdo^_#ry+ YuQ&_ZzTb04k=P#x&W*lqtWP||GrHsLGXMYp literal 1002 zcmVle2ST`Dr=;I6%m6dVr(=-TVpbPsd=sLmP0w-vaa>oJD9Y z9h{|{q9Ov@IF65swvYXcA}yRg4i#HXU)kUpb10!1OOoL^HY@@ZG2oiy8jmUyHSOLBNrG za1Y)2_K+SD8op*4d#`0QKvk*2StsfU6~Y=F9&iISWMQ zILC13lsumkeP=mWRj*^Sb zZpR6s?%Ku^VZt;N$p(ek-?7o79>Ex@7Y7fI5@iOM^tb$dS?_~|ix1Lh4?o=2S 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 zcmV;s1VsBEiwFP!000021D#e`o2)hteZRkgp=KsYr%hAUJ7jyzzUL*o08uz)Y+{RA zE+79rri{C(rL*0&Ey+j6N0voJwdgX)S4*v0StP9%Z-!T343fFx_3{c$UZF)1!`t3{l(=)l4Mvajl)k+66$FvmlmB< zKO@yt2!-_)+%y7q39Ah&1#WG0>TSb1^$z=w+9X`qCQolFKCSC9M5cX5-!VJ~ArjAei8Wp4LEDKKI;Xd;N0D86_oQ5I!lB36-zXu`F?# z3j}QoL6zHTmDng4eQYvAsaD+CMmf##PW)ZqMNXYT`a4Spa8OXyr3$X z$MOFry2zF3Y$1RWJuo@+SQ3O=Vg=?(192r2sU-Fhx7kNLXi52F3>7K45Xo$D_mCBf zKGN8TooD5R_gW1Zo#DBtarA)op|m3kBlWL=_JS;?P;a~9PxXqfhk%+(&MKCJF1oQV zG!(owiLHI=EXmwn1ET~lg4ylE9p2wQGY;ZtAaYK(L%O#XZc}kWW*W%RMhvw+AQ0Gw z?k3uv@>!!Mo`YZ@_);eOteGNG_9TL@kTsPe^@I^E?w&-LT%xHA?lw<*#hKh~GR(9Y zaS}LfMDKOkCKqkI819nr8kWeE<|xUDQfgJRy}5_s90CK^=%<97VLY2FuHSR?DnyIZ z@IGpkA;x8?y5lS2*0d9ta00>eX)80ADH?==oH`4`_tZ5CAil;Y*Vs#fn-PuCu0hu? zKE~B^B8gLKAp8UjnNgx8O!sF`T>(6TJHl}r^s~tee;p4m{0B7_9D+A%8|IP(_k-gt zyO+xYfO&k_NY2uiN)hVA$m^5Heaq}rOKpZ@-S2K}p479s8`wP4fvu-=_xO08j@>X# z;w-+_=O4v$TyIZctmTmF=^gF+Ocgu#=xLM%>Y=AqL%g;Z=2Kkqj0;XXcWFulYBe&0 zL^jSOp>0A4M<>)=?5qj74FV={W5P>g5zF-Gw)VLyushiGMS~hh>EJUZRd^ZN{~#ZJ z_(f(DtR zn<%VSuTPApUo`Gi>9{J3@(!<0XW5~{kC_|WHjYkGskN1yY%2Fy4R5mv5DYRagKFtC zwZ}Xl;_(V@AQM=0C)@lt*5S6Pgn5PeDpT9=r*qYHKPrpe<3XWqiGZThu4kL1d?9ba^~}+fA#9>VrEOx>Ks3_lx^pH_w}dm*3g)% ZrBE4&C^sgu>)_(*)gKy5%P|QI002M~QG5UZ literal 1186 zcmV;T1YP?diwFP!000021Fcu*g5)L){=ZM*%%*OZsarj150EEF$3`A2gTVn!OL_Oe z;5lp$cd2(4@RNBD# zM_v(_D=Sp)YNWHtE$OxfE;==Vww3&pXO)EG+6nx3R!M!xGoue<6Mi;oxe#Z^^XVfr z*#ergp5pudF>_{}N{H3!61ij&Ee-S}R4(%6MNMgf5udEoQky)x1%MavxW2?!bK!x` z-T#H-EnB+J+t(Fe@WuKHrPoE$l!G+MChI;&h1BJC-OJW|?bRi4 z<5NR*^w%+U&_=L>;jKG2z_-i`dRkLp-ECQ$S7|e!qr28Z+0<{%N=`yr@ zdMU&*SQ=>MsUJ$rbd-5qQCMk3{@sF4+6y#^G)C8q^#A5P(7e3z|7jL7b(N6m>Z04A zLRPbqn~=AzNDUXbv(Be0=r>YFmwTgDOBC7dM z!oW*-Rvn^NTVklH04VkJf{aem36Z$Oa@?a>&!4A|mw`g(8v|?uk`wM>pwp{K!*RROI+V|2tQe(VX%y+-)erDezUu*0f9Vo z^U@&L>~41RRgiq#I7c0}XK(OHcLRntHM(pu5BNuQt6;Ee2%~bc>vSB*F<1ekNT(=B0xzrxqB!2%`H=}lQwz-ecISs-${)=guH8$O8&yg_;L zVnC7 z3wx4kN%i6{d`Am``@htUZz3``=x5OApYg92fkC=2TiblTELKl}#z;!?ymv5MCMs>3 z9PY9 zTO`KY7P#T6ggCcZqkl~vj2GQVNso(4R8O!+&_TJO6Ylf%$8bU(~& z2HXNe#q^F+m?DBi;^GAYEiWX9^a3B3^Q4b{CdwMhZK02o@88PnMJ2&)JPhR+7lVi? z{#_K&bdo;HabD5^iNG*A09@Lbk2J9bWba|qYC~MnyKLXSU3#lO0UeVz4p|NW0JWG* AO8@`> 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;