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

Commit

Permalink
Add variables for the improved flat top panel
Browse files Browse the repository at this point in the history
Follow-up of #7740
Addresses #7739

- Updated existing variables in global.js
- navbarMenubarMargin = tabPagesHeight

Auditors:

Test Plan: #7740 (comment)
  • Loading branch information
Suguru Hirahara committed Mar 21, 2017
1 parent 44d8279 commit 236d5b6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
5 changes: 3 additions & 2 deletions app/renderer/components/styles/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ const globalStyles = {
navbarHeight: '36px',
downloadsBarHeight: '50px',
tabsToolbarHeight: '28px',
tabPagesHeight: '9px',
tabPagesHeight: '7px',
bookmarksToolbarHeight: '24px',
bookmarksToolbarWithFaviconsHeight: '28px',
bookmarksToolbarWithFaviconsHeight: '24px',
bookmarksFileIconSize: '13px',
bookmarksFolderIconSize: '15px',
navbarMenubarMargin: '7px',
navbarButtonSpacing: '4px',
navbarButtonWidth: '20px',
navbarBraveButtonWidth: '23px',
Expand Down
4 changes: 2 additions & 2 deletions less/bookmarksToolbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
box-sizing: border-box;
display: flex;
flex: 1;
padding: 7px var(--bookmarks-toolbar-padding) 8px;
padding: @navbarMenubarMargin var(--bookmarks-toolbar-padding);

&.allowDragging {
-webkit-app-region: drag;
Expand All @@ -27,7 +27,7 @@
}

&.showOnlyFavicon {
padding: 7px 0 7px 10px;
padding: @navbarMenubarMargin 0 @tabPagesHeight 10px;
}

// PR #7740
Expand Down
2 changes: 1 addition & 1 deletion less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
.navigatorWrapper {
justify-content: space-between;
align-items: center;
margin-top: 7px;
margin-top: @navbarMenubarMargin;
box-sizing: border-box;

/**
Expand Down
6 changes: 3 additions & 3 deletions less/tabs.less
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@
.tabPages {
background: none;
display: flex;
height: @tabPagesHeight;
padding: 7px 0;
justify-content: center;
height: @tabPagesHeight;
padding: @tabPagesHeight 0 @navbarMenubarMargin 0;
position: relative;
text-align: center;
z-index: @zindexTabs;

&.allowDragging {
-webkit-app-region: drag;
>* {
Expand Down
1 change: 1 addition & 0 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
@bookmarksFileIconSize: 13px;
@bookmarksFolderIconSize: 15px;

@navbarMenubarMargin: 7px;
@navbarButtonSpacing: 4px;
@navbarButtonWidth: 20px;
@navbarBraveButtonWidth: 23px;
Expand Down

0 comments on commit 236d5b6

Please sign in to comment.