зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1754266 - Fold platform-specific rules into a shared/tree.css. r=desktop-theme-reviewers,dao
* Move the {platform}/gloal/tree.css contents into @media blocks in a shared/tree.css
* Move %ifdef XP_Win into the window @media block
* Adjust manifests to map chrome://browser/skin/tree.css to the shared/tree.css
* Improve alphabetization of the desktop-jar.inc.mn
Differential Revision: https://phabricator.services.mozilla.com/D139433
This commit is contained in:
Sam Foster
Родитель
3ead9a3061
Коммит
0549dd7bec
|
|
@ -24,7 +24,6 @@ toolkit.jar:
|
|||
skin/classic/global/toolbar.css
|
||||
skin/classic/global/toolbarbutton.css
|
||||
skin/classic/global/tooltip.css
|
||||
* skin/classic/global/tree.css
|
||||
|
||||
skin/classic/global/icons/Authentication.png (icons/Authentication.png)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
%include ../../shared/tree.inc.css
|
||||
|
||||
/* ::::: sort direction indicator ::::: */
|
||||
|
||||
.treecol-sortdirection {
|
||||
appearance: auto;
|
||||
-moz-default-appearance: treeheadersortarrow;
|
||||
}
|
||||
|
|
@ -26,7 +26,6 @@ toolkit.jar:
|
|||
skin/classic/global/toolbar.css
|
||||
skin/classic/global/toolbarbutton.css
|
||||
skin/classic/global/tooltip.css
|
||||
* skin/classic/global/tree.css
|
||||
skin/classic/global/wizard.css
|
||||
skin/classic/global/arrow/panelarrow-vertical.svg (arrow/panelarrow-vertical.svg)
|
||||
skin/classic/global/icons/search-textbox.svg (icons/search-textbox.svg)
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
%include ../../shared/tree.inc.css
|
||||
|
||||
@media not (prefers-contrast) {
|
||||
/* We show a `SelectedItem` background on selected rows, so we do not need the
|
||||
dotted outline in that case. For users who have Full Keyboard Access
|
||||
enabled, macOS draws a blue highlight above the row highlight, so keyboard-
|
||||
only users can still discern the currently-selected row when multiple rows
|
||||
are selected. */
|
||||
treechildren::-moz-tree-row(selected, current, focus) {
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -24,6 +24,10 @@
|
|||
* skin/classic/global/arrowscrollbox.css (../../shared/arrowscrollbox.css)
|
||||
skin/classic/global/close-icon.css (../../shared/close-icon.css)
|
||||
skin/classic/global/datetimeinputpickers.css (../../shared/datetimeinputpickers.css)
|
||||
skin/classic/global/findbar.css (../../shared/findbar.css)
|
||||
skin/classic/global/notification.css (../../shared/notification.css)
|
||||
skin/classic/global/numberinput.css (../../shared/numberinput.css)
|
||||
skin/classic/global/tree.css (../../shared/tree.css)
|
||||
skin/classic/global/dirListing/dirListing.css (../../shared/dirListing/dirListing.css)
|
||||
#ifdef XP_MACOSX
|
||||
skin/classic/global/dirListing/folder.png (../../shared/dirListing/folder-osx.png)
|
||||
|
|
@ -32,9 +36,6 @@
|
|||
skin/classic/global/dirListing/folder.png (../../shared/dirListing/folder.png)
|
||||
skin/classic/global/dirListing/up.png (../../shared/dirListing/up.png)
|
||||
#endif
|
||||
skin/classic/global/findbar.css (../../shared/findbar.css)
|
||||
skin/classic/global/notification.css (../../shared/notification.css)
|
||||
skin/classic/global/numberinput.css (../../shared/numberinput.css)
|
||||
skin/classic/global/in-content/info-pages.css (../../shared/in-content/info-pages.css)
|
||||
skin/classic/global/in-content/toggle-button.css (../../shared/in-content/toggle-button.css)
|
||||
skin/classic/global/icons/arrow-left.svg (../../shared/icons/arrow-left.svg)
|
||||
|
|
@ -102,6 +103,8 @@
|
|||
skin/classic/global/illustrations/about-rights.svg (../../shared/illustrations/about-rights.svg)
|
||||
skin/classic/global/illustrations/about-license.svg (../../shared/illustrations/about-license.svg)
|
||||
skin/classic/global/illustrations/error-malformed-url.svg (../../shared/illustrations/error-malformed-url.svg)
|
||||
skin/classic/global/media/picture-in-picture-open.svg (../../shared/media/picture-in-picture-open.svg)
|
||||
skin/classic/global/media/picture-in-picture-closed.svg (../../shared/media/picture-in-picture-closed.svg)
|
||||
skin/classic/global/narrate.css (../../shared/narrate.css)
|
||||
skin/classic/global/narrate/arrow.svg (../../shared/narrate/arrow.svg)
|
||||
skin/classic/global/narrate/back.svg (../../shared/narrate/back.svg)
|
||||
|
|
@ -112,6 +115,8 @@
|
|||
skin/classic/global/narrate/stop.svg (../../shared/narrate/stop.svg)
|
||||
skin/classic/global/narrate/headphone.svg (../../shared/narrate/headphone.svg)
|
||||
skin/classic/global/narrate/headphone-active.svg (../../shared/narrate/headphone-active.svg)
|
||||
skin/classic/global/pictureinpicture/player.css (../../shared/pictureinpicture/player.css)
|
||||
skin/classic/global/pictureinpicture/texttracks.css (../../shared/pictureinpicture/texttracks.css)
|
||||
skin/classic/global/reader/RM-Sans-Serif.svg (../../shared/reader/RM-Sans-Serif.svg)
|
||||
skin/classic/global/reader/RM-Serif.svg (../../shared/reader/RM-Serif.svg)
|
||||
skin/classic/global/reader/RM-Minus-24x24.svg (../../shared/reader/RM-Minus-24x24.svg)
|
||||
|
|
@ -125,7 +130,4 @@
|
|||
skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg (../../shared/reader/RM-Content-Width-Plus-44x16.svg)
|
||||
skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
|
||||
skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
|
||||
skin/classic/global/pictureinpicture/player.css (../../shared/pictureinpicture/player.css)
|
||||
skin/classic/global/pictureinpicture/texttracks.css (../../shared/pictureinpicture/texttracks.css)
|
||||
skin/classic/global/media/picture-in-picture-open.svg (../../shared/media/picture-in-picture-open.svg)
|
||||
skin/classic/global/media/picture-in-picture-closed.svg (../../shared/media/picture-in-picture-closed.svg)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,14 +35,6 @@ treechildren::-moz-tree-row(multicol, odd) {
|
|||
background-color: -moz-oddtreerow;
|
||||
}
|
||||
|
||||
%ifdef XP_WIN
|
||||
@media (-moz-windows-default-theme) {
|
||||
treechildren::-moz-tree-row(hover) {
|
||||
background-color: hsla(0,0%,50%,.15);
|
||||
}
|
||||
}
|
||||
%endif
|
||||
|
||||
treechildren::-moz-tree-row(selected) {
|
||||
background-color: -moz-cellhighlight;
|
||||
}
|
||||
|
|
@ -229,3 +221,87 @@ html|input.tree-input {
|
|||
position: relative;
|
||||
z-index: 2147483647;
|
||||
}
|
||||
|
||||
@media (-moz-platform: windows) {
|
||||
@media (-moz-windows-default-theme) {
|
||||
treechildren::-moz-tree-row(hover) {
|
||||
background-color: hsla(0,0%,50%,.15);
|
||||
}
|
||||
}
|
||||
|
||||
/* ::::: sort direction indicator ::::: */
|
||||
|
||||
.treecol-sortdirection {
|
||||
list-style-image: none;
|
||||
-moz-context-properties: fill;
|
||||
fill: currentColor;
|
||||
}
|
||||
|
||||
treecol[sortDirection="ascending"]:not([hideheader="true"]) > .treecol-sortdirection {
|
||||
list-style-image: url("chrome://global/skin/tree/sort-asc.svg");
|
||||
}
|
||||
|
||||
treecol[sortDirection="descending"]:not([hideheader="true"]) > .treecol-sortdirection {
|
||||
list-style-image: url("chrome://global/skin/tree/sort-dsc.svg");
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
treecol,
|
||||
treecolpicker {
|
||||
appearance: none;
|
||||
background-color: ButtonFace;
|
||||
color: ButtonText;
|
||||
border-inline-start: 1px solid ThreeDLightShadow;
|
||||
box-shadow: inset 0 -1px ThreeDLightShadow;
|
||||
}
|
||||
treecol:where([ordinal="1"]) {
|
||||
border-inline-start: none;
|
||||
}
|
||||
:is(treecol, treecolpicker):where(:hover) {
|
||||
background-color: -moz-ButtonHoverFace;
|
||||
color: -moz-ButtonHoverText;
|
||||
}
|
||||
:is(treecol, treecolpicker):where(:hover:active) {
|
||||
background-color: -moz-ButtonActiveFace;
|
||||
color: -moz-ButtonActiveText;
|
||||
}
|
||||
}
|
||||
|
||||
@media (-moz-windows-classic) {
|
||||
treecol,
|
||||
treecolpicker {
|
||||
border: 1px solid;
|
||||
border-top-color: ThreeDHighlight;
|
||||
border-inline-end-color: ThreeDShadow;
|
||||
border-bottom-color: ThreeDShadow;
|
||||
border-inline-start-color: ThreeDHighlight;
|
||||
box-shadow: none;
|
||||
background-color: -moz-Dialog;
|
||||
}
|
||||
|
||||
:is(treecol, treecolpicker):where(:hover:active) {
|
||||
border-top-color: ThreeDShadow;
|
||||
border-inline-end-color: ThreeDHighlight;
|
||||
border-bottom-color: ThreeDHighlight;
|
||||
border-inline-start-color: ThreeDShadow;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (-moz-platform: macos) and (not (prefers-contrast)) {
|
||||
/* We show a `SelectedItem` background on selected rows, so we do not need the
|
||||
dotted outline in that case. For users who have Full Keyboard Access
|
||||
enabled, macOS draws a blue highlight above the row highlight, so keyboard-
|
||||
only users can still discern the currently-selected row when multiple rows
|
||||
are selected. */
|
||||
treechildren::-moz-tree-row(selected, current, focus) {
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (-moz-platform: linux) {
|
||||
.treecol-sortdirection {
|
||||
appearance: auto;
|
||||
-moz-default-appearance: treeheadersortarrow;
|
||||
}
|
||||
}
|
||||
|
|
@ -25,7 +25,6 @@ toolkit.jar:
|
|||
skin/classic/global/toolbar.css
|
||||
skin/classic/global/toolbarbutton.css
|
||||
skin/classic/global/tooltip.css
|
||||
* skin/classic/global/tree.css
|
||||
skin/classic/global/icons/Landscape.png (icons/Landscape.png)
|
||||
skin/classic/global/icons/menu-check.svg (icons/menu-check.svg)
|
||||
skin/classic/global/icons/Portrait.png (icons/Portrait.png)
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
%include ../../shared/tree.inc.css
|
||||
|
||||
/* ::::: sort direction indicator ::::: */
|
||||
|
||||
.treecol-sortdirection {
|
||||
list-style-image: none;
|
||||
-moz-context-properties: fill;
|
||||
fill: currentColor;
|
||||
}
|
||||
|
||||
treecol[sortDirection="ascending"]:not([hideheader="true"]) > .treecol-sortdirection {
|
||||
list-style-image: url("chrome://global/skin/tree/sort-asc.svg");
|
||||
}
|
||||
|
||||
treecol[sortDirection="descending"]:not([hideheader="true"]) > .treecol-sortdirection {
|
||||
list-style-image: url("chrome://global/skin/tree/sort-dsc.svg");
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
treecol,
|
||||
treecolpicker {
|
||||
appearance: none;
|
||||
background-color: ButtonFace;
|
||||
color: ButtonText;
|
||||
border-inline-start: 1px solid ThreeDLightShadow;
|
||||
box-shadow: inset 0 -1px ThreeDLightShadow;
|
||||
}
|
||||
treecol:where([ordinal="1"]) {
|
||||
border-inline-start: none;
|
||||
}
|
||||
:is(treecol, treecolpicker):where(:hover) {
|
||||
background-color: -moz-ButtonHoverFace;
|
||||
color: -moz-ButtonHoverText;
|
||||
}
|
||||
:is(treecol, treecolpicker):where(:hover:active) {
|
||||
background-color: -moz-ButtonActiveFace;
|
||||
color: -moz-ButtonActiveText;
|
||||
}
|
||||
}
|
||||
|
||||
@media (-moz-windows-classic) {
|
||||
treecol,
|
||||
treecolpicker {
|
||||
border: 1px solid;
|
||||
border-top-color: ThreeDHighlight;
|
||||
border-inline-end-color: ThreeDShadow;
|
||||
border-bottom-color: ThreeDShadow;
|
||||
border-inline-start-color: ThreeDHighlight;
|
||||
box-shadow: none;
|
||||
background-color: -moz-Dialog;
|
||||
}
|
||||
|
||||
:is(treecol, treecolpicker):where(:hover:active) {
|
||||
border-top-color: ThreeDShadow;
|
||||
border-inline-end-color: ThreeDHighlight;
|
||||
border-bottom-color: ThreeDHighlight;
|
||||
border-inline-start-color: ThreeDShadow;
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче