From 164a766be4a46d6f066bfda94d3c8876cd871ec8 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@gmail.com>
Date: Thu, 16 Mar 2017 12:52:33 +0900
Subject: [PATCH 1/2] Follow-up of #7547

Closes #7739

Auditors:

Test Plan:

Test case 1
1. Clear your profile
2. Start the browser
3. Make sure that the area between the URL bar and the tabs bar is draggable

Test case 2
4. Open https://github.com/
5. Open https://github.com/features
6. Open https://github.com/explore
7. Open https://github.com/pricing
8. Bookmark them
9. Make sure that the area between the bookmarked items and the URL bar is draggable
10. Make sure that the area between the bookmarked items and the tabs bar is draggable

Test case 3
11. Open about:preferences#tabs
12. Set the number of tabs per tab set to 6
13. Open several new tabs to create another tab page
14. Change window size to place the tab page indicators under the bookmarked items
15. Make sure that the area between the tab page indicators and the bookmark bar is draggable (the tiny area between the indicators is NOT draggable)
16. Make sure that the area between the tab page indicators and the tabs bar is draggable

Test case 4
17. Open about:preferences
18. Change "Text only" to "Text and Favicons"
19. Repeat the step 15 and 16

Test case 5
20. Hide the bookmark toolbar
21. Make sure that the area around the tab page indicators is draggable

Test case 6
22. Bookmark several other GitHub pages
23. Open about:preferences
24. Change "Text and Favicons" to "Favicon only"
25. Change window size to place the tab page indicators under the bookmark favicons
26. Repeat the step 15 and 16
---
 less/bookmarksToolbar.less | 11 ++---------
 less/navigationBar.less    |  3 +--
 less/tabs.less             |  5 +++--
 less/variables.less        |  4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/less/bookmarksToolbar.less b/less/bookmarksToolbar.less
index fff1722ea07..f6324588501 100644
--- 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: 0 var(--bookmarks-toolbar-padding) 8px;
 
   &.allowDragging {
     -webkit-app-region: drag;
@@ -28,13 +26,8 @@
     }
   }
 
-  &.showFavicon {
-    height: @bookmarksToolbarWithFaviconsHeight;
-  }
-
   &.showOnlyFavicon {
-    padding: 0px 0px 0px 10px;
-    margin: 0px;
+    padding: 0 0 7px 10px;
   }
 
   .bookmarkToolbarButton {
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 14ec53bfa58..afe1c4a9a47 100644
--- 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: 7px 0;
   box-sizing: border-box;
 
   /**
diff --git a/less/tabs.less b/less/tabs.less
index f3e169e683d..d910129f141 100644
--- a/less/tabs.less
+++ b/less/tabs.less
@@ -138,7 +138,7 @@
   background: none;
   display: flex;
   height: @tabPagesHeight;
-  margin-bottom: 5px;
+  padding: 0 0 7px;
   justify-content: center;
   position: relative;
   text-align: center;
@@ -151,8 +151,9 @@
   }
 
   &.singlePage {
+    margin: 0;
+    padding: 0;
     height: 0;
-    margin-bottom: 2px;
   }
 
   >div {
diff --git a/less/variables.less b/less/variables.less
index 60ae20920e1..6180aac0ff9 100644
--- 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;
 

From dba616f149f28f437bb5ec934bc0f04bf04415d5 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@gmail.com>
Date: Fri, 17 Mar 2017 16:53:32 +0900
Subject: [PATCH 2/2] Based on the feedback by @bsclifton

See: https://github.com/brave/browser-laptop/pull/7740#pullrequestreview-27521504

Auditors: @bsclifton

Test Plan: See the 1st post of the PR (updated)
---
 less/bookmarksToolbar.less | 15 +++++++++++++--
 less/navigationBar.less    |  2 +-
 less/tabs.less             |  3 +--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/less/bookmarksToolbar.less b/less/bookmarksToolbar.less
index f6324588501..0d49d438f00 100644
--- a/less/bookmarksToolbar.less
+++ b/less/bookmarksToolbar.less
@@ -17,7 +17,7 @@
   box-sizing: border-box;
   display: flex;
   flex: 1;
-  padding: 0 var(--bookmarks-toolbar-padding) 8px;
+  padding: 7px var(--bookmarks-toolbar-padding) 8px;
 
   &.allowDragging {
     -webkit-app-region: drag;
@@ -27,7 +27,18 @@
   }
 
   &.showOnlyFavicon {
-    padding: 0 0 7px 10px;
+    padding: 7px 0 7px 10px;
+  }
+
+  // PR #7740
+  + .tabPages {
+    &.singlePage {
+      height: 0;
+    }
+
+    &:not(.singlePage) {
+      padding-top: 0;
+    }
   }
 
   .bookmarkToolbarButton {
diff --git a/less/navigationBar.less b/less/navigationBar.less
index afe1c4a9a47..fc6e272cdfb 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -622,7 +622,7 @@
 .navigatorWrapper {
   justify-content: space-between;
   align-items: center;
-  margin: 7px 0;
+  margin-top: 7px;
   box-sizing: border-box;
 
   /**
diff --git a/less/tabs.less b/less/tabs.less
index d910129f141..f0ce3b78cd5 100644
--- a/less/tabs.less
+++ b/less/tabs.less
@@ -138,7 +138,7 @@
   background: none;
   display: flex;
   height: @tabPagesHeight;
-  padding: 0 0 7px;
+  padding: 7px 0;
   justify-content: center;
   position: relative;
   text-align: center;
@@ -153,7 +153,6 @@
   &.singlePage {
     margin: 0;
     padding: 0;
-    height: 0;
   }
 
   >div {