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

Make alignment for tabTitle consistent across OSes #7316

Merged
merged 1 commit into from
Feb 21, 2017
Merged

Make alignment for tabTitle consistent across OSes #7316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions app/renderer/components/tabContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('./styles/global')
const {isWindows, isLinux} = require('../../common/lib/platformUtil')
const {isWindows} = require('../../common/lib/platformUtil')

/**
* Boilerplate component for all tab icons
Expand Down Expand Up @@ -174,9 +174,7 @@ class TabTitle extends ImmutableComponent {
styles.tabTitle,
this.props.tabProps.get('hoverState') && titleStyles.reduceTitleSize,
// Windows specific style
isWindows() && styles.tabTitleForWindows,
// Linux specific style
isLinux() && styles.tabTitleForLinux
isWindows() && styles.tabTitleForWindows
)}>
{this.props.pageTitle}
</div>
Expand Down Expand Up @@ -259,18 +257,13 @@ const styles = StyleSheet.create({
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
height: '15px',
lineHeight: '1.6',
padding: globalStyles.spacing.defaultTabPadding
},

tabTitleForWindows: {
fontWeight: '500',
fontSize: globalStyles.fontSize.tabTitle,
height: '18px'
},

tabTitleForLinux: {
height: globalStyles.fontSize.tabTitle
fontSize: globalStyles.fontSize.tabTitle
}
})

Expand Down