Merge pull request #7740 from luixxiul/flat-followup

Follow-up of #7547
brave · Mar 20, 2017 · 64b381a · 64b381a
2 parents bf63d55 + dba616f
commit 64b381a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/less/bookmarksToolbar.less b/less/bookmarksToolbar.less
@@ -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;
@@ -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 {

diff --git a/less/navigationBar.less b/less/navigationBar.less
@@ -622,8 +622,7 @@
 .navigatorWrapper {
   justify-content: space-between;
   align-items: center;
-  margin-top: 1px;
-  height: @navbarHeight;
+  margin-top: 7px;
   box-sizing: border-box;
 
   /**

diff --git a/less/tabs.less b/less/tabs.less
@@ -138,7 +138,7 @@
   background: none;
   display: flex;
   height: @tabPagesHeight;
-  margin-bottom: 5px;
+  padding: 7px 0;
   justify-content: center;
   position: relative;
   text-align: center;
@@ -151,8 +151,8 @@
   }
 
   &.singlePage {
-    height: 0;
-    margin-bottom: 2px;
+    margin: 0;
+    padding: 0;
   }
 
   >div {

diff --git a/less/variables.less b/less/variables.less
@@ -77,9 +77,9 @@
 @navbarHeight: 36px;
 @downloadsBarHeight: 50px;
 @tabsToolbarHeight: 24px;
-@tabPagesHeight: 9px;
+@tabPagesHeight: 7px;
 @bookmarksToolbarHeight: 24px;
-@bookmarksToolbarWithFaviconsHeight: 28px;
+@bookmarksToolbarWithFaviconsHeight: 24px;
 @bookmarksFileIconSize: 13px;
 @bookmarksFolderIconSize: 15px;