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

Follow-up of #7547 (Update the top panel) #7740

Merged
merged 2 commits into from
Mar 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions less/bookmarksToolbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
}

.bookmarksToolbar {
margin-bottom: 5px;
box-sizing: border-box;
display: flex;
flex: 1;
padding: 0 var(--bookmarks-toolbar-padding);
height: @bookmarksToolbarHeight;
padding: 7px var(--bookmarks-toolbar-padding) 8px;

&.allowDragging {
-webkit-app-region: drag;
Expand All @@ -28,13 +26,19 @@
}
}

&.showFavicon {
height: @bookmarksToolbarWithFaviconsHeight;
&.showOnlyFavicon {
padding: 7px 0 7px 10px;
}

&.showOnlyFavicon {
padding: 0px 0px 0px 10px;
margin: 0px;
// PR #7740
+ .tabPages {
&.singlePage {
height: 0;
}

&:not(.singlePage) {
padding-top: 0;
}
}

.bookmarkToolbarButton {
Expand Down
3 changes: 1 addition & 2 deletions less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,7 @@
.navigatorWrapper {
justify-content: space-between;
align-items: center;
margin-top: 1px;
height: @navbarHeight;
margin-top: 7px;
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 @@ -138,7 +138,7 @@
background: none;
display: flex;
height: @tabPagesHeight;
margin-bottom: 5px;
padding: 7px 0;
justify-content: center;
position: relative;
text-align: center;
Expand All @@ -151,8 +151,8 @@
}

&.singlePage {
height: 0;
margin-bottom: 2px;
margin: 0;
padding: 0;
}

>div {
Expand Down
4 changes: 2 additions & 2 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
@navbarHeight: 36px;
@downloadsBarHeight: 50px;
@tabsToolbarHeight: 24px;
@tabPagesHeight: 9px;
@tabPagesHeight: 7px;
@bookmarksToolbarHeight: 24px;
@bookmarksToolbarWithFaviconsHeight: 28px;
@bookmarksToolbarWithFaviconsHeight: 24px;
@bookmarksFileIconSize: 13px;
@bookmarksFolderIconSize: 15px;

Expand Down