2 files changed, 12 insertions, 6 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 06eadc8..2852c80 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -392,7 +392,6 @@ a[disabled] {
     height: 35px;
     min-height: 35px;
     z-index: 10;
-    padding:0;
     background-color: #fff;
     box-shadow: 0 5px 5px rgba(0, 0, 0, 0.3);
     text-transform: uppercase;
@@ -4044,7 +4043,7 @@ li.main_category li.subcategory > span > label{
     #topbar .nav > li.action {
         display: inline-block;
         padding-right: 15px;
-        padding-left: 20px;
+        padding-left: 15px;
     }
     
     #search-box{
@@ -4059,6 +4058,10 @@ li.main_category li.subcategory > span > label{
     .modal-dialog.modal-xl {
         width: auto;
     }
+    #topbar {
+        padding:0;
+        padding-right: 5px;
+    }
     #topbar .navbar-nav {
         margin: 7.5px 0;
     }
@@ -4232,9 +4235,11 @@ li.main_category li.subcategory > span > label{
         position: absolute;
         width: 100%;
         top: 35px;
+        left: 0;
+        right: 0;
         background-color: #fff;
         padding: 8px;
-        margin-left: 10px;
+        margin: 0;
     }
     #topbar{
         box-shadow: none;
diff --git a/chimere/static/saclay/js/interface.js b/chimere/static/saclay/js/interface.js
index e978936..2e37f09 100644
--- a/chimere/static/saclay/js/interface.js
+++ b/chimere/static/saclay/js/interface.js
@@ -138,6 +138,7 @@ var category_panel_open = function(){
     action_map();
     $("#main-map").chimere('razMap');
     if($("#switch-menu").is(':visible')){
+        $("#switch-menu > div").removeClass('selected');
         if (!$("#switch-search-result.disabled").length){
             $("#switch-search-result").addClass('disabled');
         }
@@ -182,7 +183,7 @@ var switch_map = function(){
     if(!$("#switch-menu").is(':visible')){
         return;
     }
-    $("#switch-menu > div").removeClass('selected');
+    $("#switch-menu > div > div").removeClass('selected');
     $("#switch-map").addClass('selected');
     $("#panel").fadeOut();
 };
@@ -197,7 +198,7 @@ var switch_search_result = function(){
     $('#frm_categories').hide();
     $('#search-listing').show();
     $('#search-nav').show();
-    $("#switch-menu > div").removeClass('selected');
+    $("#switch-menu > div > div").removeClass('selected');
     $("#switch-search-result").addClass('selected');
     $("#panel").fadeIn();
 };
@@ -209,7 +210,7 @@ var switch_categories = function(){
     $('#search-listing').hide();
     $('#search-nav').hide();
     $('#frm_categories').show();
-    $("#switch-menu > div").removeClass('selected');
+    $("#switch-menu > div > div").removeClass('selected');
     $("#switch-categories").addClass('selected');
     $("#panel").fadeIn();
     $('#frm_categories').show();