From cc728dc4526d0daf8ce095e90944efa6afcdb825 Mon Sep 17 00:00:00 2001 From: imaustink Date: Wed, 24 May 2017 15:20:00 -0700 Subject: [PATCH 1/5] Added responsive styles for search box. Fixes #250 --- .DS_Store | Bin 0 -> 10244 bytes static/.DS_Store | Bin 0 -> 6148 bytes static/header.less | 8 -------- static/layout.less | 7 +++---- static/mobile.less | 6 ++++++ static/search.less | 16 +++++++++++++++- static/sidebar.less | 25 ++++++++++++------------- 7 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 .DS_Store create mode 100644 static/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6f5a8aa7062727513dc76ed51a7de2167c3d7d01 GIT binary patch literal 10244 zcmeHMTWl0n82Z`erL}9X8{14^ZHtVH~>g=Gpj0;OmVSxc2Bw@e$70xNO%Ap97ux;Yv8d--eE<^ zK*&JIK*&JIK*+$|zyR&p?2^ib4bzZ;kb#ha2?p5vAx<~53Ez$i%U>Oo@DPA(8CCO( z@)QSfOx(8#-;N5)q12~{9?*xPA7Y?@Q+u4blTG+`R9FEA6mUR)Wb`8x6GQ9$b&7a9dxf8=NIJ|N<{nZph1>L{4PcR zb^!Hl05yk3vI%LxFkuF0)C^dq7~B`YRFIDb#|g8V<1{K~!J<4nX9zqe{v1FnG@ipp zOcIXe@*Eq$MGjBGWogtjjjO@2!dO$xknwW5h!+`hf)m-=!pPLn^5k5dXz;+q9;hLIU%GiS|~T+qgKv2)H&b` zb$XhYcbm1`L0&R-Bjx8iG;g4g?{XY#BCn;oO=BpjE@*LVPcv;JR|M_vF>T!$YIgFr z?)G(mUj{j`+`$gPN#sI- zlj}vCD08E&J9f@j+Ir2jV|SV-jHFuO5i) zU4@&@IhNJoxTa@1c3-b&410x+N}75PxK7S%;hiN_HSZex4C>1qG`3TZ)KwK@X>XQw z<8~W4muzjKUQAB@aNfdL{NDQ?XlUF#R-sl_&0nA>2Z(3eGmn}^ZvPM?yH9h|hOL|S zv7SN3v}JVJTE?ivI$0j8QY$Nzn&@I#y(IPPG-SJ@Gpx>AqBYT_l5~*Ox8w{;MYXal zx?EN@smrD5iY`_tt7O%cyN=UWE}(VF8cEgV{g#$8EK#*qStqHx<(@$?4^g>5c}S9b z(@rKskL`-OjnPe#`jvE;4ZKHly}en(rm?qdO;pe$wG`$NoS!81F~l}qH*~2s(Jol3 zO|0}Y!T`uB`z^5q?t@19?a&2BY0W+bFTy);5iY|O_!@qK8*meThgFg)n z8p9G>6zc3T?!7FwoQY7CL~%uIl|+j~jqsvU7hA)YfI368a%tDFH|n09m`;QabVA4J8<#-CKvo@-(|a; z5!|!+-dl{AExah5VuxqHL{KW)aZ4X9EQJh&41^4X41^4X3{1zs4AB^8=l`vD{{Mfv zF2c5ufsld!IRjX>y>ojrO`;H-2Is@h+T(N|p_^UIZ&X+gp@g}xdVU;F1$G?IBXg?r m4>Wjt!uJ~$mct3h;bg^W{=fcbKp6l3hv!&f{C_vb|Nj7?87OrC literal 0 HcmV?d00001 diff --git a/static/.DS_Store b/static/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0bf4af8964fd28cfda6d7203dd16b7fc3dea272e GIT binary patch literal 6148 zcmeHKOHRWu5Phay^e3pgVwoiykhnoq6(qK>N2DKUQA<$MqIQ>Ka3~JI5x51s8Cxh# zaF+-nk7SSI%=38O*l`TN^w;BapbMbEBD&sU^@GTJDHSV_ZVw5Tx@U{~ccpvzOzRBU)jS;y=jo94^0ByNIr&s!3ut14SO&C?`Lugb*L>u?CPSw-Wi;|djQB%j`ggkm?cW_%m)%cBG;GvpV(WnO3dR-R$>JE*QQJm&oD*)u0T^UqayDB&|* ze-q7ahN<%JT~V?+%%;FlQ?s?evoa-Xq_kJmV;Qlfy??KWkB@?nL%c8xOGcKEABodH zKgmTA%d~rhXSPVAZFQ&v1A&3Sz&8W(eTY~@$4=)~>!*X2UID1<>{el0eh&l_IUPHl zTg^8VW1-X*YTOmWSUCG5XBRu2TW#Sm?($)rXX9=tM!j?VNX=nlt3w?a2n_5pP_vI+ zIsY&G_y1i`cnS;z2L2TTrarhC^cj*nTPwlISsSt3v51IWZnZ*Kx#L(Haugr4sPJ7R X4eHqG+-mkv!jFK`5URkyuQKojD)ANa literal 0 HcmV?d00001 diff --git a/static/header.less b/static/header.less index dfc8fae1..a4143167 100644 --- a/static/header.less +++ b/static/header.less @@ -6,10 +6,6 @@ justify-content: space-between; } -.top-left { - display: none; -} - .brand { height: 53px; padding-top: @gutter; @@ -41,10 +37,6 @@ // ----- CANJS LOGO AND VERSION DESKTOP ----- @media screen and (min-width: @breakpoint) { - .top-left { - display: block; - } - .brand { .dropdown { position: absolute; diff --git a/static/layout.less b/static/layout.less index 68ffe7c9..57ae9746 100644 --- a/static/layout.less +++ b/static/layout.less @@ -44,10 +44,9 @@ flex-wrap: nowrap; flex-direction: column; } -.top-left { - flex-shrink: 0; - height: 0; - @media screen and (min-width: @breakpoint){ + +@media screen and (min-width: @breakpoint){ + .top-left { height: auto; } } diff --git a/static/mobile.less b/static/mobile.less index 466ae2a3..b130c83c 100644 --- a/static/mobile.less +++ b/static/mobile.less @@ -61,4 +61,10 @@ label:hover{ display: none; } } +} + +@media screen and (max-width: @breakpoint){ + .top-left > .brand{ + display: none; + } } \ No newline at end of file diff --git a/static/search.less b/static/search.less index 3e9e544c..09353833 100644 --- a/static/search.less +++ b/static/search.less @@ -1,6 +1,5 @@ //Search .search-bar { - display:none; background: @code-color; padding: @gutter @gutter*2; height: 48px; @@ -151,3 +150,18 @@ position:relative; } } + +/* Highlight search results */ +.highlighted { + position: relative; + display: inline-block; + &:after { + content:""; + position: absolute; + height: 100%; + width: 100%; + top: 0; + left: 0; + background-color: hsla(32, 96%, 49%, 0.61); + } +} \ No newline at end of file diff --git a/static/sidebar.less b/static/sidebar.less index 1b638d21..adaa56ff 100644 --- a/static/sidebar.less +++ b/static/sidebar.less @@ -1,17 +1,16 @@ .search-bar { - display:none; - background: @code-color; - padding: @gutter @gutter*2; - height: 48px; - p { - border: none; - margin: 0px; - color: white; - font-weight: 300; - } - @media screen and (min-width: @breakpoint) { - display: block; - } + background: @code-color; + padding: @gutter @gutter*2; + height: 48px; + p { + border: none; + margin: 0px; + color: white; + font-weight: 300; + } + @media screen and (min-width: @breakpoint) { + display: block; + } } // ----- SOCIAL BUTTONS FOR MOBILE VIEW ----- From 98ade1c5e8b77d802051c0c8d3c222c7d56a08a6 Mon Sep 17 00:00:00 2001 From: imaustink Date: Wed, 24 May 2017 15:31:09 -0700 Subject: [PATCH 2/5] Removed .DS_Store files --- .DS_Store | Bin 10244 -> 0 bytes .gitignore | 3 ++- static/.DS_Store | Bin 6148 -> 0 bytes 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 .DS_Store delete mode 100644 static/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6f5a8aa7062727513dc76ed51a7de2167c3d7d01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMTWl0n82Z`erL}9X8{14^ZHtVH~>g=Gpj0;OmVSxc2Bw@e$70xNO%Ap97ux;Yv8d--eE<^ zK*&JIK*&JIK*+$|zyR&p?2^ib4bzZ;kb#ha2?p5vAx<~53Ez$i%U>Oo@DPA(8CCO( z@)QSfOx(8#-;N5)q12~{9?*xPA7Y?@Q+u4blTG+`R9FEA6mUR)Wb`8x6GQ9$b&7a9dxf8=NIJ|N<{nZph1>L{4PcR zb^!Hl05yk3vI%LxFkuF0)C^dq7~B`YRFIDb#|g8V<1{K~!J<4nX9zqe{v1FnG@ipp zOcIXe@*Eq$MGjBGWogtjjjO@2!dO$xknwW5h!+`hf)m-=!pPLn^5k5dXz;+q9;hLIU%GiS|~T+qgKv2)H&b` zb$XhYcbm1`L0&R-Bjx8iG;g4g?{XY#BCn;oO=BpjE@*LVPcv;JR|M_vF>T!$YIgFr z?)G(mUj{j`+`$gPN#sI- zlj}vCD08E&J9f@j+Ir2jV|SV-jHFuO5i) zU4@&@IhNJoxTa@1c3-b&410x+N}75PxK7S%;hiN_HSZex4C>1qG`3TZ)KwK@X>XQw z<8~W4muzjKUQAB@aNfdL{NDQ?XlUF#R-sl_&0nA>2Z(3eGmn}^ZvPM?yH9h|hOL|S zv7SN3v}JVJTE?ivI$0j8QY$Nzn&@I#y(IPPG-SJ@Gpx>AqBYT_l5~*Ox8w{;MYXal zx?EN@smrD5iY`_tt7O%cyN=UWE}(VF8cEgV{g#$8EK#*qStqHx<(@$?4^g>5c}S9b z(@rKskL`-OjnPe#`jvE;4ZKHly}en(rm?qdO;pe$wG`$NoS!81F~l}qH*~2s(Jol3 zO|0}Y!T`uB`z^5q?t@19?a&2BY0W+bFTy);5iY|O_!@qK8*meThgFg)n z8p9G>6zc3T?!7FwoQY7CL~%uIl|+j~jqsvU7hA)YfI368a%tDFH|n09m`;QabVA4J8<#-CKvo@-(|a; z5!|!+-dl{AExah5VuxqHL{KW)aZ4X9EQJh&41^4X41^4X3{1zs4AB^8=l`vD{{Mfv zF2c5ufsld!IRjX>y>ojrO`;H-2Is@h+T(N|p_^UIZ&X+gp@g}xdVU;F1$G?IBXg?r m4>Wjt!uJ~$mct3h;bg^W{=fcbKp6l3hv!&f{C_vb|Nj7?87OrC diff --git a/.gitignore b/.gitignore index 6486cecf..9d120c4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules/ temp/ index.html -.vscode \ No newline at end of file +.vscode +.DS_Store \ No newline at end of file diff --git a/static/.DS_Store b/static/.DS_Store deleted file mode 100644 index 0bf4af8964fd28cfda6d7203dd16b7fc3dea272e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5Phay^e3pgVwoiykhnoq6(qK>N2DKUQA<$MqIQ>Ka3~JI5x51s8Cxh# zaF+-nk7SSI%=38O*l`TN^w;BapbMbEBD&sU^@GTJDHSV_ZVw5Tx@U{~ccpvzOzRBU)jS;y=jo94^0ByNIr&s!3ut14SO&C?`Lugb*L>u?CPSw-Wi;|djQB%j`ggkm?cW_%m)%cBG;GvpV(WnO3dR-R$>JE*QQJm&oD*)u0T^UqayDB&|* ze-q7ahN<%JT~V?+%%;FlQ?s?evoa-Xq_kJmV;Qlfy??KWkB@?nL%c8xOGcKEABodH zKgmTA%d~rhXSPVAZFQ&v1A&3Sz&8W(eTY~@$4=)~>!*X2UID1<>{el0eh&l_IUPHl zTg^8VW1-X*YTOmWSUCG5XBRu2TW#Sm?($)rXX9=tM!j?VNX=nlt3w?a2n_5pP_vI+ zIsY&G_y1i`cnS;z2L2TTrarhC^cj*nTPwlISsSt3v51IWZnZ*Kx#L(Haugr4sPJ7R X4eHqG+-mkv!jFK`5URkyuQKojD)ANa From dbc164d2148268e0e1f755f0c0fcf16724abf6af Mon Sep 17 00:00:00 2001 From: imaustink Date: Thu, 25 May 2017 10:19:43 -0700 Subject: [PATCH 3/5] Removed prematurely commited styles --- static/search.less | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/static/search.less b/static/search.less index 09353833..d4309b53 100644 --- a/static/search.less +++ b/static/search.less @@ -150,18 +150,3 @@ position:relative; } } - -/* Highlight search results */ -.highlighted { - position: relative; - display: inline-block; - &:after { - content:""; - position: absolute; - height: 100%; - width: 100%; - top: 0; - left: 0; - background-color: hsla(32, 96%, 49%, 0.61); - } -} \ No newline at end of file From e06babfb61af7797b6cc51816f8f60d515252b3c Mon Sep 17 00:00:00 2001 From: imaustink Date: Thu, 25 May 2017 10:22:32 -0700 Subject: [PATCH 4/5] Disable spellcheck and autocorrect --- templates/search-bar.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/search-bar.mustache b/templates/search-bar.mustache index ad2fd563..fa6d7514 100644 --- a/templates/search-bar.mustache +++ b/templates/search-bar.mustache @@ -2,6 +2,6 @@ From 701b6e1e5e414c861839df3491743f1d1f178e49 Mon Sep 17 00:00:00 2001 From: imaustink Date: Thu, 25 May 2017 11:35:13 -0700 Subject: [PATCH 5/5] Updated autocapitalize to none instead of false --- templates/search-bar.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/search-bar.mustache b/templates/search-bar.mustache index fa6d7514..2e00d257 100644 --- a/templates/search-bar.mustache +++ b/templates/search-bar.mustache @@ -2,6 +2,6 @@