From 64b559e5cd3c1b7e855ece72c8627a7a2ba23093 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Fri, 19 Feb 2016 14:42:56 -0500 Subject: [PATCH] Fix background color on theme tabs Auditors: @bradleyrichter --- js/components/tab.js | 2 +- less/bookmarksToolbar.less | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/js/components/tab.js b/js/components/tab.js index daa8aff32cb..a5c8871e4ca 100644 --- 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 index 8e0959f2f39..6344133d2f5 100644 --- 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;