From 41064e3968a6f86eb4a2db0bbf53f66e04b52db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 6 May 2016 17:08:52 +0200 Subject: [PATCH] Fixing menu responsiveness. --- bornhack/static_src/css/bornhack.css | 30 ++++++++++++++++-- .../{img => js/images}/layers-2x.png | Bin .../static_src/{img => js/images}/layers.png | Bin .../{img => js/images}/marker-icon-2x.png | Bin bornhack/templates/base.html | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) rename bornhack/static_src/{img => js/images}/layers-2x.png (100%) rename bornhack/static_src/{img => js/images}/layers.png (100%) rename bornhack/static_src/{img => js/images}/marker-icon-2x.png (100%) diff --git a/bornhack/static_src/css/bornhack.css b/bornhack/static_src/css/bornhack.css index bc80035c..cc035e18 100644 --- a/bornhack/static_src/css/bornhack.css +++ b/bornhack/static_src/css/bornhack.css @@ -34,7 +34,7 @@ a, a:active, a:focus { /* Navbar stuff */ .navbar { - width: 700px; + max-width: 700px; margin: auto; background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(250, 250, 250); @@ -44,10 +44,33 @@ a, a:active, a:focus { min-height: 80px; } -.nav li a { - padding: 30px 25px; +@media (min-width: 768px) { + .nav li a { + padding: 30px 15px; + } + .nav { + float: right!important; + } } +@media (max-width: 767px) { + .nav li { + text-align: center; + font-size: 20px; + } +} + +.navbar-toggle .icon-bar { + background: black; + width: 45px; + height: 8px; +} + +.navbar-toggle .icon-bar+.icon-bar { + margin-top: 6px; +} + + /* Form stuff */ .form-control, .form-control:focus { @@ -62,3 +85,4 @@ a, a:active, a:focus { #map { height: 500px; } + diff --git a/bornhack/static_src/img/layers-2x.png b/bornhack/static_src/js/images/layers-2x.png similarity index 100% rename from bornhack/static_src/img/layers-2x.png rename to bornhack/static_src/js/images/layers-2x.png diff --git a/bornhack/static_src/img/layers.png b/bornhack/static_src/js/images/layers.png similarity index 100% rename from bornhack/static_src/img/layers.png rename to bornhack/static_src/js/images/layers.png diff --git a/bornhack/static_src/img/marker-icon-2x.png b/bornhack/static_src/js/images/marker-icon-2x.png similarity index 100% rename from bornhack/static_src/img/marker-icon-2x.png rename to bornhack/static_src/js/images/marker-icon-2x.png diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html index 668bf772..18062297 100644 --- a/bornhack/templates/base.html +++ b/bornhack/templates/base.html @@ -36,7 +36,7 @@