From 15f6dc7db8f829c0fee5e09e1b6b76c7eee2b926 Mon Sep 17 00:00:00 2001 From: Madis Date: Mon, 23 Apr 2018 20:16:20 +0300 Subject: [PATCH 1/2] Improve tabbar-addressbar merge for 61 Tested with Nightly 61.0a1 --- navbar/merge-tabbar-navbar-linux.css | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/navbar/merge-tabbar-navbar-linux.css b/navbar/merge-tabbar-navbar-linux.css index 5d480f8..104e71e 100644 --- a/navbar/merge-tabbar-navbar-linux.css +++ b/navbar/merge-tabbar-navbar-linux.css @@ -1,5 +1,6 @@ /* * Place the navigation bar in the front of the tab bar (Linux) + * Remove toolbar spacers before usage. The left toolbar area will fit 3 buttons by default. * * Contributor(s): Madis0 */ @@ -9,38 +10,38 @@ /* Compact density */ :root[uidensity=compact] { --tabs-margin-left: 5.5em; /* Keep margin for button background */ - --space-before-tabs: 34.5em; /* Left margin for nav bar */ + --space-before-tabs: 33.5em; /* Left margin for nav bar */ --space-after-tabs: 2em; /* Right margin for caption button, menu */ } /* Touch density */ :root[uidensity=touch] { --tabs-margin-left: 7.5em; /* Keep margin for button background */ - --space-before-tabs: 34em; /* Left margin for nav bar */ + --space-before-tabs: 32em; /* Left margin for nav bar */ --space-after-tabs: 2.3em; /* Right margin for caption button, menu */ } /* Normal density */ :root { --tabs-margin-left: 6.4em; /* Keep margin for button background */ - --space-before-tabs: 34em; /* Left margin for nav bar */ + --space-before-tabs: 33em; /* Left margin for nav bar */ --space-after-tabs: 2em; /* Right margin for caption button, menu */ } /* Static values only depending on touch density */ :root[uidensity=compact] { --nav-margin-top: -1.9em; - --menu-margin-top: 0.05em; + --menu-margin-top: 0.2em; } :root[uidensity=touch] { - --nav-margin-top: -2.3em; - --menu-margin-top: 0.1em; + --nav-margin-top: -2.5em; + --menu-margin-top: 0.35em; } :root { - --nav-margin-top: -2.1em; - --menu-margin-top: 0.15em; + --nav-margin-top: -2.2em; + --menu-margin-top: 0.35em; } /* Adjust tab bar to get space first */ @@ -54,8 +55,8 @@ /* Move nav bar to top left */ #nav-bar { margin-top: var(--nav-margin-top) !important; /* Move nav bar up */ - margin-right: 60vw !important; /* Cut it off with defined width */ - margin-bottom: -0.1em !important; /* Remove bottom border */ + margin-right: 64.5vw !important; /* Cut it off with defined width */ + margin-bottom: -0.08em !important; /* Remove bottom border */ background-color: transparent !important; /* Make it use tab bar colors */ } @@ -63,6 +64,6 @@ #PanelUI-button { position: fixed; /* Fixed position for menu */ top: var(--menu-margin-top); /* Add some margin to top */ - right: 0em; /* Move it to right side (adjust for caption buttons) */ + right: 2em; /* Move it to right side (adjust for caption buttons) */ border-left: none !important; /* Remove menu border */ } From b7dea5eeac5b269405ebd04bcc2b56d146d2a12e Mon Sep 17 00:00:00 2001 From: Madis Date: Mon, 4 Jun 2018 01:31:17 +0300 Subject: [PATCH 2/2] Update for 62 --- navbar/merge-tabbar-navbar-linux.css | 39 +++++----------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/navbar/merge-tabbar-navbar-linux.css b/navbar/merge-tabbar-navbar-linux.css index 104e71e..b40d092 100644 --- a/navbar/merge-tabbar-navbar-linux.css +++ b/navbar/merge-tabbar-navbar-linux.css @@ -5,37 +5,14 @@ * Contributor(s): Madis0 */ -/* Variable values depending on layout. Use these to customize style. */ - -/* Compact density */ -:root[uidensity=compact] { - --tabs-margin-left: 5.5em; /* Keep margin for button background */ - --space-before-tabs: 33.5em; /* Left margin for nav bar */ - --space-after-tabs: 2em; /* Right margin for caption button, menu */ -} - -/* Touch density */ -:root[uidensity=touch] { - --tabs-margin-left: 7.5em; /* Keep margin for button background */ - --space-before-tabs: 32em; /* Left margin for nav bar */ - --space-after-tabs: 2.3em; /* Right margin for caption button, menu */ -} - -/* Normal density */ -:root { - --tabs-margin-left: 6.4em; /* Keep margin for button background */ - --space-before-tabs: 33em; /* Left margin for nav bar */ - --space-after-tabs: 2em; /* Right margin for caption button, menu */ -} - /* Static values only depending on touch density */ :root[uidensity=compact] { - --nav-margin-top: -1.9em; - --menu-margin-top: 0.2em; + --nav-margin-top: -2em; + --menu-margin-top: 0.1em; } :root[uidensity=touch] { - --nav-margin-top: -2.5em; + --nav-margin-top: -2.6em; --menu-margin-top: 0.35em; } @@ -46,18 +23,14 @@ /* Adjust tab bar to get space first */ #TabsToolbar { - margin-left: var(--tabs-margin-left) !important; - padding-left: var(--space-before-tabs) !important; - margin-right: var(--space-after-tabs) !important; - margin-bottom: -0.1em; !important; /* Remove bottom border */ + padding-left: 37em !important; /* Add specific padding to left */ + margin-bottom: -0.1em !important; } /* Move nav bar to top left */ #nav-bar { margin-top: var(--nav-margin-top) !important; /* Move nav bar up */ - margin-right: 64.5vw !important; /* Cut it off with defined width */ - margin-bottom: -0.08em !important; /* Remove bottom border */ - background-color: transparent !important; /* Make it use tab bar colors */ + margin-right: 72.5em !important; /* Cut it off with defined width */ } /* Move menu button to top right */