Merge branch 'upstream'
This commit is contained in:
commit
b291d7784b
15 changed files with 131 additions and 255 deletions
|
@ -1,4 +1,4 @@
|
|||
/* EdgeFr-Fox 2 - tabbar */
|
||||
/* Edge-Frfox - tabbar.css */
|
||||
|
||||
@supports -moz-bool-pref("uc.tweak.floating-tabs.equal-margin") and -moz-bool-pref("uc.tweak.floating-tabs") {
|
||||
:root #titlebar {
|
||||
|
@ -86,31 +86,17 @@
|
|||
box-shadow: -4px 4px 0 4px var(--uc-tab-corner-bg) !important;
|
||||
}
|
||||
|
||||
.tabbrowser-tab[selected="true"] .tab-background {
|
||||
--uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor));
|
||||
}
|
||||
|
||||
.tab-background:is([selected], [multiselected]) {
|
||||
--uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
|
||||
--uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor)));
|
||||
}
|
||||
|
||||
#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[multiselected="true"]:-moz-lwtheme,
|
||||
#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[selected="true"]:-moz-lwtheme {
|
||||
background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
|
||||
--uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor));
|
||||
}
|
||||
|
||||
.tabbrowser-tab .tab-background:is([selected], [multiselected]) {
|
||||
--uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
|
||||
}
|
||||
|
||||
.tabbrowser-tab:hover>.tab-stack>.tab-background:not([selected="true"], [multiselected]) {
|
||||
.tabbrowser-tab:hover .tab-background:not([selected], [multiselected]) {
|
||||
background-color: color-mix(in srgb, currentColor 8%, transparent) !important;
|
||||
--uc-tab-corner-bg: color-mix(in srgb, currentColor 8%, transparent) !important;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("uc.tweak.floating-tabs") {
|
||||
:root:not([lwtheme-brighttext="true"]) .tabbrowser-tab:hover>.tab-stack>.tab-background:not([selected="true"], [multiselected]) {
|
||||
#Tabstoolbar:not([brighttext]) .tabbrowser-tab:hover .tab-background:not([selected], [multiselected]) {
|
||||
background-color: color-mix(in srgb, white 30%, transparent) !important;
|
||||
--uc-tab-corner-bg: color-mix(in srgb, white 30%, transparent) !important;
|
||||
}
|
||||
|
@ -134,20 +120,15 @@
|
|||
margin: 0 !important;
|
||||
}
|
||||
|
||||
/* fix colours */
|
||||
/* fix window background colours */
|
||||
@media not (-moz-gtk-csd-available) {
|
||||
#navigator-toolbox:not(:-moz-lwtheme) {
|
||||
:root:not(:-moz-lwtheme) #navigator-toolbox {
|
||||
background-color: var(--lwt-accent-color) !important;
|
||||
color: var(--lwt-text-color) !important;
|
||||
}
|
||||
|
||||
/* force inactive window on default theme */
|
||||
@media not (-moz-platform: windows-win7) {
|
||||
@media not (-moz-platform: windows-win8) {
|
||||
#navigator-toolbox:-moz-window-inactive:not(:-moz-lwtheme) {
|
||||
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
|
||||
}
|
||||
}
|
||||
:root:not(:-moz-lwtheme) #navigator-toolbox:-moz-window-inactive {
|
||||
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -411,8 +392,8 @@ toolbarbutton[part="scrollbutton-down"] {
|
|||
0 2px 4px rgba(0, 0, 0, 0.45), 0 0px 2px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background,
|
||||
#TabsToolbar #firefox-view-button[open]>.toolbarbutton-icon {
|
||||
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
|
||||
#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
|
||||
box-shadow: var(--uc-tab-shadow) !important;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue