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

Commit

Permalink
Merge pull request #8300 from luixxiul/hotfix-navbarHeight
Browse files Browse the repository at this point in the history
Increase the tabs bar and tabsToolbarButtons height
  • Loading branch information
bsclifton committed Apr 13, 2017
2 parents 32d3091 + 7453183 commit 8f59a3b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 3 additions & 1 deletion app/renderer/components/styles/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const globalStyles = {
buttonWidth: '25px',
navbarHeight: '36px',
downloadsBarHeight: '50px',
tabsToolbarHeight: '28px',
tabsToolbarHeight: '26px',
tabPagesHeight: '7px',
bookmarksToolbarHeight: '24px',
bookmarksToolbarWithFaviconsHeight: '24px',
Expand Down Expand Up @@ -210,4 +210,6 @@ globalStyles.color.activeTabDefaultColor = globalStyles.color.chromePrimary
globalStyles.color.switchBG_on = globalStyles.color.braveOrange
globalStyles.color.statsGray = globalStyles.color.chromeText

globalStyles.spacing.tabHeight = globalStyles.spacing.tabsToolbarHeight

module.exports = globalStyles
4 changes: 2 additions & 2 deletions app/renderer/components/styles/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const styles = StyleSheet.create({
boxSizing: 'border-box',
color: '#5a5a5a',
display: 'flex',
height: '24px',
height: globalStyles.spacing.tabHeight,
marginTop: '0',
transition: `transform 200ms ease, ${globalStyles.transition.tabBackgroundTransition}`,
left: '0',
Expand Down Expand Up @@ -94,7 +94,7 @@ const styles = StyleSheet.create({

active: {
background: `rgba(255, 255, 255, 1.0)`,
height: '24px',
height: globalStyles.spacing.tabHeight,
marginTop: '0',
borderWidth: '0 1px 0 0',
borderStyle: 'solid',
Expand Down
4 changes: 4 additions & 0 deletions less/tabs.less
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
}

.tabsToolbar {
box-sizing: border-box;
background: @tabsBackground;
display: flex;
height: @tabsToolbarHeight;
Expand All @@ -127,7 +128,10 @@
}

.tabsToolbarButtons {
box-sizing: border-box;
height: @tabHeight;
padding-right: 2px;

.browserButton {
display: inline-block;
line-height: 26px;
Expand Down
3 changes: 2 additions & 1 deletion less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@

@navbarHeight: 36px;
@downloadsBarHeight: 60px;
@tabsToolbarHeight: 24px;
@tabsToolbarHeight: 26px;
@tabHeight: @tabsToolbarHeight;
@tabPagesHeight: 7px;
@bookmarksToolbarHeight: 24px;
@bookmarksToolbarWithFaviconsHeight: 24px;
Expand Down

0 comments on commit 8f59a3b

Please sign in to comment.