Merge pull request #829 from brave/dev-channel

Fix background color on theme tabs
brave · Feb 19, 2016 · e73f0a6 · e73f0a6
2 parents 2257a56 + 64b559e
commit e73f0a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/js/components/tab.js b/js/components/tab.js
@@ -125,7 +125,7 @@ class Tab extends ImmutableComponent {
     const backgroundColor = this.props.paintTabs &&
       (this.props.frameProps.get('themeColor') || this.props.frameProps.get('computedThemeColor'))
     if (this.props.isActive && backgroundColor) {
-      activeTabStyle.backgroundColor = backgroundColor
+      activeTabStyle.background = backgroundColor
       const textColor = getTextColorForBackground(backgroundColor)
       iconStyle.color = textColor
       if (textColor) {

diff --git a/less/bookmarksToolbar.less b/less/bookmarksToolbar.less
@@ -5,15 +5,14 @@
 @import "variables.less";
 
 .bookmarksToolbar {
-    background: #EEEEEE;
-    border-bottom: 1px solid #BBBBBB;
-    border-top: 1px solid #FFFFFF;
-    box-sizing: border-box;
-    display: flex;
-    flex: 1;
-    padding: 3px 10px;
-    height: 23px;
-
+  background: #EEEEEE;
+  border-bottom: 1px solid #BBBBBB;
+  border-top: 1px solid #FFFFFF;
+  box-sizing: border-box;
+  display: flex;
+  flex: 1;
+  padding: 3px 10px;
+  height: 23px;
 
   .bookmarkToolbarButton {
     border-radius: @borderRadius;