зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1855225 - Revert workaround from bug 1855151. r=dao,desktop-theme-reviewers
This just backs out bug 1855151. Depends on D189232 Differential Revision: https://phabricator.services.mozilla.com/D189233
This commit is contained in:
Родитель
2c95315493
Коммит
f1a05364e3
|
@ -43,28 +43,6 @@ body {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* These live here because image loads don't go through otherwise,
|
|
||||||
* see bug 1855151 */
|
|
||||||
#navigator-toolbox:-moz-lwtheme {
|
|
||||||
background-image: var(--lwt-additional-images);
|
|
||||||
background-repeat: var(--lwt-background-tiling);
|
|
||||||
background-position: var(--lwt-background-alignment);
|
|
||||||
background-color: var(--lwt-accent-color);
|
|
||||||
color: inherit;
|
|
||||||
|
|
||||||
&:-moz-window-inactive {
|
|
||||||
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* When a theme defines both theme_frame and additional_backgrounds, show
|
|
||||||
the latter atop the former. */
|
|
||||||
:root[lwtheme-image] & {
|
|
||||||
background-image: var(--lwt-header-image), var(--lwt-additional-images);
|
|
||||||
background-repeat: no-repeat, var(--lwt-background-tiling);
|
|
||||||
background-position: right top, var(--lwt-background-alignment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* We set large flex on both containers to allow the devtools toolbox to
|
/* We set large flex on both containers to allow the devtools toolbox to
|
||||||
* set a flex value itself. We don't want the toolbox to actually take up free
|
* set a flex value itself. We don't want the toolbox to actually take up free
|
||||||
* space, but we do want it to collapse when the window shrinks, and with
|
* space, but we do want it to collapse when the window shrinks, and with
|
||||||
|
|
|
@ -167,12 +167,6 @@
|
||||||
/* Toolbar / content area border */
|
/* Toolbar / content area border */
|
||||||
border-bottom: 1px solid var(--chrome-content-separator-color);
|
border-bottom: 1px solid var(--chrome-content-separator-color);
|
||||||
|
|
||||||
:root[customizing] & {
|
|
||||||
border-bottom-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Lwtheme rules live in browser/base/content temporarily, see bug 1855151 */
|
|
||||||
&:not(:-moz-lwtheme) {
|
|
||||||
background-color: var(--toolbox-non-lwt-bgcolor);
|
background-color: var(--toolbox-non-lwt-bgcolor);
|
||||||
color: var(--toolbox-non-lwt-textcolor);
|
color: var(--toolbox-non-lwt-textcolor);
|
||||||
|
|
||||||
|
@ -180,6 +174,29 @@
|
||||||
background-color: var(--toolbox-non-lwt-bgcolor-inactive, var(--toolbox-non-lwt-bgcolor));
|
background-color: var(--toolbox-non-lwt-bgcolor-inactive, var(--toolbox-non-lwt-bgcolor));
|
||||||
color: var(--toolbox-non-lwt-textcolor-inactive, var(--toolbox-non-lwt-textcolor));
|
color: var(--toolbox-non-lwt-textcolor-inactive, var(--toolbox-non-lwt-textcolor));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:root[customizing] & {
|
||||||
|
border-bottom-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:-moz-lwtheme {
|
||||||
|
background-image: var(--lwt-additional-images);
|
||||||
|
background-repeat: var(--lwt-background-tiling);
|
||||||
|
background-position: var(--lwt-background-alignment);
|
||||||
|
background-color: var(--lwt-accent-color);
|
||||||
|
color: inherit;
|
||||||
|
|
||||||
|
&:-moz-window-inactive {
|
||||||
|
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* When a theme defines both theme_frame and additional_backgrounds, show
|
||||||
|
the latter atop the former. */
|
||||||
|
:root[lwtheme-image] & {
|
||||||
|
background-image: var(--lwt-header-image), var(--lwt-additional-images);
|
||||||
|
background-repeat: no-repeat, var(--lwt-background-tiling);
|
||||||
|
background-position: right top, var(--lwt-background-alignment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче