Merge pull request #7224 from cezaraugusto/feature/tabsbar/7216

Do not override themeColor if platform is Windows
brave · Feb 14, 2017 · bcbafec · bcbafec
2 parents 6f72ff8 + 9164156
commit bcbafec
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/js/components/tab.js b/js/components/tab.js
@@ -245,6 +245,8 @@ class Tab extends ImmutableComponent {
       onMouseLeave={this.onMouseLeave}>
       <div className={css(
         styles.tab,
+        // Windows specific style
+        isWindows() && styles.tabForWindows,
         this.isPinned && styles.isPinned,
         this.props.isActive && styles.active,
         this.props.tab.get('isPrivate') && styles.private,
@@ -254,9 +256,7 @@ class Tab extends ImmutableComponent {
         this.props.isActive && this.themeColor && perPageStyles.themeColor,
         !this.isPinned && this.narrowView && styles.tabNarrowView,
         !this.isPinned && this.narrowestView && styles.tabNarrowestView,
-        !this.isPinned && this.props.tab.get('breakpoint') === 'smallest' && styles.tabMinAllowedSize,
-        // Windows specific style
-        isWindows() && styles.tabForWindows
+        !this.isPinned && this.props.tab.get('breakpoint') === 'smallest' && styles.tabMinAllowedSize
         )}
         data-test-active-tab={this.props.isActive}
         data-test-pinned-tab={this.isPinned}