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

dangoor · dangoor · commit 8251e9330ef8 · 2014-07-22T22:21:53.000-04:00
Fixed the border around the languages button and the scrollbar fillers
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;
         }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`.CodeMirror-focused .CodeMirror-activeline-background {`
`64`	`64`	`background: #2f2f2f;`
`65`	`65`	`}`
`66`		`-.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {`
	`66`	`+&.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {`
`67`	`67`	`box-shadow: inset 15px 0 0 0 #000;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@`
`174`	`174`
`175`	`175`	`/* Custom scrollbar colors */`
`176`	`176`	`&.platform-win {`
	`177`	`+ .CodeMirror-scrollbar-filler,`
`177`	`178`	`.CodeMirror-gutter-filler {`
`178`	`179`	`background-color: rgb(15, 15, 15);`
`179`	`180`	`}`
`@@ -196,6 +197,10 @@`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`&.platform-linux {`
	`200`	`+ .CodeMirror-scrollbar-filler,`
	`201`	`+ .CodeMirror-gutter-filler {`
	`202`	`+ background-color: #1d1f21;`
	`203`	`+ }`
`199`	`204`	`::-webkit-scrollbar-thumb {`
`200`	`205`	`box-shadow: 0 0 0 4px rgba(255, 255, 255, 0.24) inset;`
`201`	`206`	`}`