styling, v.a. sidebar

Edirom · Nov 29, 2019 · 0abcf99 · 0abcf99
1 parent c21ef5b
commit 0abcf99
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/resources/sass/base/_helpers.scss b/resources/sass/base/_helpers.scss
@@ -20,7 +20,7 @@
 
 .colored
 {
-    background-color: $gray-lighter;
+    background-color: $gray-lightest;
 }
 
 .info {

diff --git a/resources/sass/components/_buttons.scss b/resources/sass/components/_buttons.scss
@@ -81,6 +81,6 @@ li.nav-item.gradient-light > .active, btn.gradient-light.active {
 }
 
 li.nav-item.gradient-light > .nav-link {
-    border-left:4px solid $gray-lighter;
+    border-left:4px solid $gray-light;
 }
 
diff --git a/resources/sass/components/_popover.scss b/resources/sass/components/_popover.scss
@@ -22,7 +22,7 @@
             display:none;
         }
         .item-title {
-            background-color: $gray-lighter;
+            background-color: $gray-lightest;
             padding: 8px 14px;
             border-bottom:1px solid $popover-border-color;
             margin: 0px;
@@ -93,7 +93,7 @@
     span.tei_lemma {
         margin-bottom: 6px;
         display: block;
-        border-left: 6px solid #f0f0f0;
+        border-left: 6px solid $gray-lighter;
         padding-left: 6px;
     }
     .preview {

diff --git a/resources/sass/components/_tabs.scss b/resources/sass/components/_tabs.scss
@@ -75,7 +75,7 @@ li.resp-tab-item {
 }
 
 button.resp-tab-active, li.resp-tab-active {
-    border-bottom: 3px solid #F0F0F0!important;
+    border-bottom: 3px solid $gray-lighter!important;
     border-top: 4px solid $gray;
 }
 

diff --git a/resources/sass/layout/_header.scss b/resources/sass/layout/_header.scss
@@ -12,7 +12,7 @@
 {
     margin-top: 20px;
     margin-bottom: 0px;
-    border-bottom: 4px solid $gray-lighter;
+    border-bottom: 4px solid $gray-lightest;
 }
 
 #navbarCollapse .navbar-nav {

diff --git a/resources/sass/layout/_sidebar.scss b/resources/sass/layout/_sidebar.scss
@@ -54,7 +54,7 @@ a.checkbox-only {
 }
 
 .checkbox label {
-    margin-top: -24px;
+    color: $gray;
     position: relative;
     display: inline-block;
     margin-bottom: 0px;
@@ -63,28 +63,35 @@ a.checkbox-only {
 .checkbox input[type="checkbox"] + label::before {
     content: "\f096\00a0";
     font-family: "FontAwesome";
-    margin-right:11px;
+    margin-right:8px;
+    margin-left:2px;
     color: $gray;
 }
 
 .checkbox input[type="checkbox"]:checked + label::before {
     content: "\f14a\00a0";
     font-family: "FontAwesome";
-    margin-right:10px;
+    margin-right:8px;
+    margin-left:2px;
     color: $primary;
 }
 
 // allFilter sidebar
 
 .allFilter {
     margin-bottom: 30px;
+
+    &.panel-collapse {
+        padding: 10px;
+        background: $gray-lightest;
+    }
 
     .nav {
         margin-top: 0px;
     }
 
     h2 {
-        margin-bottom:10px!important;
+        margin-bottom:12px!important;
     }
 
     h4 {
@@ -286,7 +293,7 @@ a.checkbox-only {
 
 .borderBox {
     border:0!important;
-    background:$gray-lighter;
+    background:$gray-lightest;
     padding: 20px;
 }
 
@@ -301,11 +308,15 @@ a.checkbox-only {
 
 // Single Collapse Elements in Sidebar
 .filtersection .panel-collapse {
-    background: $gray-lighter;
-    padding: 4px;
+    background: $gray-lightest;
+}
+
+.panel-collapse {
+    margin-top: -10px;
 }
 
 .panel-collapse.collapse
 {
-     margin-bottom: 30px;
+    margin-top: -4px;
+    margin-bottom: 30px;
 }