Merge pull request #4 from CapSens/39-defauts-a-corriger

39 Défauts à corriger
CapSens · May 3, 2021 · 335d178 · 335d178
2 parents 5599dbc + 42c1aef
commit 335d178
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ $ bundle install
 ## Set-up
 - In `app/assets/javascripts/active_admin`, add the line: 
 ```
-//= require capsens_theme/filters_toggle
+//= require light_admin/filters_toggle
 ```
 - In `app/assets/stylesheets`, add the line:
 ```

diff --git a/app/assets/stylesheets/light_admin/components/_buttons.scss b/app/assets/stylesheets/light_admin/components/_buttons.scss
@@ -342,16 +342,17 @@ form.filter_form {
 }
 
 /* BUTTONS FOR ADD AND ERASED DOCUMENTS */
-
 a.button, a:link.button {
   background: $bg-white;
   border: $border-style-buttons;
   border-radius: $border-radius-btn;
   box-shadow: $buttons-shadow;
   font-size: $font-size;
   font-weight: 500;
+  text-shadow: none;
+  color: $text-buttons;
+}
 
-  &:hover {
-    background: $bg-light;
-  }
+a.button:not(.disabled):hover, a:link.button:not(.disabled):hover {
+  background: $bg-light;
 }
diff --git a/app/assets/stylesheets/light_admin/components/_forms.scss b/app/assets/stylesheets/light_admin/components/_forms.scss
@@ -3,6 +3,14 @@ form {
   fieldset {
     legend {
       span {
+        background: none;
+        border: none;
+        box-shadow: none;
+        color: inherit;
+        padding: 0 24px;
+        position: relative;
+        top: 30px;
+
         &:empty {
           display: none;
         }
@@ -135,45 +143,72 @@ form {
 }
 
 /* FILTER FORM */
-form.filter_form {
-  .filter_form_field {
-    padding: 24px 0 0 0;
-    margin: auto;
-    margin-top: 24px;
-    border-top: $border-style-light;
-    width: 90%;
-
-    &:first-child {
-      padding: 0;
-      border-top: none;
+#filters_sidebar_section {
+  .sidebar_section
+  input[type=text] {
+    width: inherit;
+  }
+
+  .select2-container
+  .select2-selection--single {
+    width: 235px;
+  }
+
+  .select2-container--default .select2-selection--single
+  .select2-selection__arrow {
+    right: -38px;
+  }
+
+  .select2-container--open
+  .select2-dropdown--below {
+    width: 235px !important;
+  }
+
+  form.filter_form {
+    .filter_form_field {
+      padding: 24px 0 0 0;
+      margin: auto;
+      margin-top: 24px;
+      border-top: $border-style-light;
+      width: 90%;
+
+      &:first-child {
+        padding: 0;
+        border-top: none;
+      }
     }
-  }
-
-  .filter_form_field + .filter_form_field {
-    border-top: $border-style-light;
-  }
-}
 
-.filter_form_field.select_and_search
-input[type='text'] {
-  width: calc(50% - 7px);
-  height: 20px;
-}
-
-.filter_form_field.filter_date_range
-input[type=text] {
-  max-width: 112px !important;
-}
-
-.filter_form {
-  .select_and_search {
-    span {
-      display: none;
+    .filter_form_field.select_and_search input[type=text] {
+      margin-left: 0;
+      width: inherit;
+    }
+
+    .filter_form_field + .filter_form_field {
+      border-top: $border-style-light;
     }
   }
-
-  .filter_form_field.filter_date_range input[type='text'] {
-    height: 37px;
+
+  .filter_form_field.select_and_search
+  input[type='text'] {
+    width: calc(50% - 7px);
+    height: 20px;
+  }
+
+  .filter_form_field.filter_date_range
+  input[type=text] {
+    max-width: 112px !important;
+  }
+
+  .filter_form {
+    .select_and_search {
+      span {
+        display: none;
+      }
+    }
+
+    .filter_form_field.filter_date_range input[type='text'] {
+      height: 37px;
+    }
   }
 }
 

diff --git a/app/assets/stylesheets/light_admin/components/_header.scss b/app/assets/stylesheets/light_admin/components/_header.scss
@@ -48,7 +48,7 @@
 
     ul {
       background: $bg-white;
-      margin-top: 10px;
+      margin-top: 34px;
       border-radius : 4px;
       padding: .25rem 0;
       border: $border-style;

diff --git a/app/assets/stylesheets/light_admin/views/_login.scss b/app/assets/stylesheets/light_admin/views/_login.scss
@@ -7,10 +7,12 @@
   font-family: $font-family;
   font-size: 1.875rem;
   font-weight: bold;
+  line-height: initial;
   text-align: center;
   color: $title-login;
   padding: 0;
   margin-top: 1.5rem;
+  padding: 0 30px;
 }
 
 /* LOGIN FORM */