Merge pull request #8521 from adobe/tom/dark-scrollbars-languages

Fixed the border around the languages button and the scrollbar fillers
adobe · Jul 23, 2014 · 8251e93 · 8251e93
2 parents 612ff36 + af91ac1
commit 8251e93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/extensions/default/DarkTheme/main.less b/src/extensions/default/DarkTheme/main.less
@@ -63,7 +63,7 @@
 .CodeMirror-focused .CodeMirror-activeline-background {
     background: #2f2f2f;
 }
-.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {
+&.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {
     box-shadow: inset 15px 0 0 0 #000;
 }
 

diff --git a/src/styles/brackets.less b/src/styles/brackets.less
@@ -188,6 +188,10 @@ a, img {
         vertical-align: top;
         width: auto;
         cursor: pointer;
+        border-radius: 0;
+        box-shadow: none;
+        text-shadow: none;
+
         &:focus {
             outline: 0;
         }

diff --git a/src/styles/brackets_theme_default.less b/src/styles/brackets_theme_default.less
@@ -174,6 +174,7 @@
 
     /* Custom scrollbar colors */
     &.platform-win {
+        .CodeMirror-scrollbar-filler,
         .CodeMirror-gutter-filler {
             background-color: rgb(15, 15, 15);
         }
@@ -196,6 +197,10 @@
     }
 
     &.platform-linux {
+        .CodeMirror-scrollbar-filler,
+        .CodeMirror-gutter-filler {
+            background-color: #1d1f21;
+        }
         ::-webkit-scrollbar-thumb {
             box-shadow: 0 0 0 4px rgba(255, 255, 255, 0.24) inset;
         }