Make windows specific extra top margin only apply with [tabsintitlebar]

This commit is contained in:
MrOtherGuy 2022-01-02 09:37:20 +02:00
parent 8850c63fc9
commit 1fe5d315c0
8 changed files with 18 additions and 13 deletions

View file

@ -28,7 +28,7 @@ See the above repository for updates as well as full license text. */
:root[uidensity="compact"] #navigator-toolbox{ --tab-min-height: 32px } :root[uidensity="compact"] #navigator-toolbox{ --tab-min-height: 32px }
@media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[sizemode="maximized"] > body > box{ margin-top: 8px } :root[tabsintitlebar][sizemode="maximized"] > body > box{ margin-top: 8px }
} }
#navigator-toolbox{ #navigator-toolbox{

View file

@ -49,7 +49,7 @@ See the above repository for updates as well as full license text. */
} }
/* Extra top padding in maximized window */ /* Extra top padding in maximized window */
@media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[sizemode="maximized"] #navigator-toolbox{ padding-top:7px !important; } :root[tabsintitlebar][sizemode="maximized"] #navigator-toolbox{ padding-top:7px !important; }
} }
/* Fix window controls not being clickable */ /* Fix window controls not being clickable */
:root[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive]{ :root[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive]{

View file

@ -56,7 +56,7 @@ Window controls will be all wrong without it
} }
/* Extra top padding in maximized window */ /* Extra top padding in maximized window */
@media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[sizemode="maximized"] #navigator-toolbox{ padding-top:7px !important; } :root[tabsintitlebar][sizemode="maximized"] #navigator-toolbox{ padding-top:7px !important; }
} }
/* Window controls in nav-bar */ /* Window controls in nav-bar */
:root:not([customizing]) #toolbar-menubar[inactive]{ :root:not([customizing]) #toolbar-menubar[inactive]{

View file

@ -26,7 +26,7 @@ See the above repository for updates as well as full license text. */
--multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */ --multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
} }
@media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[sizemode="maximized"]{ --multirow-top-padding: 8px } :root[tabsintitlebar][sizemode="maximized"]{ --multirow-top-padding: 8px }
} }
:root[uidensity="compact"]{--multirow-toolbar-height: 34px} :root[uidensity="compact"]{--multirow-toolbar-height: 34px}
:root{ border-top-width: 0px !important } :root{ border-top-width: 0px !important }
@ -53,7 +53,6 @@ See the above repository for updates as well as full license text. */
margin-right: 138px; margin-right: 138px;
/* width == 100vw - margins */ /* width == 100vw - margins */
width: calc(100vw - 168px); width: calc(100vw - 168px);
top: var(--multirow-top-padding);
} }
:root[inFullscreen] #TabsToolbar > #window-controls{ :root[inFullscreen] #TabsToolbar > #window-controls{

View file

@ -14,7 +14,9 @@ See the above repository for updates as well as full license text. */
#toolbar-menubar[autohide="true"][inactive="true"]{ height: 0px !important; } #toolbar-menubar[autohide="true"][inactive="true"]{ height: 0px !important; }
:root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar{ top: 8px; } @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar{ top: 8px; }
}
#toolbar-menubar > spacer{ flex-grow: 1 } #toolbar-menubar > spacer{ flex-grow: 1 }
#toolbar-menubar[inactive] > .titlebar-buttonbox-container{ display: none } #toolbar-menubar[inactive] > .titlebar-buttonbox-container{ display: none }

View file

@ -12,17 +12,19 @@ See the above repository for updates as well as full license text. */
/* -moz-appearance: none on titlebar breaks window margins, so re-adjust that */ /* -moz-appearance: none on titlebar breaks window margins, so re-adjust that */
@media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
:root[sizemode="maximized"]:not([inDOMFullscreen]){ margin-top: 8px !important; } :root[sizemode="maximized"]{ margin-top: 8px !important; }
@media screen and (min-resolution: 1.25dppx){ @media screen and (min-resolution: 1.25dppx){
:root[sizemode="maximized"]:not([inDOMFullscreen]){ margin-top: 7px !important; } :root[sizemode="maximized"]{ margin-top: 7px !important; }
} }
@media screen and (min-resolution: 1.5dppx){ @media screen and (min-resolution: 1.5dppx){
:root[sizemode="maximized"]:not([inDOMFullscreen]){ margin-top: 6px !important; } :root[sizemode="maximized"]{ margin-top: 6px !important; }
} }
@media screen and (min-resolution: 2dppx){ @media screen and (min-resolution: 2dppx){
:root[sizemode="maximized"]:not([inDOMFullscreen]){ margin-top: 5px !important; } :root[sizemode="maximized"]{ margin-top: 5px !important; }
} }
:root:not([tabsintitlebar]),
:root[inDOMFullscreen]{ margin-top: 0 !important; }
} }
#urlbar-container{ margin-top: 1px } #urlbar-container{ margin-top: 1px }
:root[sessionrestored] #nav-bar:not([customizing]){ :root[sessionrestored] #nav-bar:not([customizing]){

View file

@ -33,7 +33,7 @@ linux_gtk_window_control_patch.css
:root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-buttonbox-container{ height: 100%; } :root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-buttonbox-container{ height: 100%; }
:root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-button{ padding: 2px 17px !important; } :root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-button{ padding: 2px 17px !important; }
@media (-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
#titlebar{ -moz-appearance: none !important; } #titlebar{ -moz-appearance: none !important; }
/* Counteract -moz-appearance when maximized */ /* Counteract -moz-appearance when maximized */
:root[tabsintitlebar][sizemode="maximized"] #navigator-toolbox{ padding-top: 8px !important; } :root[tabsintitlebar][sizemode="maximized"] #navigator-toolbox{ padding-top: 8px !important; }

View file

@ -12,10 +12,12 @@ See the above repository for updates as well as full license text. */
#titlebar{ -moz-appearance: none !important; } #titlebar{ -moz-appearance: none !important; }
@media (-moz-os-version: windows-win10){ @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
/* Next two variables are used by autohide_menubar.css */ /* Next two variables are used by autohide_menubar.css */
#toolbar-menubar{ --uc-menubar-extra-margin: 0px } #toolbar-menubar{ --uc-menubar-extra-margin: 0px }
:root[sizemode="maximized"] #toolbar-menubar{ --uc-menubar-extra-margin: 8px } :root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar{
--uc-menubar-extra-margin: 8px
}
:root[sizemode="maximized"][tabsintitlebar] :where(#browser,#customization-container,#toolbar-menubar){ margin-top: 8px } :root[sizemode="maximized"][tabsintitlebar] :where(#browser,#customization-container,#toolbar-menubar){ margin-top: 8px }
} }