Utilise les variables de dimentionnement de la sidebar d'activeadmin

betagouv · Jan 25, 2023 · a192697 · a192697
1 parent 98d2854
commit a192697
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
@@ -26,7 +26,7 @@ $couleur-niveau-3: $couleur-accent-erreur;
 
 $container: 1220px;
 $sidebar-width: 290px;
-$sidebar-space: calc(#{$sidebar-width} + 20px);
+$section-padding: 10px;
 
 $grid-gutter-width: 3rem;
 

diff --git a/app/assets/stylesheets/admin/composants/_filtres.scss b/app/assets/stylesheets/admin/composants/_filtres.scss
@@ -1,7 +1,11 @@
 .sidebar_section {
   form.filter_form {
     .filter_form_field {
-      &.select_and_search,
+      &.select_and_search {
+        input[type='text'] {
+          width: 6.4rem;
+        }
+      }
       &.filter_date_range {
         input[type='text'] {
           width: 7.188rem;

diff --git a/app/assets/stylesheets/admin/layout/_main_structure.scss b/app/assets/stylesheets/admin/layout/_main_structure.scss
@@ -1,15 +1,5 @@
 #active_admin_content {
   padding: 3rem 0;
-
-  #main_content_wrapper {
-    #main_content {
-      margin-right: $sidebar-space;
-    }
-  }
-  #sidebar {
-    width: $sidebar-width;
-    margin-left: -$sidebar-width;
-  }
 }
 
 body.logged_in {

diff --git a/app/assets/stylesheets/admin/pages/_structure.scss b/app/assets/stylesheets/admin/pages/_structure.scss
@@ -5,7 +5,7 @@
 
   // laisse une place à droite du #main_content pour la sidebar même si elle n'est pas là.
   #active_admin_content.without_sidebar #main_content_wrapper #main_content {
-    margin-right: $sidebar-space;
+    margin-right: $sidebar-width + ($section-padding * 2);
   }
 
   &.show {