From 0993600b0c092f7d5f57cd84373b0864a4a4cf21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info> Date: Sat, 27 Feb 2016 23:38:05 +0100 Subject: [PATCH] Medium devices now used desktop version of UI Small is now 650px and down instead of 600px and down --- sass/style.scss | 12 ++++++++++++ templates/partials/header.html.nunjucks | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sass/style.scss b/sass/style.scss index 54cdd7e..d45e494 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -12,6 +12,9 @@ $success-color: color("green", "base"); $error-color: color("red", "base"); $link-color: color("light-blue", "darken-1"); +$small-screen: 650px; +$small-screen-up: 651px; + @import "materialize.scss"; /* overall page look */ @@ -105,6 +108,13 @@ html, body { } /* top navigation */ +@media #{$medium-only} { + nav .brand-logo { + left: unset; + transform: unset; + } +} + nav { line-height: 64px; } @@ -134,6 +144,8 @@ nav.subnav li { .toplinks > a, .menu-icon { display: block; padding: 0 15px; + height: 64px; + line-height: 64px; } .toplinks > a:hover, .menu-icon:hover { background-color: rgba(0, 0, 0, 0.1); diff --git a/templates/partials/header.html.nunjucks b/templates/partials/header.html.nunjucks index 03cf30a..ae95a55 100644 --- a/templates/partials/header.html.nunjucks +++ b/templates/partials/header.html.nunjucks @@ -44,7 +44,7 @@ <!-- Top nav --> <nav class="light-blue supernav" role="navigation" style="z-index:5;position:absolute;"> <div class="nav-wrapper container"> - <a data-activates="nav-mobile" class="menu-icon hide-on-large-only" style="float:left"> + <a data-activates="nav-mobile" class="menu-icon hide-on-med-and-up" style="float:left"> {{ svgs.menu("#fff",false) }} </a> <div style="z-index: 2" class="brand-logo"> @@ -55,10 +55,10 @@ </a> </div> <div class="toplinks"> - <a class="hide-on-med-and-down left" id="o-nas"> + <a class="hide-on-small-only left" id="o-nas"> O nás </a> - <a class="hide-on-med-and-down left" id="clanky"> + <a class="hide-on-small-only left" id="clanky"> Články </a> <a class="search-icon left"> @@ -117,7 +117,7 @@ </ul> <!-- Bottom nav --> - <nav class="light-blue lighten-1 subnav subnav1 hide-on-med-and-down" role="navigation"> + <nav class="light-blue lighten-1 subnav subnav1 hide-on-small-and-down" role="navigation"> <div class="nav-wrapper container"> <ul class="right"> <li {{ "class='lighten-2 light-blue'" | safe if (file == "clanek/2008/o-radioklubu") }}><a href="{{ config.baseurl }}/clanek/2008/o-radioklubu">O Radioklubu</a></li> @@ -128,7 +128,7 @@ </div> </nav> <!-- Bottom nav 2 --> - <nav class="light-blue lighten-1 subnav subnav2 hide-on-med-and-down hidden" role="navigation"> + <nav class="light-blue lighten-1 subnav subnav2 hide-on-small-and-down" role="navigation"> <div class="nav-wrapper container"> <ul class="right"> <li><a href="{{ config.baseurl }}/tag/clanek">Všechny články</a></li> -- GitLab