diff --git a/chrome/navbar_below_content.css b/chrome/navbar_below_content.css index 30a3b5e..d68df40 100644 --- a/chrome/navbar_below_content.css +++ b/chrome/navbar_below_content.css @@ -25,6 +25,15 @@ See the above repository for updates as well as full license text. */ z-index: 1; } #nav-bar-customization-target{ -webkit-box-flex: 1; } + + :root[lwtheme] #nav-bar{ + background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)), var(--lwt-additional-images,var(--toolbar-bgimage)) !important; + background-position: top,var(--lwt-background-alignment); + background-repeat: repeat,var(--lwt-background-tiling); + } + :root[lwtheme-image] #nav-bar{ + background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)),var(--lwt-header-image), var(--lwt-additional-images,var(--toolbar-bgimage)) !important; + } /* Fix panels sizing */ .panel-viewstack{ max-height: unset !important; } @@ -37,5 +46,13 @@ See the above repository for updates as well as full license text. */ } .urlbarView-body-inner{ border-top-style: none !important; } - -} \ No newline at end of file + + @media (-moz-platform: linux){ + #notification-popup[side="top"]{ + margin-top: calc(-2 * var(--panel-padding-block) - 40px - 32px - 8.5em) !important; + } + #permission-popup[side="top"]{ + margin-top: calc(-2 * var(--panel-padding-block) - 2.5em); + } + } +} diff --git a/chrome/toolbars_below_content_v2.css b/chrome/toolbars_below_content_v2.css index 58e0d7b..4a8a3f0 100644 --- a/chrome/toolbars_below_content_v2.css +++ b/chrome/toolbars_below_content_v2.css @@ -8,6 +8,10 @@ See the above repository for updates as well as full license text. */ #navigator-toolbox{ display: contents; + --uc-navbar-height: 40px; +} +:root[uidensity="compact"] #navigator-toolbox{ + --uc-navbar-height: 34px; } #main-window > body > #browser, .global-notificationbox, @@ -15,9 +19,46 @@ See the above repository for updates as well as full license text. */ #toolbar-menubar{ order: -1; } + #TabsToolbar{ max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin,0px)) * var(--multirow-n-rows,1)); } +#toolbar-menubar, +#TabsToolbar{ + background: inherit !important; +} +@media (-moz-platform: linux){ + :root[sizemode="normal"][customtitlebar] #toolbar-menubar{ + border-top-left-radius: inherit; + border-top-right-radius: inherit; + } + #toolbar-menubar, + #TabsToolbar{ + opacity: 1 !important; + will-change: unset !important; + } + #notification-popup[side="top"]{ + margin-top: calc(-2 * var(--panel-padding-block) - 40px - 32px - 8.5em) !important; + } + #permission-popup[side="top"]{ + margin-top: calc(-2 * var(--panel-padding-block) - 2.5em); + } +} + +#nav-bar, +#PersonalToolbar{ + background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)), var(--lwt-additional-images,var(--toolbar-bgimage)) !important; + background-position: top,var(--lwt-background-alignment); + background-position-y: calc(0px - var(--tab-min-height) - 2*var(--tab-block-margin,0px)); + background-repeat: repeat,var(--lwt-background-tiling); +} +:root[lwtheme-image] #nav-bar, +:root[lwtheme-image] #PersonalToolbar{ + background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)),var(--lwt-header-image), var(--lwt-additional-images,var(--toolbar-bgimage)) !important; +} +#PersonalToolbar{ + background-position-y: calc(0px - var(--tab-min-height) - 2*var(--tab-block-margin,0px) - var( --uc-navbar-height)); +} #urlbar[breakout][breakout-extend]{ display: flex !important; flex-direction: column-reverse !important;