Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Change inactive private tab background to 30% of original color (#7975)
Browse files Browse the repository at this point in the history
* Followup on #7944, change inactive private tab background to 30% of original color

Auditors: @bsclifton @cezaraugusto @bradleyrichter

Test Plan:
- open private tab
- open another private tab
- non active private tab should have light purple bg

* Update per feedback by @cezaraugusto

Auditors: @cezaraugusto, @NejcZdovc

Test Plan:
1. open private tab
2. open another private tab
3. non active private tab should have light purple background
  • Loading branch information
NejcZdovc authored and cezaraugusto committed Mar 31, 2017
1 parent e91e4db commit 194c572
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions app/renderer/components/styles/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ const styles = StyleSheet.create({
}
},

private: {
background: 'rgba(75, 60, 110, 0.3)',

':hover': {
background: globalStyles.color.privateTabBackgroundActive
}
},

dragging: {
':hover': {
closeTab: {
Expand Down
4 changes: 2 additions & 2 deletions app/renderer/components/tabContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ class TabTitle extends ImmutableComponent {
get themeColor () {
const themeColor = this.props.tab.get('themeColor') || this.props.tab.get('computedThemeColor')
const activeNonPrivateTab = !this.props.tab.get('isPrivate') && this.props.isActive
const activePrivateTab = this.props.tab.get('isPrivate') && this.props.isActive
const defaultColor = activePrivateTab ? globalStyles.color.white100 : globalStyles.color.black100
const isPrivateTab = this.props.tab.get('isPrivate') && (this.props.isActive || this.props.tab.get('hoverState'))
const defaultColor = isPrivateTab ? globalStyles.color.white100 : globalStyles.color.black100

return activeNonPrivateTab && this.props.paintTabs && !!themeColor
? getTextColorForBackground(themeColor)
Expand Down

0 comments on commit 194c572

Please sign in to comment.