From d6e4913811ee98e7b57f19a6717bdf03020ddbe9 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Tue, 4 Nov 2014 09:37:38 -0500 Subject: [PATCH] Don't use the compound results widget for prettysimple demo --- examples/htdocs/prettysimple.css | 107 +++++++++++++++++++------------------ examples/htdocs/prettysimple.html | 16 +++++- 2 files changed, 70 insertions(+), 53 deletions(-) diff --git a/examples/htdocs/prettysimple.css b/examples/htdocs/prettysimple.css index e0dd5fe..0ffaadb 100644 --- a/examples/htdocs/prettysimple.css +++ b/examples/htdocs/prettysimple.css @@ -5,11 +5,13 @@ html { } body { display: flex; - flex-direction: column; - align-content: center; + align-content: space-between; + align-items: center; + flex-wrap: wrap; height: 100%; - margin: 0 auto; - padding: 0 1em; + width: 100%; + max-width: 1100px; + margin: auto; font-family: "Open Sans", sans-serif; } a { @@ -19,45 +21,54 @@ a { /* Top level layout */ .header { + width: 100%; display: flex; - min-height: 2.5em; + margin: .5em; + margin-bottom: 1em; } .mkws-switch { margin-left: auto; } .main { - max-width: 1100px; - margin: auto; -} -.mkws-search { - max-width: 30em; - margin-left: auto; -} -.mkws-results { + width: 100%; display: flex; + align-items: flex-start; + margin: 1em; + margin-bottom: auto; +} +.forms { + width: 100%; + margin: 1em; } .mkws-termlists { - margin-top: 72px; + margin-right: 66px; flex: 1; } +.results { + flex: 3; +} /* Search form */ /* heavily inspired by: */ /* https://github.com/philipwalton/solved-by-flexbox/blob/master/_sass/components/_input-add-on.scss */ +.mkws-search { + margin-left: auto; + margin-bottom: 0; +} .mkws-search-form { display: flex; margin-left: auto; - margin-bottom: 1em; + max-width: 30em; } .mkws-search-form .mkws-query { flex: 1; border-right: 0 !important; border-radius: 2px 0 0 2px; + font-size: 1.1em; } .mkws-search-form .mkws-button { border-radius: 0 2px 2px 0; background-color: hsla(31, 15%, 50%, 0.1); - /* color: hsl(0, 0%, 40%); */ font: inherit; font-weight: normal; } @@ -66,6 +77,22 @@ a { padding: 0.5em 0.75em; margin: 0; } +.mkws-ranking { + font-family: "Open Sans Light", sans-serif; + border-top: none; + border-bottom-left-radius: 5em 100%; + margin-top: 0; + margin-left: auto; + font-size: .9em; + text-align: right; + max-width: 25em; +} +.mkws-ranking select { + font-size: 1.0em; + font-family: "Open Sans", sans-serif; + border: none; + background: none; +} /* Misc. elements */ .mkws-lang { @@ -76,13 +103,6 @@ a { color: black; font-family: "Open Sans", sans-serif; } -.mkws-motd-container { - flex: 3; - margin-left: 70px; - margin-bottom: auto; - display: flex; - flex-wrap: wrap; -} .mkws-switch { color: gray; font-family: "Open Sans Light", sans-serif; @@ -90,18 +110,7 @@ a { .mkws-switch > a { color: black; } -.mkws-ranking { - width: 30em; - margin-left: auto; - font-size: .9em; - text-align: right; -} -.mkws-ranking select { - border: none; - background: none; -} .mkws-pager { - margin-top: 40px; width: 100%; } .mkws-current-page { @@ -172,6 +181,9 @@ a { min-height: 120px; border-bottom: 1px solid rgba(0, 0, 0, 0.15); } +.mkws-summary:last-child { + border: none; +} .result-data { min-height: 120px; display: flex; @@ -243,32 +255,31 @@ a { /* Responsive */ @media screen and (max-width: 1020px) { - .mkws-motd-container { - margin-left: 30px; + .mkws-termlists { + margin-right: 30px; } } @media screen and (max-width: 900px) { - .mkws-results { - flex-direction: row; - flex-wrap: wrap; - align-content: flex-start; - } .mkws-pager { margin: 0; } .mkws-pager > div { margin-top: 10px; } + .main { + flex-wrap: wrap; + } .mkws-termlists { order: 99; width: 100%; - flex: none; margin-top: 40px; - } - .mkws-motd-container { + margin-right: 0; flex: none; - margin-left: 0; + } + .results { width: 100%; + order 1; + flex: none; } .mkws-ranking { width: 100%; @@ -309,12 +320,6 @@ a { float: none !important; } } -@media screen and (max-width: 600px) { - .main { - margin-left: 0; - margin-right: 0; - } -} /* Font (from mozilla.org) */ @font-face{ diff --git a/examples/htdocs/prettysimple.html b/examples/htdocs/prettysimple.html index 6b53e5f..81fef7b 100644 --- a/examples/htdocs/prettysimple.html +++ b/examples/htdocs/prettysimple.html @@ -12,9 +12,21 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ + -- 1.7.10.4