From 99231d8114b7d158a76ba6c40bf9b6a478dc1b84 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 21 Oct 2016 15:49:56 +0100 Subject: [PATCH] Squashed commit of the following: commit 54a5ba8c4942b57b42168a353b6649be325940a1 Author: Jonny Barnes Date: Fri Oct 21 15:47:27 2016 +0100 Add co-ordinates and tweak microformat markup of location data --- gulpfile.js | 1 - public/assets/css/global.css | 2 +- public/assets/css/global.css.br | Bin 1013 -> 1015 bytes public/assets/css/global.css.gz | Bin 1216 -> 1240 bytes public/assets/css/maps/global.css.map | 2 +- resources/assets/sass/layout.scss | 5 +++++ resources/views/templates/note.blade.php | 2 +- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b4517563..6ab4cda5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,6 @@ 'use strict'; var gulp = require('gulp'); -var pump = require('pump'); var sass = require('gulp-sass'); var brotli = require('gulp-brotli'); var uglify = require('gulp-uglify'); diff --git a/public/assets/css/global.css b/public/assets/css/global.css index 3bc3ee09..6262d99b 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:-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;font-size:1em}textarea{font-size:1.2em}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}.coordinates{font-size:60%;color:#839496}.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;font-size:1em}textarea{font-size:1.2em}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 a0f3474b32041a7cbac7832ae15cd4bcd2c02f15..996165aecea01a3a3547d6ceba782dd5d8ee72ac 100644 GIT binary patch literal 1015 zcmb1+;9+>uXY}uXJbJa&a8|?rfRf%jRYP8@_0BD^sqym*N_Nf750!A~YkYFWJ#S4M&$aXO3*Vb9iBGwB zh^yqFR%Xz;=sk^^#U9(c1vlnt?=IT(c)>}RuuoP;-`h`KRGe^}~#d-0e=dC_hCEh65d2j#yx%Za0==^(2)k>dwg$gmwC_lvhz{A0D zOZvm8{c*FH9!yfpieH)4Yd-bLT&3VcE?PGgj2P6J8rUlyN_Sjtt{KCpE_P zvCNa?N?PZ{urkbSHEK|mnsI!l!V{TLo{4J?++;m+Ud8;N8Ow_cb9_CrgudII5nG`% z!P)wH#9gHi4AVLmbKm62&A%9Fmb!JqHis7-It{PCuN9oZt$SF4OWo3weQN46+puZM z=?A~>uGwKe_tTu9Y3H8w*l??5eck!UAmDnu*eS=Y{jZZ8ZrrX@Or>cXkywYN>( z%zc>;^F`gfcacL%H^1!Ys(_EVGWJu?aLy8#RAh7HYkgtF&jX*Zm}UdD)-KOC~>`w)~&X zoLL-QesQcU6Q<}Iz1Q5NbMTnB*5sFW76$B-td5jkmGk(CfX|J>DUY}Gb4qT}iPg#T z`7_~K{)rp!mUaB&36pqKKmWvu14`akQzH%aDnpm);L*av5&u4%vT&?lk!{_Z zYWLXB_NvG_-imzBv@fZX=4_iO6!MO#XZLAmCD8}-cEov}y!_h8*k5mn@++%#x4$gh z#W*GT-m`z#l!G_uot>NNcWIWD_4Lyw`r9`+aeg}b?2gWwZ5;_k;@hUo*s_@ExRhAv mN}b0SHTHV+`RMpvD*JH!`t{wtIvaNj%-L1DGB+S*i825khxKRx literal 1013 zcmb2v=V6d(eJOUj-Qi5<(Mj{K#0HmsH!9RvYO5uC>6%sAsg||Vea><0yt2Q%`Lhp~ z%7%;&AKr^ho2z$y{ohaOS<6F}W{M@0-@jK`G2`as*$-K^x=d2Bla*e4bLomF2lIK` z&MlsM<50xRgue$Rws)JhZF_B7_1P<;(t4uqi#IY(^E}!nZ?}DP%yIttKc9r{ZEQ2v za{l0tynbTtX3yErGQ`#7yE;DlO8pW0CF&NCb8Dfl*<8CBKX%@0S)3X8{I&2jzwMvb z3hni{IC)OgvSY7Y^Z)#j?EmKQ>!@Z_M5A7Ws`sg{o6QYU8DEweDw)M*s;FD@y>eOc zaHy`xX&HMHM6oc(@*W$4F!`u!4aR>o*QjsyY;pvLzu;O zRe+G0?=5|%4{uBgh1C2fKPXI>)$l!TUR2T?H*2BtdWov{qSIvjH*v8Ts<)|jHib35 zxW8)gnyhEB$HXTzStdV~W)hJSJ-lzi3bwsfM}2y?|Nh+TbuwlC!NpA_b3LaDGrE-@ z5_+Jx=*ErB8|U86FKvs?l>9V)YT*S3}DYzhw%me%#_ zYdSEUP2!vBH`WWH#pjkJY&S?f;9z3VZ>)IOQcGGXGI1Th!#wZ2rreI*8|}XLpHZ6Q z9HATZAkJa;A&a|8^B8h7+~g;T+`6|gdA3!SVlLxlu>$v>&dDtET8|jC9rEl8*k|M4 z^u4L@N#5NZ&291Jr>al6{8C9@;%N|=eWJCcao4v!Q}|aE-*{e;SiRrt>&AyG)&$9| ze!J2x^!7EwxeKPg&1HA9-v9Gy$kL#lTYs-iIk%goX38$bb^p09pQ|iC_@3|f!Y3As z^g14D+3Zyf&)cxc$5tWy1;^6X%fD;pN8j0TuVT&lm$u%@mHD&&&6hvCSpEN$vX6H@ z6{erP;t-I$RE|+4IqP`!CY6)3PtH7*YE{3gKEEw+TFt91oNpW9shX3UL4+k+CL@X>5VO$Z`!Pn&EVd08&W1#{tCGN zRrJ}<9_z0m!CE{O?+entq&}Ks)*2LYl&R)e+m#LlvwZQ+&u>QxNuTmR+l9QpZ@rGSGngy z(wi%*SI@jy|8JI;!@n}FFH5C z>8i*Hb5_^Sp%JpT^fd^l8CLh0|8w!6oT$fMnDiHCRrnRud z#Q8{jj_CZjSckO8wzwB(bD!*K{cBwvb4cdd#~CjVJb6-Wm%#tgTQ_}*$j^E8eLhMd zyLw}z4q1qD+)``m`nRh0NZiYwx27S1iv+i=v9?ZaIFncvI;A+bV=1e6q;Znqw{2@& zns`n;`qx#+oCA3+z)eII`T=irXZ% z9Aut0-LgQV=gNPUqOF@HocCT1KWVYy;3i{@oln*zXueoe$h$=G@z&0qiAVOT%(`7= z==I^u?6q>&ek6T8a)Z0M@5EY$_)D>oJ8BPd&RnVBntf69C@bUnvN~h0L#Fd(vmR-3 zur=kUlzf_{p_Cf0^g}E%R3j+8Ct;%ZSQFH4GlHG%bHTFMaRw1>7P_u0%-GEm{}I@KJVN=(?9I=6t;uH#%L9IF~l% zyq!wz601Y$2_8K{rinFG)pyhr918qrY;m-fUfYy8;oC*DVe)y~??3&-(e%_8$+V-Q8HZh`GJ-+^>%x&19<+ zA06>(i@85%p83vo>k`(aoGOi4oI88Pn;ZV_y++P=ziwI8F@0Nt-C z&u#zjcpqZTX7q2#N!`u+ouqh-_x;uup8na>d^_W`SLJoponKFuN^9|mpDen|r$4Ks z{qu&8MN3bATz1y7>x_b_Kd;y^W!veYzV>Cp4{Y}@e*eG5Ts>7k#@XKGT0*yMOBQ%X4GS+}W|*R^91rM!yA*kazv2DSN^zA~k&# zUantv=Z9D3eB0gi)oI3IuSM*)Pswer{eL$7{nUV&zk35XI}}XSHl)9Q`#Zg!>0(jr J>_{F41^_(_VHyAc literal 1216 zcmb2|=3oE;Cg!^eL zTQ+ysEXlKfek~77(45_}eD%_>*IM1zqV~OwFHUASyH#WQ^@K}ICNu1>3tYK+seU=H zSDZO(M{486KYDA**Oo3SJJS)qD9Ww#l4OS4q;H>I8FdMrnA-MEeV+1*g)3K_*nOa^ zZIxa_`jWFPD^>5iuQAb?zCro*j_IY(cZ6TC&yvpE+Uvf&QNQ2Z^!z5h0Es(}FV8NN zS=C)Rc{P`{fxtvPy`6DgT3olg@_()FdGq$GnSqvQjFBdf+*P5X9xd8 z-m6@G+eyJ7__N4~MW?@VG`REL<=J6-bTebG($bnj&1s<}9kVoCT=gd=v98e*S+%%7 zp|D;hF~EgcD#oiqG47LvNLYdA&Y#T@1{HI3eB2pqP%p1Wgjd~o+qJto#W%fw;O#O-XFA0 zyu|i4$KYZ9p}a%&Ax>&LzL$BXnRR@>pm}fM?nP3TGuj`!ZJJ~j&gIyzoA0N?ue&)s zJ4XG%r@DIY!bfsvYulem^4NA{=O$_mp@rLp<1X>LHV54 z4XOX9CLFh!7m_`D70;}TYu9I8keT{zU%=E)>uY}XFTcw_KO}_H&9m>$el5>R3At;J zui2#twq2h4lfU8CN?+f8_t1&6!rLNeH=h2S{cuBbyn>o?+8@u!!kebsd~KU~V^6}P zBD=TG%o>9JDxQ0iad2<>a^m$eqi>?v#V2jkNn@v_|zcJ@2h*rWvgu~7CYr?7<+Ww@mVaGXY+tfVxuds zg`33@lS8+EpKf{B*|NrR?=!oj$F8^eEN5M^+U4z^_;ZCfvSs_1ca^1u-zt9ckNd{a z67}OVrN8eG?Kq;4$N0<9>4UoW$!gyzTQ8l^u6cQC=K3k$9zFV1
@if($note->client_name) via {{ $note->client_name }}@endif - @if($note->address)in @if($note->placeLink)@endif{{ $note->address }}@if($note->placeLink)@endif@endif + @if($note->address)in @if($note->placeLink)@endif{{ $note->address }}@if($note->placeLink)@endif ({{ $note->latitude }}, {{ $note->longitude }})@endif @if($note->replies > 0)Replies: {{ $note->replies }}@endif @if($note->tweet_id)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'nb60id' => $note->nb60id])@endif @if ($note->placeLink)