From f404464fccbb55d393ec2ca528848e36f1b25342 Mon Sep 17 00:00:00 2001 From: Cezar Augusto Date: Sun, 19 Feb 2017 19:35:10 -0300 Subject: [PATCH] Make alignment for tabTitle consistent across OSes Fix #7304 Fix #7312 Auditors: @luixxiul --- app/renderer/components/tabContent.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/renderer/components/tabContent.js b/app/renderer/components/tabContent.js index 9f2b1058597..7dde2c37a7d 100644 --- a/app/renderer/components/tabContent.js +++ b/app/renderer/components/tabContent.js @@ -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 @@ -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} @@ -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 } })