diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 0e0228b4..add0c2e5 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -19,11 +19,10 @@ div.login-bar { a { color: #6f2509; - text-shadow: 1px 1px 3px #fdedd5; } -a:hover { - color: #6f2509; +a:active { + color: #6f2509; } h1 { /*todo: odlišit 1 a 2 */ @@ -203,15 +202,16 @@ vikendovka /* Menu */ -div.menu.mobile { +ul.menu_mobile { display: none; } -div.menu.desktop { - display: block; + +nav.nav-button { + display: none; } h1 a:hover { - text-decoration: none; + text-decoration: none; } img.decor { /*todo bug při zmenšování okna */ @@ -235,10 +235,6 @@ ul.menu a { text-decoration: none; } -ul.menu li>a:active { - color: black; -} - ul.menu li { margin: 0px; display: inline-block; @@ -249,6 +245,14 @@ ul.menu li { font-weight: 400; } +ul.menu li>a:hover { + color: black; +} + +ul.menu li>a:active { + color: black; +} + ul.submenu { background-color: #e84e10; @@ -275,6 +279,7 @@ ul.submenu li>a { text-decoration: none; text-shadow: none; } + ul.submenu li>a:hover { color: black; } @@ -333,7 +338,7 @@ p.license-mobile { /* stránka přes celý displej */ -@media (max-width: 971px) { +@media (max-width: 970px) { div.container { width: 100%; @@ -347,19 +352,11 @@ p.license-mobile { #header { background-size: 100%; } + #header img.logo { width: 100%; } - div.menu li { - min-width: 120px; - font-size: 130%; - } - #submenu ul { - font-size: 115%; - } - #submenu li { - padding-top: 5px; - } + #footer { width: 100%; } @@ -380,8 +377,29 @@ p.license-mobile { } +@media (max-width: 830px) { + +ul.menu { + font-size: 80%; + margin-top: 0px; +} + +ul.menu li { + margin-top: 10px; /* posunutí textu hlavního menu níže */ +} + +ul.submenu li { + margin-top: 0px; /* aby se spolu s textem hlavního menu neposunoval níže i text submenu */ +} + +ul.submenu { + margin-top: 8px; /* mezera mezi hlavním menu a submenu */ +} + +} + /* malý tablet, mobil */ -@media (max-width: 735px) { +@media (max-width: 650px) { #title { display: none; @@ -419,83 +437,21 @@ p.license-mobile { filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.4)); } - div.menu { + ul.menu { display: none; } - #submenu { - font-variant: small-caps; - top:-1px; - width: 100%; - background-color: #e84e10; - color: #fdedd5; - height: auto; - position: relative; - } - #submenu ul { - font-size: 120%; - padding-bottom: 5px; - } - #submenu li { - display: list-item; - height: auto; - } - #submenu li a:hover, #submenu li.selected { - color: black; - } - - img.decor { /*todo bug při zmenšování okna */ - top: -5px; - } - - div.menu.mobile { - top: 3px; + ul.menu_mobile { display: block; - position: relative; - background: #e84e10; - padding: 10px; - font-variant: small-caps; - } - div.menu.mobile > div.dropdown > button { - background-color: #fdedd5; - color: #e84e10; - width: 100%; - margin: 0px; - border-color: #f7cb87; - font-size: 160%; - } - div.menu.mobile > div.dropdown > ul { - margin: 0px; - padding: 0px; - border-radius: 0px; - width: 100%; - background-color: #fdedd5; - } - div.menu.mobile > div.dropdown > ul > li { - margin: 0px; - padding: 0px; - display: block; - font-size: 160%; - background: none; - font-variant: small-caps; - color: #e84e10; - height: auto; - } - div.menu.mobile > div.dropdown > ul > li > a { - margin: 0px; - padding: 5px 30px; - height: auto; - } - div.menu.mobile > div.dropdown > ul > li > a:hover { - color: black; } - div.menu.desktop { + ul.menu_mobile br { display: none; } + - #footer { - display: none; + nav.nav-button { + display: block; } p.license-mobile { diff --git a/mamweb/static/images/logo-mobile.svg b/mamweb/static/images/logo-mobile.svg index 48b64297..28c04898 100644 --- a/mamweb/static/images/logo-mobile.svg +++ b/mamweb/static/images/logo-mobile.svg @@ -12,14 +12,14 @@ version="1.1" id="svg2" xml:space="preserve" - width="1103.777" - height="393.65524" - viewBox="0 0 1103.777 393.65525" + width="1116.5013" + height="404.98737" + viewBox="0 0 1116.5013 404.98736" sodipodi:docname="logo-mobile.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)">image/svg+xmlM&M - - - \ No newline at end of file + d="m 8335.3454,4798.1624 -595.1505,-620.7555 h -585.3165 l 595.2607,620.7555 h 585.2063" + style="fill:#e84e10;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.18195856" + id="path14" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> \ No newline at end of file diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index b2208795..a5f3ceb8 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -71,6 +71,32 @@ {% sitetree_menu from "main_menu" include "trunk" template "menu.html" %} + {# ========= MENU MOBILE ========== #} + + + + + + + {# ========= MENU END ========== #} +
{% block content %} diff --git a/mamweb/templates/menu_mobile.html b/mamweb/templates/menu_mobile.html new file mode 100644 index 00000000..b2040cd3 --- /dev/null +++ b/mamweb/templates/menu_mobile.html @@ -0,0 +1,18 @@ +{% load sitetree %} +{% spaceless %} +{% autoescape off %} + +{% endautoescape %} +{% endspaceless %} diff --git a/mamweb/templates/menu_mobile_dropdown.html b/mamweb/templates/menu_mobile_dropdown.html new file mode 100644 index 00000000..2bd722c5 --- /dev/null +++ b/mamweb/templates/menu_mobile_dropdown.html @@ -0,0 +1,8 @@ +{% load sitetree %} +