Update flexpane header styles

laCour · Apr 23, 2017 · 1741c15 · 1741c15
1 parent 779c4ad
commit 1741c15
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/scss/modules/flexpane/_base.scss b/scss/modules/flexpane/_base.scss
@@ -7,6 +7,7 @@
 
   .heading {
     background: darken($color-base, 5%);
+    border-bottom-color: $color-shade-dark;
     color: $base-link-color;
 
     a {
@@ -40,7 +41,11 @@
     }
   }
 
-  .subheading {
+  .heading_text {
+    color: $base-link-color;
+  }
+
+  .subheading:not(.empty) {
     background: $color-base;
     border-top: 1px solid $color-shade-darkest;
     color: $color-highlight;
@@ -92,29 +97,17 @@
   }
 }
 
-.flexpane_redesign {
-  #flex_contents {
-    .heading {
-      border-bottom: 0.0625rem solid $color-shade-dark;
-    }
-
-    .heading_text {
-      color: $base-link-color;
-    }
-  }
+.close_flexpane {
+  color: $color-highlight;
 
-  .close_flexpane {
-    color: $color-highlight;
-
-    &:focus,
-    &:hover {
-      color: $base-font-color;
-    }
+  &:focus,
+  &:hover {
+    color: $base-font-color;
   }
+}
 
-  &.flex_pane_showing #col_flex {
-    border-left: 1px solid $color-shade-dark;
-  }
+#client-ui.flex_pane_showing #col_flex {
+  border-left-color: $color-shade-dark;
 }
 
 .toolbar_container {

diff --git a/scss/modules/flexpane/_mentions.scss b/scss/modules/flexpane/_mentions.scss
@@ -1,4 +1,4 @@
-#flex_contents .subheading#mentions_options {
+#flex_contents .subheading:not(.empty)#mentions_options {
   background-color: $color-base;
   border-bottom-color: $color-shade-dark;
   color: $base-font-color;

diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss
@@ -220,6 +220,13 @@ textarea {
   }
 }
 
+.btn_basic {
+  &:focus,
+  &:hover {
+    color: $base-font-color;
+  }
+}
+
 .btn_outline {
   background: $color-base;
   color: $base-link-color !important;