From bc7e614a3ec6c470720f37c84c445e1fdb0babbd Mon Sep 17 00:00:00 2001 From: tmfrnz Date: Sat, 6 May 2017 15:06:18 +1200 Subject: [PATCH] support responsiveness >768px, add note #180, #166 --- app/components/app/app.css | 88 +++---------------- app/components/app/app.html | 15 ++-- app/components/app/filters/filterButtons.html | 2 +- app/components/app/filters/filterMinMax.html | 4 +- .../app/filters/filterMinMaxAddon.html | 4 +- app/components/app/filters/filters.css | 36 ++++++-- app/components/app/filters/filters.html | 54 +++++------- app/components/app/nav/nav.css | 19 ++-- app/components/app/nav/nav.html | 15 +--- app/components/app/out/map/map.css | 24 +++-- .../app/out/map/mapControl/mapControl.css | 24 +++-- .../app/out/map/mapControl/mapControl.html | 6 +- .../app/out/map/mapPlot/mapPlot.css | 36 +++++--- .../map/mapPlot/mapPlotLat/mapPlotLat.html | 4 +- app/components/app/out/out.css | 55 ++++++++---- app/components/app/out/out_data.html | 4 +- app/components/app/page/page.css | 2 +- app/components/app/page/pageContent.html | 14 ++- 18 files changed, 204 insertions(+), 202 deletions(-) diff --git a/app/components/app/app.css b/app/components/app/app.css index 94cd0ec..7c88fee 100644 --- a/app/components/app/app.css +++ b/app/components/app/app.css @@ -101,81 +101,11 @@ a:hover { width: 100%; background-color: #F2F3F4; } -.content-bottom, -.content-full, -.content-scroll{ - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - width: 100%; -} -.content-scroll { - overflow-y: auto; - overflow-x: hidden; - /*z-index: 3500;*/ -} -@media(max-width:768px){ -.content-scroll-xs{ - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - width: 100%; - overflow-y: auto; - overflow-x: hidden; - /*z-index: 3500;*/ -} -} - -.content-container{ - margin-right: auto; - margin-left: auto; - padding: 10px 20px; - clear: both; -} - -.content-bottom { - top:auto -} - -@media(min-width: 769px) { - - .content-bottom { - bottom:20px; - left:200px - } -} - - - -@media(min-width: 769px) { - - - .content-full { - position: absolute; - top: 0; - right:0; - left: auto; - } - .content-full { - left:0; - } - .content-scroll { - /*z-index: 150;*/ - } - -} - .strong { font-weight: bold; } - - .component-left { position: absolute; top: 60px; @@ -189,19 +119,24 @@ a:hover { box-shadow: 0px 0px 11px 0px rgba(0,0,0,0.2); z-index: 1020; } -@media (min-width: 769px) { +/*@media (min-width: 768px) {*/ .component-left { - width: 50%; + width: 330px; right:auto } +/*}*/ +@media (min-width: 992px) { + .component-left { + width: 400px; + } } -@media (min-width: 1068px) { + +@media (min-width: 1200px) { .component-left { width: 500px; } } - .panel-dark { background-color: #19313f; color: #fff; @@ -437,4 +372,9 @@ hr { margin-bottom: 40px; border: 0; border-top: 1px solid #E5E7E9; +} + +#xs-fallback { + position: absolute; + top: 60px; } \ No newline at end of file diff --git a/app/components/app/app.html b/app/components/app/app.html index 9d24aa2..90fded5 100644 --- a/app/components/app/app.html +++ b/app/components/app/app.html @@ -1,6 +1,11 @@ -
-
-
-
-
+ + + + + +
+

We are sorry!

+

The New Zealand Palaeotsunami Database requires a minimum screen width of 768px.

+

If you're visiting this website from a mobile device please revisit again from a tablet, laptop or desktop computer.

+
diff --git a/app/components/app/filters/filterButtons.html b/app/components/app/filters/filterButtons.html index f46fa22..00779f9 100644 --- a/app/components/app/filters/filterButtons.html +++ b/app/components/app/filters/filterButtons.html @@ -11,7 +11,7 @@ style="width:<%= 100/options.length %>%">
<%= option.label %>
<% if (option.hint !== "") { %> -
<%= option.hint %>
+ <% } %> <% }) %> diff --git a/app/components/app/filters/filterMinMax.html b/app/components/app/filters/filterMinMax.html index 78778d3..a1a522c 100644 --- a/app/components/app/filters/filterMinMax.html +++ b/app/components/app/filters/filterMinMax.html @@ -1,7 +1,7 @@
<%= label %>
-
+
-
+
<%= label %>
-
+
<%= addon_min %>
-
+
<%= addon_max %>
-
-
-
-
- -
-

<%= t.filters.name%>

-

<%= t.filters.title %>

-
-
-
- <%= t.filters.all_filters %> -
-
- <%= t.filters.default_filters %> -
-
-
-
-
+
+ +
+

<%= t.filters.name%>

+

<%= t.filters.title %>

+
+
+
+ <%= t.filters.all_filters %> +
+
+ <%= t.filters.default_filters %> +
+
-
-
-
-
- -
- -
-
-
-
+
+ +
+ +
\ No newline at end of file diff --git a/app/components/app/nav/nav.css b/app/components/app/nav/nav.css index 5610adc..176a8b1 100644 --- a/app/components/app/nav/nav.css +++ b/app/components/app/nav/nav.css @@ -15,9 +15,7 @@ box-shadow: 0px 0px 11px 0px rgba(0,0,0,0.2); } -@media (min-width: 769px) { - -} + /*typography, #nav links & buttons*/ #nav a, @@ -34,16 +32,25 @@ position: static; } .navbar-fixed-top { - border-width: 0; + border-width: 0; +} +.navbar-nav > li > a { + padding: 20px 15px; } -@media (min-width: 769px) { +@media (min-width: 992px) { .navbar-nav > li > a { padding: 20px 30px; } } .navbar-brand { - padding: 20px 30px; + padding: 20px 15px; } +@media (min-width: 992px) { + .navbar-brand { + padding: 20px 30px; + } +} + .navbar-default .navbar-brand { color: #f2fafd; } diff --git a/app/components/app/nav/nav.html b/app/components/app/nav/nav.html index d914727..eb6c30b 100644 --- a/app/components/app/nav/nav.html +++ b/app/components/app/nav/nav.html @@ -1,20 +1,9 @@