From 86c3cfb36eb933f5ee3aafc9ccabfc6c0015c9d1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 19 Jun 2018 18:47:08 +0200
Subject: CSS: fix menu height

---
 chimere/static/chimere/css/styles.css   | 21 ++++++++++++++++-----
 chimere/templates/chimere/main_map.html |  4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index ce9e762..06eadc8 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -390,6 +390,7 @@ a[disabled] {
 #topbar{
     font-family: 'Yanone Kaffeesatz Light', sans-serif;
     height: 35px;
+    min-height: 35px;
     z-index: 10;
     padding:0;
     background-color: #fff;
@@ -423,6 +424,12 @@ a[disabled] {
     padding: 0;
 }
 
+.navbar-toggle{
+    padding: 4px 5px;
+    margin-top: 4px;
+    margin-bottom: 0;
+}
+
 #content{
     z-index:3;
     padding:20px;
@@ -3931,6 +3938,10 @@ li.main_category li.subcategory > span > label{
     background-color: #fff;
 }
 
+#switch-menu div.row{
+    padding: 0;
+}
+
 #switch-menu div{
     padding: 0.2em;
 }
@@ -4049,14 +4060,14 @@ li.main_category li.subcategory > span > label{
         width: auto;
     }
     #topbar .navbar-nav {
-        margin: 7.5px -4px;
+        margin: 7.5px 0;
     }
     #extra-pages{
         background-color: #fff;
         margin: 0;
         left: 0;
         right: 0;
-        top: 48px;
+        top: 35px;
         z-index: 1000;
         position: absolute;
     }
@@ -4140,7 +4151,7 @@ li.main_category li.subcategory > span > label{
         padding-top: 46px;
     }
     #main-map{
-        top: 123px;
+        top: 118px;
     }
     #map-shadow{
         display: none;
@@ -4220,10 +4231,10 @@ li.main_category li.subcategory > span > label{
         display: block;
         position: absolute;
         width: 100%;
-        top: 50px;
+        top: 35px;
         background-color: #fff;
         padding: 8px;
-        margin-left: 15px;
+        margin-left: 10px;
     }
     #topbar{
         box-shadow: none;
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index e81153b..bd0c184 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -26,7 +26,8 @@
 {% endblock %}
 {% block message_edit %}{% endblock %}
 {% block sidebar %}
-<div id="switch-menu" class="row">
+<div id="switch-menu">
+  <div class="row">
     <div class="col-xs-6 selected" id="switch-map">
         <a href="#">{% trans "Map" %}</a>
     </div>
@@ -36,6 +37,7 @@
     <div class="col-xs-6 disabled" id="switch-search-result">
         <a href="#">{% trans "Search result" %}</a>
     </div>
+  </div>
 </div>
   <div id="sidebar-container">
     <div class='sidebar-handler' id='sidebar-handler-hide'></div>
-- 
cgit v1.2.3