From 77a18e20a5372f5b8be935fc57033b96e7950d60 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 13 Mar 2017 20:35:13 +0000 Subject: [PATCH] #18: Very satisfactory! Looking good at all scales, and in the end I didn't use bootstrap (although it would still be a good thing to learn it). --- .gitignore | 3 +- project.clj | 2 +- resources/public/content/stylesheet.css | 73 +++++++++++++++--------- resources/public/img/three-lines.png | Bin 629 -> 665 bytes resources/templates/base.html | 27 ++++----- 5 files changed, 62 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 494087f..41eb940 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ pom.xml.asc .lein-env .nrepl-port smeagol.log* -/node_modules/ \ No newline at end of file +/node_modules/ +.DS_Store diff --git a/project.clj b/project.clj index a5a784c..5b3236a 100644 --- a/project.clj +++ b/project.clj @@ -32,7 +32,7 @@ [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]] [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]] [io.sarnowski/lein-docker "1.1.0"]] - :bower-dependencies [[simplemde "1.11.2"]["bootstrap" "3.3.7"]] + :bower-dependencies [[simplemde "1.11.2"]] :docker {:image-name "simonbrooke/smeagol" :dockerfile "Dockerfile"} :ring {:handler smeagol.handler/app diff --git a/resources/public/content/stylesheet.css b/resources/public/content/stylesheet.css index a99315b..a9d64f9 100644 --- a/resources/public/content/stylesheet.css +++ b/resources/public/content/stylesheet.css @@ -82,6 +82,12 @@ header h1 { margin-top: 0; } +img { + border: 0; + padding: 0; + vertical-align: middle; +} + input { background-color: white; } @@ -302,7 +308,13 @@ th { /* tablets, primarily. Adapted to touch; targets are larger */ @media all and (min-device-width: 769px) and (max-device-width: 1024px) { -/* content of the current in the Wiki - editable, provided by users. Within main-container */ + h1 { + /* I wouldn't normally use a px value, but the menu icon is 49px wide */ + padding: 0.25em 5%; + padding-left: 100px; + } + + /* content of the current page in the Wiki - editable, provided by users. Within main-container */ #content { border: thin solid silver; width: 80%; @@ -315,39 +327,48 @@ th { padding: 0; position: fixed; z-index: 149; - background:rgba(40,40,40,0.8); - font-size: larger; + color: silver; + background:rgba(40,40,40,0.9); } - #nav:hover #nav-menu { - display: inline; - } - - #nav-icon { - padding: 0.25em; - float: left; - } - - #nav-menu { - display: none; - } - - #nav ul li { - padding: 0; - margin: 0; - display: inline; - } - - #nav ul li a { + #nav a { color: white; text-decoration: none; font-weight: bold; - padding: 0.1em 0.75em; - margin: 0; } + + #nav:hover #nav-menu { + display: block; + list-style-type: none; + width: 100%; + } + + #nav-icon { + padding: 0; + } + + #nav-menu, #phone-side-bar { + display: none; + } + + #nav menu li { + padding: 0.5em; + margin: 0.5 em; + font-size: 150%; + } + + #nav menu li a { + } + #nav ul li.active a { background: silver;} li.nav-item a:hover { background: rgb( 240, 240, 240) } li.nav-item a:active { background: gray; color: white; } + + #nav menu #user { + text-decoration: none; + font-weight: bold; + margin: 0; + } } /* phones, and, indeed, smaller phones. Adapted to touch; display radically @@ -360,6 +381,7 @@ th { h1 { /* I wouldn't normally use a px value, but the menu icon is 49px wide */ padding: 0.25em 5%; + padding-left: 100px; text-align: right; } @@ -388,7 +410,6 @@ th { z-index: 149; color: silver; background:rgba(40,40,40,0.9); - font-size: 200%; } #nav a { diff --git a/resources/public/img/three-lines.png b/resources/public/img/three-lines.png index a46f20e63b9b700614da045fd6068c4cbfe35dcb..c7895a92c866b05b94aaf76288867ba4b975ac4b 100644 GIT binary patch literal 665 zcmV;K0%rY*P)5qVXb)#3nreN@2qdkeVAb%~4n(mfV01J9bFj zvP*H*(keWNx&S1MW%H&B3b;~F;P-yXlI7ie{yj5qJjU0jr)RHJDiM){LSl@WK@fcB zj^ms-j$?*lXhu<_MDV#>4z_K>DHb^=B5XDrbUGdM`+el|`Ai3&BnjT%-s1D)BVZWd z01(G9hQlFxy`B;dh~pTa9v)x-U};;ZqI9ebic15~05pJ|q*SL5BBH}R|JxP8JwJ!% zx;VA0%$GpV^I#ap5rAb`_;`PhYPAYxn%RE)Qlflu0n;==L`Mhsz7OB`mHPgPNGCxJ zKm*VKGytW=_g&z4JcbYgjAfgNloFon;_cNHjQv0)3`4ZrZFIX`SPFE4wOS3WR_h2r zN{RV=j_Gu&gzbe8hx5R}?^(BgTKjW=PJ$YM2A~13ba_xk=~y`caL#dkeT|=!i4uQ? zDwPTtV;}&=Oo*3Kx$LgjYeZ4>Pl?E+h;Wk2p-?Cw2!aXUKeufgwr#7G0Q5viR{;$` z1JD2z*I`3sFc@Go8i8}3>42q_cyoD)dcD5ud1gYqESF1aHk$-MiL23QP#nkfEeL+F z{|yOr4$uHJ01ZF`Pz}I#yHzIW^ga{^cAJwQ?(R@LJInmWXp$s&cXM-CkuhdM{4SNt zuT`{vFdqNni^by0sb#&AQj$u+o2F^5R;%Yf8=L~J=T(bv00000NkvXXu0mjfHLe^t literal 629 zcmeAS@N?(olHy`uVBq!ia0vp^DM0MQ!3HE}%L?%WDYhhUcNZWH1V5d3*8?fe0*}aI zppNSx%;=;sy8BY;#I{Y?Ddus}H$*NvoxK$idP>!|nNzh8a*_20c>2e-u&?Y{o@IhC9_%SxebqKUQx zgCY`Ic&sTT^r(xC`TX;9?;ot37Q5%>-C9-8#~&kH=NYT|M`lk|>719B=QXKo(F}{- zdkbZ>`;yg;N;x$!ARz$--!nH)N9l<994U4bI5DI8{86AuH+J*!^Q}?Q>%V^d@nieP z+bieATd!YJw)<@Swc`Kh=9sp)&ShY1L7;_GEqCwL-?sg$nXl-FhYb3mp-c0&zrIs^ z?wj6p?~lAv{gK+qJx#mce*b^&o7L}6N6;L>aEN2p)Xmes?!13J!60G#_2A8`F10UK z-h2CYwZxO>SEufqKi5#RU(|Kuuc=3i529(l;5Ff9&M_C8@atPY-?sF!n(O!V^|Ln3 z%2QFR{gy9QmzJI+XW=E~I&qOkQqb#~)WR*h0{eTS?Dh2b+Za8Y`Six`TiT~Teb=p% W{v*%)Xo46h^?17axvX - - - {% block extra-headers %} {% endblock %} @@ -18,7 +15,7 @@

{{config.site-title}}: {{title}}