diff options
Diffstat (limited to 'toolkit/themes')
204 files changed, 5357 insertions, 574 deletions
diff --git a/toolkit/themes/linux/mozapps/extensions/category-dictionaries.png b/toolkit/themes/linux/mozapps/extensions/category-dictionaries.png Binary files differnew file mode 100644 index 000000000..a1e0d5359 --- /dev/null +++ b/toolkit/themes/linux/mozapps/extensions/category-dictionaries.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-experiments.png b/toolkit/themes/linux/mozapps/extensions/category-experiments.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/linux/mozapps/extensions/category-experiments.png diff --git a/toolkit/themes/linux/mozapps/extensions/experimentGeneric.png b/toolkit/themes/linux/mozapps/extensions/experimentGeneric.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/linux/mozapps/extensions/experimentGeneric.png diff --git a/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png b/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png Binary files differnew file mode 100644 index 000000000..2ae95a5b2 --- /dev/null +++ b/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css index a75669937..5c642fbbf 100644 --- a/toolkit/themes/linux/mozapps/extensions/extensions.css +++ b/toolkit/themes/linux/mozapps/extensions/extensions.css @@ -2,10 +2,318 @@ * 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/extensions/extensions.inc.css +@import url("chrome://global/skin/inContentUI.css"); + + +/*** global warnings ***/ + +.global-warning-container { + overflow-x: hidden; +} + +.global-warning { + -moz-box-align: center; + padding: 0 8px; + font-weight: bold; +} + +.global-warning-text { + color: -moz-FieldText; +} + +#addons-page[warning] .global-warning-container { + background-color: rgba(255, 255, 0, 0.1); + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); + background-repeat: repeat-x; +} + +#detail-view .global-warning { + padding: 4px 12px; + border-bottom: 1px solid ThreeDShadow; + min-height: 41px; +} + +@media (max-width: 600px) { + .global-warning-text { + display: none; + } +} + +/* Plugins aren't yet disabled by safemode (bug 342333), + so don't show that warning when viewing plugins. */ +#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, +#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container { + background-color: inherit; + background-image: none; +} + + +/*** notification icons ***/ + +.warning-icon { + list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu"); + width: 16px; + height: 16px; + margin: 3px 0; +} + +.error-icon { + list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu"); + width: 16px; + height: 16px; + margin: 3px 0; +} + +.pending-icon, +.info-icon { + list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu"); + width: 16px; + height: 16px; + margin: 3px 0; +} + +/*** view alert boxes ***/ + +.alert-container { + -moz-box-align: center; +} + +.alert-spacer-before { + -moz-box-flex: 1; +} + +.alert-spacer-after { + -moz-box-flex: 3; +} + +.alert { + -moz-box-align: center; + padding: 10px; + font-size: 12px; + border: 1px solid ThreeDShadow; + border-radius: 8px; + color: WindowText; + background-color: Window; + background-clip: padding-box; +} + +.alert .alert-title { + font-weight: bold; + font-size: 200%; + margin-bottom: 15px; +} + +.alert button { + margin: 1em 2em; +} + +.loading { + list-style-image: url("chrome://global/skin/icons/loading_16.png"); + padding-left: 20px; + padding-right: 20px; +} + +/*** category selector ***/ + +#categories { + -moz-appearance: none; + border: none; + -moz-margin-end: -1px; + background-color: transparent; + position: relative; + margin-top: 41px; +} + +.category { + -moz-appearance: none; + border-width: 1px; + -moz-border-end-width: 0; + border-style: solid; + border-color: transparent; + padding: 10px 4px; + -moz-box-align: center; + overflow: hidden; + min-height: 0; + color: WindowText; +} + +.category:-moz-locale-dir(ltr) { + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; +} + +.category:-moz-locale-dir(rtl) { + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; +} + +.category[disabled] { + border-top: 0; + border-bottom: 0; + height: 0; + opacity: 0; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category:not([disabled]) { + height: 52px; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category[selected] { + background-color: -moz-Field; + color: -moz-FieldText; + border-color: ThreeDShadow; +} + +.category-name { + font-size: 150%; +} + +/* Maximize the size of the viewport when the window is small */ +@media (max-width: 800px) { + .category-name { + display: none; + } +} + +.category-badge { + background-color: Highlight; + padding: 2px 8px; + margin: 6px 0; + border-radius: 10000px; + color: HighlightText; + font-weight: bold; + text-align: center; +} + +.category-badge[value="0"] { + visibility: hidden; +} + +.category-icon { + width: 32px; + height: 32px; + -moz-margin-start: 6px; +} + +#category-search > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-search.png"); +} +#category-discover > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); +} +#category-locale > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); +} +#category-searchengine > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); +} +#category-extension > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); +} +#category-service > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); +} +#category-theme > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); +} +#category-plugin > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); +} +#category-dictionary > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); +} +#category-experiment > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); +} +#category-availableUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); +} +#category-recentUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png"); +} + + +/*** header ***/ + +#header { + margin-bottom: 18px; +} + +.nav-button { + min-width: 0; +} + +#back-btn:-moz-locale-dir(ltr) { + list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar"); +} + +#forward-btn:-moz-locale-dir(ltr) { + list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar"); +} + +#back-btn:-moz-locale-dir(rtl) { + list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar"); +} + +#forward-btn:-moz-locale-dir(rtl) { + list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar"); +} + +#back-btn[disabled="true"]:-moz-locale-dir(ltr) { + list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled"); +} + +#forward-btn[disabled="true"]:-moz-locale-dir(ltr) { + list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled"); +} + +#back-btn[disabled="true"]:-moz-locale-dir(rtl) { + list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled"); +} + +#forward-btn[disabled="true"]:-moz-locale-dir(rtl) { + list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled"); +} + +#header-utils-btn { + min-width: 4.5em; +} #header-utils-btn .toolbarbutton-icon { - list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); + list-style-image: url("moz-icon://stock/gtk-preferences?size=toolbar"); +} + +#header-utils-btn:-moz-focusring > .button-box { + border: none; +} + +#header-search { + margin: 0; +} + +@media (max-width: 600px) { + #header-search { + width: 12em; + } +} + +.view-header { + padding: 4px; + margin: 0; + min-height: 41px; + background-color: ThreeDHighlight; + border-bottom: 1px solid ThreeDShadow; +} + + +/*** sorters ***/ + +.sort-controls { + -moz-appearance: none; } .sorter[checkState="1"] .button-icon { @@ -18,7 +326,247 @@ list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=16"); } + +/*** discover view ***/ + +.discover-spacer-before, +.discover-spacer-after { + -moz-box-flex: 1; +} + +#discover-error .alert { + max-width: 45em; + -moz-box-flex: 1; +} + +.discover-logo { + list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png"); + -moz-margin-end: 15px; +} + +.discover-title { + font-weight: bold; + font-size: 24px; + font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif; + margin: 0 0 15px 0; +} + +.discover-description { + text-align: justify; + margin: 0 0 15px 0; +} + +.discover-footer { + text-align: justify; +} + + +/*** list ***/ + +.list { + -moz-appearance: none; + margin: 0; + border: none; + background-color: transparent; +} + +.addon { + border-bottom: 1px solid ThreeDLightShadow; + padding: 5px; +} + +.addon[selected] .text-link, +.addon[selected] .button-link { + color: inherit; +} + +.details { + cursor: pointer; + margin: 0; + -moz-margin-start: 10px; +} + +.icon-container { + width: 48px; + height: 48px; + margin: 3px 7px; + -moz-box-align: center; + -moz-box-pack: center; +} + +.icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + max-width: 48px; + max-height: 48px; +} + +.addon[active="false"] .icon { + filter: grayscale(1); +} + +.addon-view[type="theme"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-view[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-view[type="plugin"] .icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-view[type="dictionary"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +.addon-view[type="experiment"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); +} + +.name-container { + font-size: 150%; + margin-bottom: 0; + font-weight: bold; + -moz-box-align: end; + -moz-box-flex: 1; +} + +.creator { + font-weight: bold; +} + +.addon-view[active="false"]:not([selected]) { + color: GrayText; +} + +.description-container { + -moz-margin-start: 6px; + -moz-box-align: center; +} + +.description { + margin: 0; +} + +.warning, +.pending, +.error { + -moz-margin-start: 48px; + -moz-box-align: center; +} + +.content-container, +.basicinfo-container { + -moz-box-align: start; +} + +.addon[status="installing"] > .content-container { + -moz-box-align: stretch; +} + +.advancedinfo-container, +.update-info-container { + -moz-box-align: center; +} + +.update-available { + -moz-box-align: end; +} + +.install-status-container { + -moz-box-pack: end; + -moz-box-align: end; +} + +.name-outer-container { + -moz-box-pack: center; +} + +.relnotes-toggle-container, +.icon-outer-container { + -moz-box-pack: start; +} + +.status-container, +.control-container { + -moz-box-pack: end; +} + +.addon-view:not([selected]) .warning { + color: #90792E; +} + +.addon-view:not([selected]) .error { + color: #7C322B; +} + +.addon-view:not([selected]) .pending { + color: #4F7939; +} + +.addon[active="false"] { + background-image: linear-gradient(rgba(135, 135, 135, 0.2), + rgba(135, 135, 135, 0.1)); +} + +.addon-view[notification="warning"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), + linear-gradient(rgba(255, 255, 0, 0.04), + rgba(255, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[notification="error"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), + linear-gradient(rgba(255, 0, 0, 0.04), + rgba(255, 0, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="enable"], +.addon-view[pending="upgrade"], +.addon-view[pending="install"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), + linear-gradient(rgba(0, 255, 0, 0.04), + rgba(0, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="disable"], +.addon-view[pending="uninstall"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), + linear-gradient(rgba(128, 128, 128, 0.04), + rgba(128, 128, 128, 0)); + background-repeat: repeat-x; +} + +.addon .relnotes-container { + -moz-box-align: start; + height: 0; + overflow: hidden; + opacity: 0; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon[show-relnotes] .relnotes-container { + opacity: 1; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon .relnotes-header { + font-weight: bold; + margin: 10px 0; +} + .addon .relnotes-toggle { + -moz-appearance: none; + border: none; + background: transparent; + font-weight: bold; + cursor: pointer; list-style-image: url("moz-icon://stock/gtk-go-down?size=16"); } @@ -30,13 +578,379 @@ list-style-image: url("moz-icon://stock/gtk-go-up?size=16"); } + +/*** search view ***/ + +#search-filter { + padding: 5px 20px; + font-size: 120%; + overflow-x: hidden; + border-bottom: 1px solid ThreeDShadow; +} + +#search-filter-label { + font-weight: bold; +} + +#search-allresults-link { + margin-top: 1em; + margin-bottom: 2em; +} + +/*** detail view ***/ + +#detail-view[active="false"] .fade { + opacity: 0.6; +} + +#detail-view .loading { + opacity: 0; +} + +#detail-view[loading-extended] .loading { + -moz-box-align: center; + -moz-box-pack: center; + opacity: 1; + transition-property: opacity; + transition-duration: 1s; +} + +.detail-view-container { + padding: 0 2em 2em 2em; + font-size: 110%; +} + +#detail-notifications { + margin-top: 1em; + margin-bottom: 2em; +} + +#detail-notifications .warning, +#detail-notifications .pending, +#detail-notifications .error { + -moz-margin-start: 0; +} + +#detail-icon-container { + width: 64px; + -moz-margin-end: 10px; +} + +#detail-icon { + max-width: 64px; + max-height: 64px; +} + +#detail-summary { + margin-bottom: 2em; +} + +#detail-name-container { + font-size: 200%; +} + +#detail-screenshot { + -moz-margin-end: 2em; + max-width: 300px; + max-height: 300px; +} + +#detail-screenshot[loading] { + background-image: url("chrome://global/skin/icons/loading_16.png"); + background-position: 50% 50%; + background-repeat: no-repeat; + border: 1px threedshadow solid; + border-radius: 5px; + box-sizing: border-box; +} + +#detail-screenshot[loading="error"] { + background-image: url("chrome://global/skin/media/error.png"); +} + +#detail-desc-container { + margin-bottom: 2em; +} + +#detail-desc, #detail-fulldesc { + -moz-margin-start: 6px; + /* This is necessary to fix layout issues with multi-line descriptions, see + bug 592712*/ + outline: solid transparent; + white-space: pre-wrap; + min-width: 10em; +} + +#detail-fulldesc { + margin-top: 1em; +} + +#detail-contributions { + border-radius: 5px; + border: 1px solid ThreeDShadow; + margin-bottom: 2em; + padding: 1em; + background: ThreeDHighlight; +} + +#detail-contrib-description { + font-style: italic; + margin-bottom: 1em; +} + +#detail-contrib-suggested { + color: GrayText; +} + +#detail-grid { + margin-bottom: 2em; +} + +#detail-grid > columns > column:first-child { + min-width: 15em; + max-width: 25em; +} + +.detail-row[first-row="true"], +.detail-row-complex[first-row="true"], +setting[first-row="true"] { + border-top: none; +} + +.detail-row, +.detail-row-complex, +setting { + border-top: 1px solid ThreeDShadow; + -moz-box-align: center; + min-height: 32px; +} + +#detail-controls { + margin-bottom: 1em; +} + +#detail-view[active="false"]:not([pending]):not([notification]) { + background-image: linear-gradient(rgba(135, 135, 135, 0.1), + rgba(135, 135, 135, 0)); +} + +setting[first-row="true"] { + margin-top: 2em; +} + +setting { + -moz-box-align: start; +} + +.preferences-alignment { + min-height: 32px; + -moz-box-align: center; +} + +.preferences-description { + font-size: 90.9%; + color: graytext; + margin-top: -2px; + -moz-margin-start: 2em; + white-space: pre-wrap; +} + +.preferences-description:empty { + display: none; +} + +menulist { /* Fixes some styling inconsistencies */ + font-size: 100%; + margin: 1px 5px 2px 5px; +} + +colorpicker[type="button"] { /* Fixes some styling inconsistencies */ + height: 29px; + margin: 1px 5px 2px 5px; +} + +setting[type="radio"] > radiogroup { + -moz-box-orient: horizontal; +} + +/*** creator ***/ + +.creator > label { + -moz-margin-start: 0; + -moz-margin-end: 0; +} + +.creator > .text-link { + margin-top: 1px; + margin-bottom: 1px; +} + + +/*** rating ***/ + +.meta-rating { + -moz-margin-end: 0; + vertical-align: text-top; +} + .meta-rating[showrating="average"] > .star { list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png"); padding: 0 1px; } +.meta-rating[showrating="user"] > .star { + list-style-image: url("chrome://mozapps/skin/extensions/rating-unrated.png"); + padding: 2px 3px; +} + .meta-rating > .star[on="true"], .meta-rating[showrating="user"] > .star[hover] { list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); padding: 0 1px; } + + +/*** download progress ***/ + +.download-progress { + width: 200px; +} + +.download-progress .start-cap, +.download-progress .end-cap { + display: none; +} + +.download-progress .progress { + padding: 0; + margin: 0; + border: none; +} + +.download-progress .cancel { + -moz-appearance: none; + background-color: ButtonFace; + padding-bottom: 1px; + -moz-padding-start: 2px; + border-width: 1px; + border-style: solid; + border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; + border-radius: 10000px; + min-width: 16px; + width: 16px; + height: 16px; + margin: 3px; +} + +.download-progress .cancel:hover { + background-color: -moz-ButtonHoverFace; +} + +.download-progress .cancel { + list-style-image: url('chrome://mozapps/skin/extensions/cancel.png'); +} + +.download-progress .status-container { + -moz-box-align: center; +} + + +/*** install status ***/ + +.install-status { + -moz-box-align: center; +} + + +/*** check for updates ***/ + +#updates-container { + -moz-box-align: center; +} + +#updates-installed, +#updates-downloaded { + font-weight: bold; +} + +#update-selected { + margin: 12px; +} + + +/*** buttons ***/ + +.addon-control[disabled="true"]:not(.no-auto-hide) { + display: none; +} + +.no-auto-hide .addon-control { + display: block !important; +} + +.addon-control.enable { + list-style-image: url("moz-icon://stock/gtk-yes?size=button"); +} + +.addon-control.disable { + list-style-image: url("moz-icon://stock/gtk-no?size=button"); +} + +.addon-control.remove { + list-style-image: url("moz-icon://stock/gtk-remove?size=button"); +} + +.addon-control.preferences { + list-style-image: url("moz-icon://stock/gtk-preferences?size=button"); +} + +.addon-control.install, +.addon-control.update { + list-style-image: url("moz-icon://stock/gtk-save?size=button"); +} + +.button-link { + -moz-appearance: none; + background: transparent; + border: none; + text-decoration: underline; + color: -moz-nativehyperlinktext; + cursor: pointer; + min-width: 0; + margin: 0 6px; +} + +.button-link:active { + color: -moz-activehyperlinktext; +} + +.header-button .toolbarbutton-text { + display: none; +} + +/*** telemetry experiments ***/ + +#detail-experiment-container { + font-size: 80%; + margin-bottom: 1em; +} + +#detail-experiment-bullet-container, +#detail-experiment-state, +#detail-experiment-time, +.experiment-bullet-container, +.experiment-state, +.experiment-time { + vertical-align: middle; + display: inline-block; +} + +.addon .experiment-bullet, +#detail-experiment-bullet { + fill: rgb(158, 158, 158); +} + +.addon[active="true"] .experiment-bullet, +#detail-view[active="true"] #detail-experiment-bullet { + fill: rgb(106, 201, 20); +} diff --git a/toolkit/themes/linux/mozapps/extensions/newaddon.css b/toolkit/themes/linux/mozapps/extensions/newaddon.css index edfba0ef5..2e5e25210 100644 --- a/toolkit/themes/linux/mozapps/extensions/newaddon.css +++ b/toolkit/themes/linux/mozapps/extensions/newaddon.css @@ -2,4 +2,109 @@ * 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/extensions/newaddon.inc.css +@import url("chrome://global/skin/inContentUI.css"); + +#addon-page { + padding: 0; +} + +#addon-scrollbox { + overflow: auto; + -moz-box-orient: vertical; + -moz-box-flex: 1; +} + +#spacer-start { + -moz-box-flex: 1; +} + +#spacer-end { + -moz-box-flex: 3; +} + +#addon-container { + overflow: visible; + max-width: 600px; + margin: 20px; + padding: 30px 90px; +} + +#addon-info { + -moz-box-align: start; + margin: 25px 10px; +} + +#icon { + -moz-margin-end: 10px; + max-width: 64px; + max-height: 64px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); +} + +.addon-info[type="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-info[type="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-info[type="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-info[type="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#name { + font-size: 130%; +} + +#author { + color: GrayText; +} + +#location { + color: GrayText; +} + +#warning { + margin-bottom: 25px; + -moz-box-align: start; +} + +#warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + width: 16px; + height: 15px; + -moz-margin-end: 5px; +} + +#allow { + -moz-margin-start: 84px; + margin-bottom: 20px; +} + +#continuePanel, +#restartPanel { + margin-top: 25px; + -moz-box-pack: end; + -moz-box-align: end; +} + +#continuePanel { + -moz-box-pack: end; +} + +#restartMessage { + text-align: right; +} + +#restartSpacer { + -moz-box-flex: 1; +} + +#later { + color: GrayText; +} diff --git a/toolkit/themes/linux/mozapps/extensions/selectAddons.css b/toolkit/themes/linux/mozapps/extensions/selectAddons.css new file mode 100644 index 000000000..8a94a6c18 --- /dev/null +++ b/toolkit/themes/linux/mozapps/extensions/selectAddons.css @@ -0,0 +1,162 @@ +/* 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/. */ + +#view-deck { + background: Window; +} + +.heading { + font-size: 270%; + text-align: center; + margin: 0 100px; +} + +.progress { + margin: 10px 128px; +} + +.progress-label, +#errors-description { + text-align: center; + margin: 0 10px; +} + +#checking-heading, +#update-heading, +#errors-heading { + margin-top: 90px; +} + +#select-heading, +#confirm-heading { + margin-top: 10px; + margin-bottom: 10px; + text-align: center; +} + +#select-description, +#confirm-description { + margin: 10px; +} + +#select-list { + border-top: 1px solid WindowFrame; + background-color: Window; +} + +#select-grid column { + -moz-box-align: center; +} + +#select-grid row { + -moz-box-align: stretch; +} + +#select-grid row:nth-of-type(odd) { + background-color: -moz-oddtreerow; +} + +#select-grid label, +#select-grid checkbox { + margin-top: 0; + margin-bottom: 0; +} + +.select-cell { + -moz-box-align: center; + -moz-box-pack: start; +} + +#select-header .select-cell { + -moz-appearance: treeheadercell; + box-sizing: border-box; +} + +.select-keep { + -moz-box-pack: center; +} + +.select-keep .checkbox-label-box { + display: none; +} + +.select-keep .addon-keep-checkbox:-moz-focusring { + outline: 1px dotted ThreeDDarkShadow; +} + +.select-icon { + width: 20px; +} + +#select-grid separator { + display: none; +} + +.addon-name, +.addon-action-message, +.addon-action-update { + box-sizing: border-box; + margin: 0; + padding-top: 1px; + padding-bottom: 2px; + -moz-padding-start: 6px; + -moz-padding-end: 5px; +} + +.addon:not([active]) .addon-name, +.addon:not([active]) .addon-action-message, +.addon:not([active]) .addon-action-update { + color: GrayText; +} + +.addon-icon { + height: 16px; + width: 16px; + margin: 2px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); +} + +.addon-icon[type="theme"] { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric-16.png"); +} + +.addon-icon[type="plugin"] { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); +} + +.addon-icon[type="dictionary"] { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png"); +} + +.action-list { + margin-top: 10px; + -moz-margin-start: 5em; +} + +.action-header { + margin-bottom: 10px; +} + +#confirm .addon { + -moz-margin-start: 3em; + -moz-box-align: center; +} + +.addon:not([active]) .addon-icon, +#disable-list .addon-icon, +#incompatible-list .addon-icon { + filter: grayscale(1); +} + +#footer { + padding: 15px 12px; + border-top: 2px solid; + -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow; +} + +.progress-label, +#footer-label { + font-style: italic; + color: GrayText; +} diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index 2070dd6fd..37325c0be 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -6,21 +6,50 @@ toolkit.jar: #include ../../shared/mozapps.inc.mn skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) -* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) +#else + skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) + skin/classic/mozapps/extensions/category-languages.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/category-extensions.png (extensions/extensionGeneric.png) + skin/classic/mozapps/extensions/category-themes.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) + skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png) + skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png) skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/experimentGeneric.png (extensions/experimentGeneric.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) - skin/classic/mozapps/extensions/heart.png (extensions/heart.png) + skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) + skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric.png) +#endif + skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png) + skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) + skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) @@ -28,7 +57,7 @@ toolkit.jar: skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/linux/mozapps/passwordmgr/key-16.png b/toolkit/themes/linux/mozapps/passwordmgr/key-16.png Binary files differnew file mode 100644 index 000000000..ac135b847 --- /dev/null +++ b/toolkit/themes/linux/mozapps/passwordmgr/key-16.png diff --git a/toolkit/themes/linux/mozapps/passwordmgr/key-64.png b/toolkit/themes/linux/mozapps/passwordmgr/key-64.png Binary files differnew file mode 100644 index 000000000..0fb69f382 --- /dev/null +++ b/toolkit/themes/linux/mozapps/passwordmgr/key-64.png diff --git a/toolkit/themes/linux/mozapps/passwordmgr/key.png b/toolkit/themes/linux/mozapps/passwordmgr/key.png Binary files differnew file mode 100644 index 000000000..b5e8afefc --- /dev/null +++ b/toolkit/themes/linux/mozapps/passwordmgr/key.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-available.png b/toolkit/themes/linux/mozapps/webextensions/category-available.png Binary files differnew file mode 100644 index 000000000..689d526c9 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-discover.png b/toolkit/themes/linux/mozapps/webextensions/category-discover.png Binary files differnew file mode 100644 index 000000000..ccea27524 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-plugins.png b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png Binary files differnew file mode 100644 index 000000000..b253dd08f --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-recent.png b/toolkit/themes/linux/mozapps/webextensions/category-recent.png Binary files differnew file mode 100644 index 000000000..9039b27aa --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-search.png b/toolkit/themes/linux/mozapps/webextensions/category-search.png Binary files differnew file mode 100644 index 000000000..52e91a7ce --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/linux/mozapps/webextensions/category-service.png b/toolkit/themes/linux/mozapps/webextensions/category-service.png Binary files differnew file mode 100644 index 000000000..997c8541c --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png Binary files differnew file mode 100644 index 000000000..08a0447a4 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png Binary files differnew file mode 100644 index 000000000..a1e0d5359 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png Binary files differnew file mode 100644 index 000000000..b1a2f3652 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/webextensions/extensions.css b/toolkit/themes/linux/mozapps/webextensions/extensions.css new file mode 100644 index 000000000..5a11df119 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/extensions.css @@ -0,0 +1,42 @@ +/* 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/webextensions/extensions.inc.css + +#header-utils-btn .toolbarbutton-icon { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); +} + +.sorter[checkState="1"] .button-icon { + display: -moz-box; + list-style-image: url("moz-icon://stock/gtk-sort-descending?size=16"); +} + +.sorter[checkState="2"] .button-icon { + display: -moz-box; + list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=16"); +} + +.addon .relnotes-toggle { + list-style-image: url("moz-icon://stock/gtk-go-down?size=16"); +} + +.addon .relnotes-toggle > .button-box > .button-icon { + display: -moz-box; +} + +.addon[show-relnotes] .relnotes-toggle { + list-style-image: url("moz-icon://stock/gtk-go-up?size=16"); +} + +.meta-rating[showrating="average"] > .star { + list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png"); + padding: 0 1px; +} + +.meta-rating > .star[on="true"], +.meta-rating[showrating="user"] > .star[hover] { + list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); + padding: 0 1px; +} diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/webextensions/heart.png Binary files differindex 655f4c4be..655f4c4be 100644 --- a/toolkit/themes/linux/mozapps/extensions/heart.png +++ b/toolkit/themes/linux/mozapps/webextensions/heart.png diff --git a/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png Binary files differnew file mode 100644 index 000000000..c72115906 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/linux/mozapps/webextensions/newaddon.css b/toolkit/themes/linux/mozapps/webextensions/newaddon.css new file mode 100644 index 000000000..5856c08b5 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/newaddon.css @@ -0,0 +1,5 @@ +/* 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/webextensions/newaddon.inc.css diff --git a/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png Binary files differnew file mode 100644 index 000000000..019886fea --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png Binary files differnew file mode 100644 index 000000000..cde1c7834 --- /dev/null +++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build index 3d435ba71..4031f36b8 100644 --- a/toolkit/themes/moz.build +++ b/toolkit/themes/moz.build @@ -17,7 +17,11 @@ # mobile native UIs that do not use XUL for UI toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] -app = CONFIG['MOZ_BUILD_APP'] +if CONFIG['MOZ_PHOENIX']: + DEFINES['MOZ_PHOENIX'] = 1 + app = 'browser' +else: + app = CONFIG['MOZ_BUILD_APP'] if toolkit == 'cocoa': DIRS += ['osx'] diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index e979d4a8c..79bb062ab 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -145,7 +145,7 @@ toolkit.jar: skin/classic/global/tree/folder.png (tree/folder.png) skin/classic/global/tree/folder@2x.png (tree/folder@2x.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/extensions/about.css index c13ce5f59..cfabd47db 100644 --- a/toolkit/themes/osx/mozapps/extensions/about.css +++ b/toolkit/themes/osx/mozapps/extensions/about.css @@ -19,10 +19,10 @@ } #extensionIcon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); max-width: 64px; max-height: 64px; - margin-inline-end: 6px; + -moz-margin-end: 6px; } #genericAbout[addontype="theme"] #extensionIcon { @@ -64,7 +64,7 @@ } .boxIndent { - margin-inline-start: 18px; + -moz-margin-start: 18px; } #extensionCreator, .contributor { diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-error.png b/toolkit/themes/osx/mozapps/extensions/alerticon-error.png Binary files differnew file mode 100644 index 000000000..8740e4911 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/alerticon-error.png diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png b/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png Binary files differnew file mode 100644 index 000000000..2c5f628ab --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png b/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png Binary files differnew file mode 100644 index 000000000..a186c6b7a --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png b/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png Binary files differnew file mode 100644 index 000000000..75ea826f9 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png diff --git a/toolkit/themes/osx/mozapps/extensions/blocklist.css b/toolkit/themes/osx/mozapps/extensions/blocklist.css index 02f6e1d49..b241c9446 100644 --- a/toolkit/themes/osx/mozapps/extensions/blocklist.css +++ b/toolkit/themes/osx/mozapps/extensions/blocklist.css @@ -5,8 +5,8 @@ richlistitem { padding-top: 6px; padding-bottom: 6px; - padding-inline-start: 7px; - padding-inline-end: 7px; + -moz-padding-start: 7px; + -moz-padding-end: 7px; border-bottom: 1px solid #C0C0C0; } diff --git a/toolkit/themes/osx/mozapps/extensions/category-searchengines.png b/toolkit/themes/osx/mozapps/extensions/category-searchengines.png Binary files differnew file mode 100644 index 000000000..b893cb48a --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/category-searchengines.png diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/extensions/eula.css index 05aeb3c1c..5fb2c52df 100644 --- a/toolkit/themes/osx/mozapps/extensions/eula.css +++ b/toolkit/themes/osx/mozapps/extensions/eula.css @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); max-width: 48px; max-height: 48px; - margin-inline-end: 6px; + -moz-margin-end: 6px; } #eula-dialog[addontype="theme"] #icon { diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png b/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png Binary files differnew file mode 100644 index 000000000..6a76774c7 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css index d4dac2f01..9614967a4 100644 --- a/toolkit/themes/osx/mozapps/extensions/extensions.css +++ b/toolkit/themes/osx/mozapps/extensions/extensions.css @@ -2,21 +2,385 @@ * 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/extensions/extensions.inc.css +@import url("chrome://global/skin/inContentUI.css"); -.no-auto-hide > .menulist-dropmarker { - padding-inline-start: 0px !important; +%include ../../global/shared.inc + +@namespace html url("http://www.w3.org/1999/xhtml"); + + +/*** global warnings ***/ + +.global-warning-container { + overflow-x: hidden; +} + +.global-warning { + -moz-box-align: center; + padding: 0 8px; + color: #916D15; + font-weight: bold; +} + +.global-warning, +.global-warning .button-link { + text-shadow: @loweredShadow@; +} + +#addons-page[warning] .global-warning-container { + background-color: rgba(255, 255, 0, 0.1); + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); + background-repeat: repeat-x; +} + +#detail-view .global-warning { + padding: 4px 12px; + min-height: 31px; + border-bottom: 1px solid rgba(50, 65, 92, 0.4); +} + +@media (max-width: 600px) { + .global-warning-text { + display: none; + } + + .global-warning .warning-icon { + background-color: rgba(255, 255, 255, 0.7); + box-shadow: 0px 0px 2px 4px rgba(255, 255, 255, 0.7); + border-radius: 10px; + } +} + +/*** global informations ***/ +#addons-page .global-info-container { + background-color: #e3e6eb; + border-top-right-radius: 5px; + border-top-left-radius: 5px; +} + +/* Plugins aren't yet disabled by safemode (bug 342333), + so don't show that warning when viewing plugins. */ +#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, +#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container { + background-color: inherit; + background-image: none; +} + + +/*** notification icons ***/ + +.warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.error-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.pending-icon, +.info-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.addon-view[pending="disable"] .pending-icon, +.addon-view[pending="uninstall"] .pending-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + + +/*** view alert boxes ***/ + +.alert-container { + -moz-box-align: center; +} + +.alert-spacer-before { + -moz-box-flex: 1; +} + +.alert-spacer-after { + -moz-box-flex: 3; +} + +.alert { + -moz-box-align: center; + padding: 10px; + color: #373D48; + font-size: 12px; + border: 1px solid #A8B8D1; + border-radius: 8px; + background-image: linear-gradient(rgba(255, 255, 255, 0.7), rgba(236, 241, 247, 0.7)); + background-clip: padding-box; + box-shadow: 0 -3px 0 rgba(58, 78, 103, 0.05) inset, + 0 3px 0 rgba(175, 195, 220, 0.3); +} + +.alert .alert-title { + font-weight: bold; + font-size: 200%; + margin-bottom: 15px; +} + +.alert button { + margin: 1em 2em; +} + +.loading { + list-style-image: url("chrome://global/skin/icons/loading_16.png"); + padding-left: 20px; + padding-right: 20px; +} + + + +/*** category selector ***/ + +#categories { + -moz-appearance: none; + border: none; + -moz-margin-end: -1px; + background-color: transparent; + position: relative; + margin-top: 31px; +} + +.category { + -moz-appearance: none; + color: #252F3B; + border-width: 1px; + border-style: solid; + border-color: transparent; + padding: 10px 4px; + -moz-box-align: center; + overflow: hidden; + min-height: 0; +} + +.category:-moz-locale-dir(ltr) { + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; +} + +.category:-moz-locale-dir(rtl) { + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; +} + +.category[disabled] { + border-top: 0; + border-bottom: 0; + height: 0; + opacity: 0; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category:not([disabled]) { + height: 52px; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category[selected] { + background-color: rgba(255, 255, 255, 0.35); + color: -moz-dialogtext; + border-color: rgba(50, 65, 92, 0.4); + -moz-border-end-color: #C9CFD7; +} + +.category-name { + font-size: 150%; +} + +/* Maximize the size of the viewport when the window is small */ +@media (max-width: 800px) { + .category-name { + display: none; + } +} + +.category-badge { + background-color: #55D4FF; + padding: 2px 8px; + margin: 6px 0; + border-radius: 10000px; + color: #FFF; + font-weight: bold; + text-align: center; +} + +.category-badge[value="0"] { + visibility: hidden; +} + +.category-icon { + width: 32px; + height: 32px; + -moz-margin-start: 6px; +} + +#category-search > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-search.png"); +} +#category-discover > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); +} +#category-locale > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); +} +#category-searchengine > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); +} +#category-extension > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); +} +#category-service > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); +} +#category-theme > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); +} +#category-plugin > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); +} +#category-dictionary > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); +} +#category-experiment > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); +} +#category-availableUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); +} +#category-recentUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png"); +} + + +/*** header ***/ + +#header { + margin-bottom: 18px; +} + +.nav-button { + list-style-image: url(chrome://mozapps/skin/extensions/navigation.png); +} + +#back-btn:-moz-locale-dir(ltr), +#forward-btn:-moz-locale-dir(rtl) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-right: none; + -moz-image-region: rect(0, 20px, 20px, 0); + padding-right: 3px; +} + +#back-btn:-moz-locale-dir(rtl), +#forward-btn:-moz-locale-dir(ltr) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + -moz-image-region: rect(0, 40px, 20px, 20px); + padding-left: 3px; } #header-utils-btn { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); - margin-inline-end: 18px; + -moz-margin-end: 18px; } #header-utils-btn > .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://mozapps/skin/extensions/toolbarbutton-dropmarker.png"); padding: 0; - margin-inline-start: 2px; + -moz-margin-start: 2px; +} + +#header-search { + margin: 0; + -moz-appearance: none; + padding: 3px 5px 2px; + border: 1px solid rgba(60,73,97,0.5); + border-radius: 10000px; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.15), 0 1px rgba(255,255,255,0.25); + background: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.3)); + background-clip: padding-box; +} + +@media (max-width: 600px) { + #header-search { + width: 12em; + } +} + +#header-search[focused] { + box-shadow: @focusRingShadow@, inset 0 1px 1px rgba(0,0,0,0.15); + border-color: -moz-mac-focusring; +} + +#header-search > .textbox-input-box { + -moz-padding-start: 15px; + background: url("chrome://mozapps/skin/extensions/search.png") left no-repeat; +} + +#header-search > .textbox-input-box:-moz-locale-dir(rtl) { + background-position: right; +} + +#header-search > .textbox-input-box > html|*.textbox-input::-moz-placeholder { + color: #5C6470; + opacity: 1.0; +} + +.view-header { + padding: 4px; + margin: 0; + min-height: 31px; + border-bottom: 1px solid rgba(50, 65, 92, 0.4); + background-image: linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.05)); +} + + +/*** sorters ***/ + +.sort-controls { + -moz-appearance: none; +} + +.sorter { + -moz-appearance: none; + border: none; + color: #41434B; + background-color: transparent; + border-radius: 10000px; + padding: 0 6px; + margin: 0 6px; + min-width: 12px !important; + -moz-box-direction: reverse; +} + +.sorter[checkState="1"], +.sorter[checkState="2"], +.sorter:active:hover { + text-shadow: @loweredShadow@; + background-color: #C0C3CB; + box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@; +} + +.sorter:hover { + text-shadow: @loweredShadow@; + background-color: #C0C3CB; } .sorter[checkState="1"] { @@ -27,18 +391,576 @@ list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); } +.sorter .button-icon { + -moz-margin-start: 4px; +} + + +/*** discover view ***/ + +.discover-spacer-before, +.discover-spacer-after { + -moz-box-flex: 1; +} + +#discover-error .alert { + max-width: 45em; + -moz-box-flex: 1; +} + +.discover-logo { + list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png"); + -moz-margin-end: 15px; +} + +.discover-title { + font-weight: bold; + font-size: 24px; + font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif; + margin: 0 0 15px 0; +} + +.discover-description { + text-align: justify; + margin: 0 0 15px 0; +} + +.discover-footer { + text-align: justify; +} + + +/*** list ***/ + +.list { + -moz-appearance: none; + margin: 0; + border: none; + background-color: transparent; +} + +.addon { + border-bottom: 1px solid #B6B1B9; + padding: 5px; + color: #373D48; +} + +.details { + cursor: pointer; + margin: 0; + -moz-margin-start: 10px; +} + +.icon-container { + width: 48px; + height: 48px; + margin: 3px 7px; + -moz-box-align: center; + -moz-box-pack: center; +} + +.icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + max-width: 48px; + max-height: 48px; +} + +.addon[active="false"] .icon { + filter: grayscale(1); +} + +.addon-view[type="theme"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-view[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-view[type="plugin"] .icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-view[type="dictionary"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +.addon-view[type="experiment"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); +} + +.name-container { + font-size: 150%; + margin-bottom: 0; + font-weight: bold; + color: #000; + text-shadow: @loweredShadow@; + -moz-box-align: end; + -moz-box-flex: 1; +} + +.creator { + font-weight: bold; +} + +.creator .text-link { + color: #0066CC; +} + +.description-container { + margin-top: 8px; + -moz-margin-start: 6px; + -moz-box-align: center; +} + +.description { + margin: 0; +} + +.warning, +.pending, +.error { + -moz-margin-start: 48px; + font-weight: bold; + text-shadow: @loweredShadow@; + -moz-box-align: center; +} + +.content-container, +.basicinfo-container { + -moz-box-align: start; +} + +.addon[status="installing"] > .content-container { + -moz-box-align: stretch; +} + +.update-info-container { + -moz-box-align: center; +} + +.advancedinfo-container, +.update-available { + -moz-box-align: end; +} + +.install-status-container { + -moz-box-pack: end; + -moz-box-align: end; +} + +.name-outer-container { + -moz-box-pack: center; +} + +.relnotes-toggle-container, +.icon-outer-container { + -moz-box-pack: start; +} + +.status-container, +.control-container { + -moz-box-pack: end; +} + +.addon-view .warning { + color: #916D15; +} + +.addon-view .error { + color: #864441; +} + +.addon-view .pending { + color: #1B7123; +} + +.addon-view[pending="disable"] .pending, +.addon-view[pending="uninstall"] .pending { + color: #62666E; +} + +.addon-view[notification="warning"] { + background-image: linear-gradient(rgba(255, 255, 0, 0.2), rgba(255, 255, 0, 0.1)); +} + +.addon-view[notification="error"] { + background-image: linear-gradient(rgba(255, 0, 0, 0.2), rgba(255, 0, 0, 0.1)); +} + +.addon-view[notification="info"] { + background-image: linear-gradient(rgba(0, 0, 255, 0.2), rgba(0, 0, 255, 0.1)); +} + +.addon-view[pending="enable"], +.addon-view[pending="upgrade"], +.addon-view[pending="install"] { + background-image: linear-gradient(rgba(0, 255, 0, 0.2), rgba(0, 255, 0, 0.1)); +} + +.addon-view[pending="disable"], +.addon-view[pending="uninstall"] { + background-image: linear-gradient(rgba(128, 128, 128, 0.2), rgba(128, 128, 128, 0.1)); +} + +.addon .relnotes-container { + -moz-box-align: start; + height: 0; + overflow: hidden; + opacity: 0; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon[show-relnotes] .relnotes-container { + opacity: 1; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon .relnotes-header { + font-weight: bold; + margin: 10px 0; +} + .addon .relnotes-toggle { + -moz-appearance: none; + border: none; + background: transparent; + font-weight: bold; -moz-box-direction: reverse; + cursor: pointer; list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); } +.addon .relnotes-toggle > .button-box > .button-icon { + -moz-padding-start: 4px; +} + .addon[show-relnotes] .relnotes-toggle { list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); } -.download-progress { - margin-top: 3px; - margin-bottom: 3px; +.addon[active="false"] { + background-color: rgba(135, 135, 135, 0.1); + background-image: linear-gradient(rgba(135, 135, 135, 0), + rgba(135, 135, 135, 0.1)); +} + +.addon-view[active="false"], +.addon-view[active="false"] .name-container { + color: #686A6B; +} + +.addon-view[notification="warning"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), + linear-gradient(rgba(255, 255, 0, 0.04), + rgba(255, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[notification="error"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), + linear-gradient(rgba(255, 0, 0, 0.04), + rgba(255, 0, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="enable"], +.addon-view[pending="upgrade"], +.addon-view[pending="install"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), + linear-gradient(rgba(0, 255, 0, 0.04), + rgba(0, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="disable"], +.addon-view[pending="uninstall"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), + linear-gradient(rgba(128, 128, 128, 0.04), + rgba(128, 128, 128, 0)); + background-repeat: repeat-x; +} + +.addon[selected] { + background-color: rgba(105, 125, 149, 0.39); + color: black; +} + +.addon[selected] .name-container { + text-shadow: @loweredShadow@; +} + +.addon[active="false"][selected] .name-container { + color: #3F3F3F; +} + + +/*** search view ***/ + +#search-filter { + padding: 5px 20px; + font-size: 120%; + overflow-x: hidden; + border-bottom: 1px solid rgba(50, 65, 92, 0.4); +} + +#search-filter-label { + font-weight: bold; + color: #666; +} + +.search-filter-radio { + -moz-appearance: none; + padding: 0 10px; + margin: 0 3px; + border-radius: 10000px; +} + +.search-filter-radio[selected] { + text-shadow: @loweredShadow@; + background-color: #C0C3CB; + box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@; +} + +.search-filter-radio:hover { + text-shadow: @loweredShadow@; + background-color: #C0C3CB; +} + +.search-filter-radio .radio-check { + display: none; +} + +.search-filter-radio .radio-icon { + display: none; +} + +#search-allresults-link { + margin-top: 1em; + margin-bottom: 2em; +} + +/*** detail view ***/ + +#detail-view .loading { + opacity: 0; +} + +#detail-view[loading-extended] .loading { + opacity: 1; + transition-property: opacity; + transition-duration: 1s; +} + +.detail-view-container { + padding: 0 2em 2em 2em; + font-size: 110%; +} + +#detail-notifications { + margin-top: 1em; + margin-bottom: 2em; +} + +#detail-notifications .warning, +#detail-notifications .pending, +#detail-notifications .error { + -moz-margin-start: 0; +} + +#detail-icon-container { + width: 64px; + -moz-margin-end: 10px; + margin-top: 6px; +} + +#detail-icon { + max-width: 64px; + max-height: 64px; +} + +#detail-summary { + margin-bottom: 2em; +} + +#detail-name-container { + font-size: 200%; +} + +#detail-screenshot { + -moz-margin-end: 2em; + max-width: 300px; + max-height: 300px; +} + +#detail-screenshot[loading] { + background-image: url("chrome://global/skin/icons/loading_16.png"), + linear-gradient(rgba(255, 255, 255, 0.5), transparent); + background-position: 50% 50%; + background-repeat: no-repeat; + border-radius: 3px; +} + +#detail-screenshot[loading="error"] { + background-image: url("chrome://global/skin/media/error.png"), + linear-gradient(rgba(255, 255, 255, 0.5), transparent); +} + +#detail-desc-container { + margin-bottom: 2em; +} + +#detail-desc, #detail-fulldesc { + -moz-margin-start: 6px; + /* This is necessary to fix layout issues with multi-line descriptions, see + bug 592712*/ + outline: solid transparent; + white-space: pre-wrap; + min-width: 10em; +} + +#detail-fulldesc { + margin-top: 1em; +} + +#detail-contributions { + border-radius: 5px; + border: 1px solid rgba(50, 65, 92, 0.3); + margin-bottom: 2em; + padding: 1em; + background-color: rgba(255, 255, 255, 0.35); +} + +#detail-contrib-description { + font-style: italic; + margin-bottom: 1em; + color: #373D48; +} + +#detail-contrib-suggested { + color: grey; + font-weight: bold; +} + +#detail-contrib-btn { + -moz-appearance: none; + color: #FFF; + border: 1px solid #3A4EEE; + border-radius: 3px; + list-style-image: url("chrome://mozapps/skin/extensions/heart.png"); + background-color: #2F73EF; + background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%, + rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1)); +} + +#detail-contrib-btn .button-box { + padding: 0 6px 1px 6px; +} + +#detail-contrib-btn .button-icon { + -moz-margin-end: 3px; +} + +#detail-contrib-btn:not(:active):hover { + border-color: #4271FF; + background-color: #0459F7; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1), + 0 0 3.5px hsl(190, 90%, 80%); + transition: background-color .4s ease-in, + border-color .3s ease-in, + box-shadow .3s ease-in; +} + +#detail-contrib-btn:active:hover { + background-color: #8FA1C1; + border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset, + 0 0 2px rgba(0, 0, 0, 0.4) inset; +} + +#detail-grid { + margin-bottom: 2em; +} + +#detail-grid > columns > column:first-child { + min-width: 15em; + max-width: 25em; +} + +.detail-row[first-row="true"], +.detail-row-complex[first-row="true"], +setting[first-row="true"] { + border-top: none; +} + +.detail-row, +.detail-row-complex, +setting { + border-top: 2px solid; + -moz-border-top-colors: rgba(28, 31, 37, 0.2) rgba(255, 255, 255, 0.2); + -moz-box-align: center; + min-height: 30px; +} + +#detail-controls { + margin-bottom: 1em; +} + +#detail-view[active="false"]:not([pending]):not([notification]) { + background-image: linear-gradient(rgba(135, 135, 135, 0.1), + rgba(135, 135, 135, 0)); +} + +setting[first-row="true"] { + margin-top: 2em; +} + +setting { + -moz-box-align: start; +} + +.preferences-alignment { + min-height: 30px; + -moz-box-align: center; +} + +.preferences-description { + font-size: 90.9%; + color: graytext; + margin-top: -2px; + -moz-margin-start: 2em; + white-space: pre-wrap; +} + +.preferences-description:empty { + display: none; +} + +setting[type="radio"] > radiogroup { + -moz-box-orient: horizontal; +} + + +/*** creator ***/ + +.creator > label { + -moz-margin-start: 0; + -moz-margin-end: 0; +} + +.creator > .text-link { + margin-top: 1px; + margin-bottom: 1px; +} + + +/*** rating ***/ + +.meta-rating { + -moz-margin-end: 0; + margin-top: 2px; } .meta-rating > .star { @@ -49,3 +971,229 @@ .meta-rating > .star[on="true"] { list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); } + + +/*** download progress ***/ + +.download-progress { + background-image: linear-gradient(#DCDEE3, #CBCED6); + border: 1px solid #858898; + border-radius: 3px; + box-shadow: inset #E3E8EC 0 1px 1px, @loweredShadow@; + width: 200px; + height: 21px; + margin: 0 8px; +} + +.download-progress[mode="undetermined"] .progress { + -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined"); +} + +.download-progress[mode="undetermined"] { + border-color: #2E773A; +} + +.download-progress[mode="undetermined"] .status-container { + padding: 0 2px; +} + +.download-progress .start-cap, +.download-progress[complete] .end-cap, +.download-progress[mode="undetermined"] .end-cap, +.download-progress .progress .progress-bar { + -moz-appearance: none; + background-image: linear-gradient(#6AC47E, #4FAC6A); + margin-top: -1px; + margin-bottom: -1px; + border: 1px solid #2E773A; +} + +.download-progress .start-cap { + -moz-margin-start: -1px; + -moz-border-end-width: 0; +} + +.download-progress .end-cap { + -moz-margin-end: -1px; + -moz-border-start-width: 0px !important; +} + +.download-progress .progress .progress-bar { + border-left-width: 0; + border-right-width: 0; + min-height: 21px; +} + +.download-progress .progress { + -moz-appearance: none; + background-color: transparent; + padding: 0; + margin: 0; + border: none; +} + +.download-progress .start-cap, +.download-progress .end-cap { + width: 4px; +} + +.download-progress .start-cap:-moz-locale-dir(ltr), +.download-progress .end-cap:-moz-locale-dir(rtl) { + border-radius: 3px 0 0 3px; +} + +.download-progress .end-cap:-moz-locale-dir(ltr), +.download-progress .start-cap:-moz-locale-dir(rtl) { + border-radius: 0 3px 3px 0; +} + +.download-progress .cancel { + -moz-appearance: none; + background-color: rgba(255, 255, 255, 0.15); + border: 1px solid rgba(0, 0, 0, 0.4); + padding: 3px; + border-radius: 3px; + min-width: 0; + margin: 3px; +} + +.download-progress .cancel .button-text { + display: none; +} + +.download-progress .cancel .button-icon { + -moz-margin-start: 0; +} + +.download-progress .cancel { + list-style-image: url('chrome://mozapps/skin/extensions/cancel.png'); +} + +.download-progress .status-container { + -moz-box-align: center; +} + +.download-progress .status { + text-shadow: @loweredShadow@; +} + + +/*** install status ***/ + +.install-status { + -moz-box-align: center; +} + + +/*** check for updates ***/ + +#updates-container { + -moz-box-align: center; +} + +#updates-installed, +#updates-downloaded { + color: #3C735C; + font-weight: bold; +} + +#update-selected { + margin: 12px; +} + + +/*** buttons ***/ + +.addon-control[disabled="true"]:not(.no-auto-hide) { + display: none; +} + +.no-auto-hide .addon-control { + display: block !important; +} + +.no-auto-hide > .menulist-dropmarker { + -moz-padding-start: 0px !important; +} + +button.button-link { + -moz-appearance: none; + background: transparent; + border: none; + box-shadow: none; + text-decoration: underline; + color: #0066CC; + cursor: pointer; + min-width: 0; + margin: 0 6px; +} + +.text-link { + color: #3386D5; +} + +.button-link:hover, +.text-link:hover { + color: #3DA1FF; +} + +/* Needed to override normal button style from inContent.css */ +button.button-link:not([disabled="true"]):active:hover { + background: transparent; + border: none; + box-shadow: none; +} + +.header-button { + -moz-appearance: none; + padding: 0 4px; + margin: 0; + height: 22px; + border: 1px solid rgba(60,73,97,0.5); + border-radius: @toolbarbuttonCornerRadius@; + box-shadow: inset 0 1px rgba(255,255,255,0.25), 0 1px rgba(255,255,255,0.25); + background: linear-gradient(rgba(255,255,255,0.45), transparent); + background-clip: padding-box; +} + +.header-button .toolbarbutton-text { + display: none; +} + +.header-button[disabled="true"] .toolbarbutton-icon { + opacity: 0.4; +} + +.header-button:not([disabled="true"]):active:hover, +.header-button[open="true"] { + border-color: rgba(45,54,71,0.7); + box-shadow: inset 0 0 4px rgb(45,54,71), 0 1px rgba(255,255,255,0.25); + background-image: linear-gradient(rgba(45,54,71,0.6), transparent); +} + +/*** telemetry experiments ***/ + +#detail-experiment-container { + font-size: 80%; + margin-bottom: 1em; +} + +#detail-experiment-bullet-container, +#detail-experiment-state, +#detail-experiment-time, +.experiment-bullet-container, +.experiment-state, +.experiment-time { + vertical-align: middle; + display: inline-block; +} + +.addon .experiment-bullet, +#detail-experiment-bullet { + fill: rgb(158, 158, 158); +} + +.addon[active="true"] .experiment-bullet, +#detail-view[active="true"] #detail-experiment-bullet { + fill: rgb(106, 201, 20); +} diff --git a/toolkit/themes/osx/mozapps/extensions/navigation.png b/toolkit/themes/osx/mozapps/extensions/navigation.png Binary files differnew file mode 100644 index 000000000..ffc40d7e5 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/navigation.png diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/extensions/newaddon.css index edfba0ef5..5bf04fab1 100644 --- a/toolkit/themes/osx/mozapps/extensions/newaddon.css +++ b/toolkit/themes/osx/mozapps/extensions/newaddon.css @@ -2,4 +2,111 @@ * 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/extensions/newaddon.inc.css +%include ../../global/shared.inc + +@import url("chrome://global/skin/inContentUI.css"); + +#addon-page { + padding: 0; +} + +#addon-scrollbox { + overflow: auto; + -moz-box-orient: vertical; + -moz-box-flex: 1; +} + +#spacer-start { + -moz-box-flex: 1; +} + +#spacer-end { + -moz-box-flex: 3; +} + +#addon-container { + overflow: visible; + max-width: 600px; + margin: 20px; + padding: 30px 90px; +} + +#addon-info { + -moz-box-align: start; + margin: 25px 10px; +} + +#icon { + -moz-margin-end: 10px; + max-width: 64px; + max-height: 64px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); +} + +.addon-info[type="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-info[type="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-info[type="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-info[type="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#name { + font-size: 130%; +} + +#author { + color: GrayText; +} + +#location { + color: GrayText; +} + +#warning { + margin-bottom: 25px; + -moz-box-align: start; +} + +#warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + width: 16px; + height: 15px; + -moz-margin-end: 5px; +} + +#allow { + -moz-margin-start: 84px; + margin-bottom: 20px; +} + +#continuePanel, +#restartPanel { + margin-top: 25px; + -moz-box-align: center; + -moz-box-pack: end; +} + +#continuePanel { + -moz-box-pack: end; +} + +#restartMessage { + text-align: right; +} + +#restartSpacer { + -moz-box-flex: 1; +} + +#later { + color: GrayText; +} diff --git a/toolkit/themes/osx/mozapps/extensions/selectAddons.css b/toolkit/themes/osx/mozapps/extensions/selectAddons.css new file mode 100644 index 000000000..8682b04b5 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/selectAddons.css @@ -0,0 +1,163 @@ +/* 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 ../../global/shared.inc + +.heading { + font-size: 270%; + text-align: center; + margin: 0 120px; +} + +.progress { + margin: 10px 128px; +} + +.progress-label, +#errors-description { + text-align: center; + margin: 0 10px; +} + +#checking-heading, +#update-heading, +#errors-heading { + margin-top: 90px; +} + +#select-heading, +#confirm-heading { + margin-top: 10px; + margin-bottom: 10px; + text-align: center; +} + +#select-description, +#confirm-description { + margin: 10px; +} + +#select-list { + border: 1px solid WindowFrame; + background-color: Window; + margin: 10px; +} + +#select-grid column { + -moz-box-align: center; +} + +#select-grid row { + -moz-box-align: stretch; +} + +#select-grid row:nth-of-type(odd) { + background-color: -moz-oddtreerow; +} + +#select-grid label, +#select-grid checkbox { + margin-top: 0; + margin-bottom: 0; +} + +.select-cell { + -moz-box-align: center; + -moz-box-pack: start; + box-sizing: border-box; +} + +#select-header { + background-color: Window !important; +} + +#select-header .select-cell { + -moz-appearance: treeheadercell; + border: 2px solid; + -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow; + background-color: -moz-Dialog; + color: -moz-DialogText; +} + +.select-keep { + -moz-box-pack: center; +} + +.select-icon { + width: 20px; +} + +#select-grid separator { + display: none; +} + +.addon-name, +.addon-action-message, +.addon-action-update { + box-sizing: border-box; + margin: 0; + padding: 2px 6px; +} + +.addon:not([active]) .addon-name, +.addon:not([active]) .addon-action-message, +.addon:not([active]) .addon-action-update { + color: GrayText; +} + +.addon-icon { + height: 16px; + width: 16px; + margin: 2px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); +} + +.addon-icon[type="theme"] { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric-16.png"); +} + +.addon-icon[type="plugin"] { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); +} + +.addon-icon[type="dictionary"] { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png"); +} + +.action-list { + margin-top: 10px; + -moz-margin-start: 5em; +} + +.action-header { + margin-bottom: 10px; +} + +#confirm .addon { + -moz-margin-start: 3em; + -moz-box-align: center; +} + +.addon:not([active]) .addon-icon, +#disable-list .addon-icon, +#incompatible-list .addon-icon { + filter: grayscale(1); +} + +#footer { + padding: 15px 12px; + -moz-appearance: statusbar; + -moz-window-dragging: drag; +} + +button { + -moz-appearance: toolbarbutton; + min-height: 22px; + margin: 0 6px; + padding: 0; + text-shadow: @loweredShadow@; +} diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-error.png b/toolkit/themes/osx/mozapps/extensions/stripes-error.png Binary files differnew file mode 100644 index 000000000..1dc2d8504 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/stripes-error.png diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png b/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png Binary files differnew file mode 100644 index 000000000..901ab1ec2 --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png b/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png Binary files differnew file mode 100644 index 000000000..370ceec0f --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-warning.png b/toolkit/themes/osx/mozapps/extensions/stripes-warning.png Binary files differnew file mode 100644 index 000000000..69463fb1a --- /dev/null +++ b/toolkit/themes/osx/mozapps/extensions/stripes-warning.png diff --git a/toolkit/themes/osx/mozapps/extensions/update.css b/toolkit/themes/osx/mozapps/extensions/update.css index a0a016868..8e9255691 100644 --- a/toolkit/themes/osx/mozapps/extensions/update.css +++ b/toolkit/themes/osx/mozapps/extensions/update.css @@ -2,20 +2,18 @@ * 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/. */ +#alert { + list-style-image: url("chrome://mozapps/skin/update/warning.gif"); +} + .throbber { - list-style-image: url("chrome://global/skin/icons/loading.png"); + list-style-image: url("chrome://global/skin/icons/loading_16.png"); width: 16px; height: 16px; margin-top: 5px; margin-bottom: 5px; - margin-inline-start: 5px; - margin-inline-end: 2px; -} - -@media (min-resolution: 2dppx) { - .throbber { - list-style-image: url("chrome://global/skin/icons/loading@2x.png"); - } + -moz-margin-start: 5px; + -moz-margin-end: 2px; } .alertBox { diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css index 48af7c1a9..0a1a84b24 100644 --- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css +++ b/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css @@ -12,8 +12,8 @@ list-style-image: url("chrome://global/skin/icons/warning-large.png"); margin-top: 0 !important; margin-bottom: 6px !important; - margin-inline-start: 6px !important; - margin-inline-end: 20px !important; + -moz-margin-start: 6px !important; + -moz-margin-end: 20px !important; } #itemList { @@ -23,7 +23,7 @@ } #itemWarningIntro { - margin-inline-start: 8px; + -moz-margin-start: 8px; } #dialogContentBox { @@ -45,7 +45,7 @@ installitem { .xpinstallIconContainer { width: 32px; height: 32px; - margin-inline-end: 5px; + -moz-margin-end: 5px; } .xpinstallItemName { @@ -63,14 +63,14 @@ installitem { background-color: Window; margin-top: 2px; margin-bottom: 1px; - margin-inline-start: 6px; - margin-inline-end: 5px; + -moz-margin-start: 6px; + -moz-margin-end: 5px; } .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } installitem[type="theme"] .xpinstallItemIcon { diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 3b58f1e4e..f8ade11d9 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -8,8 +8,42 @@ toolkit.jar: skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) * skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-dictionaries.png (webextensions/category-dictionaries.png) + skin/classic/mozapps/extensions/category-experiments.png (webextensions/category-experiments.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/discover-logo.png (webextensions/discover-logo.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/experimentGeneric.png (webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (webextensions/cancel.png) + skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (webextensions/toolbarbutton-dropmarker.png) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) + skin/classic/mozapps/extensions/search.png (webextensions/search.png) + skin/classic/mozapps/extensions/about.css (webextensions/about.css) +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/update.css (webextensions/update.css) + skin/classic/mozapps/extensions/eula.css (webextensions/eula.css) + skin/classic/mozapps/extensions/blocklist.css (webextensions/blocklist.css) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) +#else skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) + skin/classic/mozapps/extensions/category-languages.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png) + skin/classic/mozapps/extensions/category-extensions.png (extensions/extensionGeneric.png) + skin/classic/mozapps/extensions/category-themes.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png) @@ -17,6 +51,7 @@ toolkit.jar: skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) + skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) @@ -27,15 +62,30 @@ toolkit.jar: skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png) + skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (extensions/toolbarbutton-dropmarker.png) skin/classic/mozapps/extensions/heart.png (extensions/heart.png) + skin/classic/mozapps/extensions/navigation.png (extensions/navigation.png) + skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png) + skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png) + skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png) + skin/classic/mozapps/extensions/stripes-info-negative.png (extensions/stripes-info-negative.png) + skin/classic/mozapps/extensions/alerticon-warning.png (extensions/alerticon-warning.png) + skin/classic/mozapps/extensions/alerticon-error.png (extensions/alerticon-error.png) + skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png) + skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png) skin/classic/mozapps/extensions/search.png (extensions/search.png) skin/classic/mozapps/extensions/about.css (extensions/about.css) * skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) +* skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) skin/classic/mozapps/extensions/update.css (extensions/update.css) skin/classic/mozapps/extensions/eula.css (extensions/eula.css) skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) * skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) +#endif + skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png) + skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) + skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) skin/classic/mozapps/plugins/notifyPluginGeneric.png (plugins/notifyPluginGeneric.png) skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) @@ -48,15 +98,22 @@ toolkit.jar: skin/classic/mozapps/update/buttons.png (update/buttons.png) * skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/xpinstall/xpinstallConfirm.css (webextensions/xpinstallConfirm.css) +#else + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric.png) skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) +#endif skin/classic/mozapps/handling/handling.css (handling/handling.css) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg % override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png % override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png +#endif % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/notifyPluginGeneric.png diff --git a/toolkit/themes/osx/mozapps/passwordmgr/key-16.png b/toolkit/themes/osx/mozapps/passwordmgr/key-16.png Binary files differnew file mode 100644 index 000000000..ac135b847 --- /dev/null +++ b/toolkit/themes/osx/mozapps/passwordmgr/key-16.png diff --git a/toolkit/themes/osx/mozapps/passwordmgr/key-64.png b/toolkit/themes/osx/mozapps/passwordmgr/key-64.png Binary files differnew file mode 100644 index 000000000..0fb69f382 --- /dev/null +++ b/toolkit/themes/osx/mozapps/passwordmgr/key-64.png diff --git a/toolkit/themes/osx/mozapps/passwordmgr/key.png b/toolkit/themes/osx/mozapps/passwordmgr/key.png Binary files differnew file mode 100644 index 000000000..b5e8afefc --- /dev/null +++ b/toolkit/themes/osx/mozapps/passwordmgr/key.png diff --git a/toolkit/themes/osx/mozapps/webextensions/about.css b/toolkit/themes/osx/mozapps/webextensions/about.css new file mode 100644 index 000000000..c13ce5f59 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/about.css @@ -0,0 +1,78 @@ +/* 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/. */ + +#genericAbout { + padding: 0px; + min-height: 200px; + max-height: 400px; + width: 30em; +} + +#clientBox { + background-color: -moz-Dialog; + color: -moz-DialogText; +} + +.basic-info { + padding: 10px; +} + +#extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 64px; + max-height: 64px; + margin-inline-end: 6px; +} + +#genericAbout[addontype="theme"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +#genericAbout[addontype="locale"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +#genericAbout[addontype="plugin"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +#genericAbout[addontype="dictionary"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#extensionName { + font-size: 200%; + font-weight: bolder; +} + +#extensionVersion { + font-weight: bold; +} + +#extensionDescription { + margin-top: 4px; +} + +#groove { + margin-top: 8px; +} + +#extensionDetailsBox { + overflow: auto; + min-height: 100px; +} + +.boxIndent { + margin-inline-start: 18px; +} + +#extensionCreator, .contributor { + margin: 0px; +} + +.sectionTitle { + padding: 2px 0px 3px 0px; + margin-top: 3px; + font-weight: bold; +} diff --git a/toolkit/themes/osx/mozapps/webextensions/blocklist.css b/toolkit/themes/osx/mozapps/webextensions/blocklist.css new file mode 100644 index 000000000..02f6e1d49 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/blocklist.css @@ -0,0 +1,20 @@ +/* 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/. */ + +richlistitem { + padding-top: 6px; + padding-bottom: 6px; + padding-inline-start: 7px; + padding-inline-end: 7px; + border-bottom: 1px solid #C0C0C0; +} + +.addon-name-version { + font-size: 110%; +} + +.blockedLabel { + font-weight: bold; + font-style: italic; +} diff --git a/toolkit/themes/osx/mozapps/webextensions/cancel.png b/toolkit/themes/osx/mozapps/webextensions/cancel.png Binary files differnew file mode 100644 index 000000000..0d98ab235 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/cancel.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png b/toolkit/themes/osx/mozapps/webextensions/category-available.png Binary files differindex d1b737ab0..d1b737ab0 100644 --- a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png Binary files differnew file mode 100644 index 000000000..54ae4f93f --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png b/toolkit/themes/osx/mozapps/webextensions/category-discover.png Binary files differindex a6f5b49b3..a6f5b49b3 100644 --- a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/osx/mozapps/webextensions/category-experiments.png b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png Binary files differindex 5c4d8bf47..5c4d8bf47 100644 --- a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png b/toolkit/themes/osx/mozapps/webextensions/category-recent.png Binary files differindex 7ecfc7d4c..7ecfc7d4c 100644 --- a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/osx/mozapps/webextensions/category-search.png b/toolkit/themes/osx/mozapps/webextensions/category-search.png Binary files differnew file mode 100644 index 000000000..52e91a7ce --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/osx/mozapps/webextensions/category-service.png b/toolkit/themes/osx/mozapps/webextensions/category-service.png Binary files differnew file mode 100644 index 000000000..997c8541c --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png Binary files differnew file mode 100644 index 000000000..4ad1a1a82 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png Binary files differnew file mode 100644 index 000000000..54ae4f93f --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/osx/mozapps/webextensions/discover-logo.png b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png Binary files differnew file mode 100644 index 000000000..cd50735a8 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png diff --git a/toolkit/themes/osx/mozapps/webextensions/eula.css b/toolkit/themes/osx/mozapps/webextensions/eula.css new file mode 100644 index 000000000..05aeb3c1c --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/eula.css @@ -0,0 +1,47 @@ +/* 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/. */ + +#icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 48px; + max-height: 48px; + margin-inline-end: 6px; +} + +#eula-dialog[addontype="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +#eula-dialog[addontype="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +#eula-dialog[addontype="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +#eula-dialog[addontype="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#heading-container { + -moz-box-align: center; +} + +#heading { + font-size: 120%; +} + +#eula { + -moz-appearance: none; + color: -moz-FieldText; + background-color: -moz-Field; + margin: 1em; + border: 1px solid; + -moz-border-top-colors: ActiveBorder; + -moz-border-right-colors: ActiveBorder; + -moz-border-bottom-colors: ActiveBorder; + -moz-border-left-colors: ActiveBorder; +} + diff --git a/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png diff --git a/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png Binary files differnew file mode 100644 index 000000000..fc6c8a258 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/osx/mozapps/webextensions/extensions.css b/toolkit/themes/osx/mozapps/webextensions/extensions.css new file mode 100644 index 000000000..cbdd9a5b0 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/extensions.css @@ -0,0 +1,51 @@ +/* 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/webextensions/extensions.inc.css + +.no-auto-hide > .menulist-dropmarker { + padding-inline-start: 0px !important; +} + +#header-utils-btn { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); + margin-inline-end: 18px; +} + +#header-utils-btn > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://mozapps/skin/extensions/toolbarbutton-dropmarker.png"); + padding: 0; + margin-inline-start: 2px; +} + +.sorter[checkState="1"] { + list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); +} + +.sorter[checkState="2"] { + list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); +} + +.addon .relnotes-toggle { + -moz-box-direction: reverse; + list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); +} + +.addon[show-relnotes] .relnotes-toggle { + list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); +} + +.download-progress { + margin-top: 3px; + margin-bottom: 3px; +} + +.meta-rating > .star { + list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png"); + padding: 0 1px; +} + +.meta-rating > .star[on="true"] { + list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); +} diff --git a/toolkit/themes/osx/mozapps/webextensions/heart.png b/toolkit/themes/osx/mozapps/webextensions/heart.png Binary files differnew file mode 100644 index 000000000..655f4c4be --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/heart.png diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png Binary files differindex 4d9ac5ad8..4d9ac5ad8 100644 --- a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/osx/mozapps/webextensions/newaddon.css b/toolkit/themes/osx/mozapps/webextensions/newaddon.css new file mode 100644 index 000000000..5856c08b5 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/newaddon.css @@ -0,0 +1,5 @@ +/* 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/webextensions/newaddon.inc.css diff --git a/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png Binary files differnew file mode 100644 index 000000000..2761f1925 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png diff --git a/toolkit/themes/osx/mozapps/webextensions/rating-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-won.png Binary files differnew file mode 100644 index 000000000..336dd8f6e --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/rating-won.png diff --git a/toolkit/themes/osx/mozapps/webextensions/search.png b/toolkit/themes/osx/mozapps/webextensions/search.png Binary files differnew file mode 100644 index 000000000..93196dbbf --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/search.png diff --git a/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png Binary files differnew file mode 100644 index 000000000..190bb30d7 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png Binary files differindex be645f76d..be645f76d 100644 --- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png +++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png Binary files differnew file mode 100644 index 000000000..e7674c62a --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png diff --git a/toolkit/themes/osx/mozapps/webextensions/update.css b/toolkit/themes/osx/mozapps/webextensions/update.css new file mode 100644 index 000000000..a0a016868 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/update.css @@ -0,0 +1,28 @@ +/* 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/. */ + +.throbber { + list-style-image: url("chrome://global/skin/icons/loading.png"); + width: 16px; + height: 16px; + margin-top: 5px; + margin-bottom: 5px; + margin-inline-start: 5px; + margin-inline-end: 2px; +} + +@media (min-resolution: 2dppx) { + .throbber { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } +} + +.alertBox { + background-color: InfoBackground; + color: InfoText; + border: 1px outset InfoBackground; + margin-left: 3px; + margin-right: 3px; + padding: 5px; +} diff --git a/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css new file mode 100644 index 000000000..48af7c1a9 --- /dev/null +++ b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css @@ -0,0 +1,90 @@ +/* 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/. */ + +#xpinstallheader { + margin-bottom: 2em; +} + +.alert-icon { + width: 48px; + height: 48px; + list-style-image: url("chrome://global/skin/icons/warning-large.png"); + margin-top: 0 !important; + margin-bottom: 6px !important; + margin-inline-start: 6px !important; + margin-inline-end: 20px !important; +} + +#itemList { + -moz-appearance: listbox; + margin: 3px 4px 10px 4px; + height: 14em; +} + +#itemWarningIntro { + margin-inline-start: 8px; +} + +#dialogContentBox { + padding: 5px; +} + +installitem { + padding: 5px 0 5px 5px; + border-bottom: 1px dotted #C0C0C0; + margin-bottom: 5px; +} + +.warning { + font-weight: bold; + font-size: 1.25em; + margin-bottom: 1em; +} + +.xpinstallIconContainer { + width: 32px; + height: 32px; + margin-inline-end: 5px; +} + +.xpinstallItemName { + font-weight: bold; +} + +.xpinstallItemSigned { + font-style: italic; + font-size: 0.9em; +} + +.xpinstallItemURL { + -moz-appearance: none; + border: none; + background-color: Window; + margin-top: 2px; + margin-bottom: 1px; + margin-inline-start: 6px; + margin-inline-end: 5px; +} + +.xpinstallItemIcon { + max-width: 32px; + max-height: 32px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); +} + +installitem[type="theme"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +installitem[type="locale"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +installitem[type="plugin"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +installitem[type="dictionary"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} diff --git a/toolkit/themes/shared/extensions/utilities.svg b/toolkit/themes/shared/extensions/utilities.svg index 8bf24458c..fd911001b 100644 --- a/toolkit/themes/shared/extensions/utilities.svg +++ b/toolkit/themes/shared/extensions/utilities.svg @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- 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/. --> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="16" + height="16" + viewBox="0 0 16 16"> <style> use:not(:target) { display: none; @@ -13,18 +16,10 @@ use[id$="-native"] { fill: GrayText; } - use[id$="-grayscale"] { - fill: #4d4d4d; - } - use[id$="-inverted"] { - fill: #ddd; - } </style> - <defs> + <defs style="display: none;"> <path id="utilities-shape" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/> </defs> <use id="utilities" xlink:href="#utilities-shape"/> <use id="utilities-native" xlink:href="#utilities-shape"/> - <use id="utilities-grayscale" xlink:href="#utilities-shape"/> - <use id="utilities-inverted" xlink:href="#utilities-shape"/> </svg> diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn index bb43fd4d2..fadd203b0 100644 --- a/toolkit/themes/shared/mozapps.inc.mn +++ b/toolkit/themes/shared/mozapps.inc.mn @@ -7,13 +7,15 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. - skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/extensions/extensionGeneric.svg) - skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) - skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png) - skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg) - skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg) - skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg) - skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/webextensions/extensionGeneric.svg) + skin/classic/mozapps/extensions/utilities.svg (../../shared/webextensions/utilities.svg) + skin/classic/mozapps/extensions/navigation.png (../../shared/webextensions/navigation.png) + skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/webextensions/alerticon-warning.svg) + skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/webextensions/alerticon-error.svg) + skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg) + skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg) +#endif skin/classic/mozapps/formautofill/requestAutocomplete.css (../../shared/formautofill/requestAutocomplete.css) skin/classic/mozapps/plugins/pluginProblem.css (../../shared/plugins/pluginProblem.css) skin/classic/mozapps/aboutNetworking.css (../../shared/aboutNetworking.css) diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 151749f72..637537d9d 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -77,6 +77,8 @@ skin/classic/global/icons/Landscape.png (../../windows/global/icons/Landscape.png) skin/classic/global/icons/Question.png (../../windows/global/icons/Question.png) skin/classic/global/icons/question-16.png (../../windows/global/icons/question-16.png) + skin/classic/global/icons/question-32.png (../../windows/global/icons/question-32.png) + skin/classic/global/icons/question-48.png (../../windows/global/icons/question-48.png) skin/classic/global/icons/question-64.png (../../windows/global/icons/question-64.png) skin/classic/global/icons/resizer-rtl.png (../../windows/global/icons/resizer-rtl.png) skin/classic/global/icons/Restore.gif (../../windows/global/icons/Restore.gif) @@ -107,27 +109,32 @@ skin/classic/mozapps/downloads/downloadButtons.png (../../windows/mozapps/downloads/downloadButtons.png) skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css) - skin/classic/mozapps/extensions/about.css (../../windows/mozapps/extensions/about.css) - skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/extensions/blocklist.css) - skin/classic/mozapps/extensions/update.css (../../windows/mozapps/extensions/update.css) - skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/extensions/discover-logo.png) - skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/extensions/experimentGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/extensions/cancel.png) - skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/extensions/eula.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/about.css (../../windows/mozapps/webextensions/about.css) + skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/webextensions/blocklist.css) + skin/classic/mozapps/extensions/update.css (../../windows/mozapps/webextensions/update.css) + skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/webextensions/discover-logo.png) + skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/webextensions/cancel.png) + skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/webextensions/eula.css) +#endif skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css) skin/classic/mozapps/plugins/pluginBlocked-64.png (../../windows/mozapps/plugins/pluginBlocked-64.png) skin/classic/mozapps/plugins/pluginHelp-16.png (../../windows/mozapps/plugins/pluginHelp-16.png) skin/classic/mozapps/profile/profileSelection.css (../../windows/mozapps/profile/profileSelection.css) skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) -* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/webextensions/xpinstallConfirm.css) +#endif -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif % override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif % override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png @@ -138,4 +145,4 @@ % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png - +#endif diff --git a/toolkit/themes/shared/extensions/alerticon-error.svg b/toolkit/themes/shared/webextensions/alerticon-error.svg index cb883e16e..cb883e16e 100644 --- a/toolkit/themes/shared/extensions/alerticon-error.svg +++ b/toolkit/themes/shared/webextensions/alerticon-error.svg diff --git a/toolkit/themes/shared/extensions/alerticon-info-negative.svg b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg index 733f8571a..733f8571a 100644 --- a/toolkit/themes/shared/extensions/alerticon-info-negative.svg +++ b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg diff --git a/toolkit/themes/shared/extensions/alerticon-info-positive.svg b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg index 031190bce..031190bce 100644 --- a/toolkit/themes/shared/extensions/alerticon-info-positive.svg +++ b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg diff --git a/toolkit/themes/shared/extensions/alerticon-warning.svg b/toolkit/themes/shared/webextensions/alerticon-warning.svg index 2b403220e..2b403220e 100644 --- a/toolkit/themes/shared/extensions/alerticon-warning.svg +++ b/toolkit/themes/shared/webextensions/alerticon-warning.svg diff --git a/toolkit/themes/shared/extensions/extensionGeneric.svg b/toolkit/themes/shared/webextensions/extensionGeneric.svg index 28c2f7ba3..28c2f7ba3 100644 --- a/toolkit/themes/shared/extensions/extensionGeneric.svg +++ b/toolkit/themes/shared/webextensions/extensionGeneric.svg diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/webextensions/extensions.inc.css index c4523bbe6..c4523bbe6 100644 --- a/toolkit/themes/shared/extensions/extensions.inc.css +++ b/toolkit/themes/shared/webextensions/extensions.inc.css diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/webextensions/navigation.png Binary files differindex 67ff3d9a7..67ff3d9a7 100644 --- a/toolkit/themes/shared/extensions/navigation.png +++ b/toolkit/themes/shared/webextensions/navigation.png diff --git a/toolkit/themes/shared/extensions/newaddon.inc.css b/toolkit/themes/shared/webextensions/newaddon.inc.css index 52352ccd2..52352ccd2 100644 --- a/toolkit/themes/shared/extensions/newaddon.inc.css +++ b/toolkit/themes/shared/webextensions/newaddon.inc.css diff --git a/toolkit/themes/shared/webextensions/utilities.svg b/toolkit/themes/shared/webextensions/utilities.svg new file mode 100644 index 000000000..8bf24458c --- /dev/null +++ b/toolkit/themes/shared/webextensions/utilities.svg @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #424f5a; + } + use[id$="-native"] { + fill: GrayText; + } + use[id$="-grayscale"] { + fill: #4d4d4d; + } + use[id$="-inverted"] { + fill: #ddd; + } + </style> + <defs> + <path id="utilities-shape" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/> + </defs> + <use id="utilities" xlink:href="#utilities-shape"/> + <use id="utilities-native" xlink:href="#utilities-shape"/> + <use id="utilities-grayscale" xlink:href="#utilities-shape"/> + <use id="utilities-inverted" xlink:href="#utilities-shape"/> +</svg> diff --git a/toolkit/themes/windows/global/dirListing/folder-XP.png b/toolkit/themes/windows/global/dirListing/folder-XP.png Binary files differdeleted file mode 100644 index 102de5196..000000000 --- a/toolkit/themes/windows/global/dirListing/folder-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/dirListing/local-XP.png b/toolkit/themes/windows/global/dirListing/local-XP.png Binary files differdeleted file mode 100644 index 99191f3a5..000000000 --- a/toolkit/themes/windows/global/dirListing/local-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/dirListing/remote-XP.png b/toolkit/themes/windows/global/dirListing/remote-XP.png Binary files differdeleted file mode 100644 index 4febb764b..000000000 --- a/toolkit/themes/windows/global/dirListing/remote-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/dirListing/up-XP.png b/toolkit/themes/windows/global/dirListing/up-XP.png Binary files differdeleted file mode 100644 index 851502d47..000000000 --- a/toolkit/themes/windows/global/dirListing/up-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css index 20a190684..aaddef882 100644 --- a/toolkit/themes/windows/global/global.css +++ b/toolkit/themes/windows/global/global.css @@ -350,9 +350,7 @@ popupnotificationcontent { width: 20px; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { .close-icon { -moz-image-region: rect(0, 16px, 16px, 0); } @@ -386,9 +384,7 @@ popupnotificationcontent { -moz-image-region: rect(0, 120px, 40px, 80px); } - @media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { .close-icon { -moz-image-region: rect(0, 32px, 32px, 0); } diff --git a/toolkit/themes/windows/global/icons/Landscape-XP.png b/toolkit/themes/windows/global/icons/Landscape-XP.png Binary files differdeleted file mode 100644 index cc43abdf3..000000000 --- a/toolkit/themes/windows/global/icons/Landscape-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Portrait-XP.png b/toolkit/themes/windows/global/icons/Portrait-XP.png Binary files differdeleted file mode 100644 index ce36e8413..000000000 --- a/toolkit/themes/windows/global/icons/Portrait-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Print-preview-XP.png b/toolkit/themes/windows/global/icons/Print-preview-XP.png Binary files differdeleted file mode 100644 index 6f4736737..000000000 --- a/toolkit/themes/windows/global/icons/Print-preview-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Question-XP.png b/toolkit/themes/windows/global/icons/Question-XP.png Binary files differdeleted file mode 100644 index c10004078..000000000 --- a/toolkit/themes/windows/global/icons/Question-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Search-close-XP.png b/toolkit/themes/windows/global/icons/Search-close-XP.png Binary files differdeleted file mode 100644 index 39d800e1a..000000000 --- a/toolkit/themes/windows/global/icons/Search-close-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Search-glass-XP.png b/toolkit/themes/windows/global/icons/Search-glass-XP.png Binary files differdeleted file mode 100644 index 9eb0e259f..000000000 --- a/toolkit/themes/windows/global/icons/Search-glass-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/Warning-XP.png b/toolkit/themes/windows/global/icons/Warning-XP.png Binary files differdeleted file mode 100644 index c0ec9b519..000000000 --- a/toolkit/themes/windows/global/icons/Warning-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/autoscroll-XP.png b/toolkit/themes/windows/global/icons/autoscroll-XP.png Binary files differdeleted file mode 100644 index 6aac3d98e..000000000 --- a/toolkit/themes/windows/global/icons/autoscroll-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png b/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png Binary files differdeleted file mode 100644 index 74af56f57..000000000 --- a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/blacklist_large-XP.png b/toolkit/themes/windows/global/icons/blacklist_large-XP.png Binary files differdeleted file mode 100644 index 96ff341c0..000000000 --- a/toolkit/themes/windows/global/icons/blacklist_large-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png b/toolkit/themes/windows/global/icons/close-inverted-win7.png Binary files differindex 68596a307..68596a307 100644 --- a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png +++ b/toolkit/themes/windows/global/icons/close-inverted-win7.png diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png Binary files differindex eec52e6d1..eec52e6d1 100644 --- a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png +++ b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png diff --git a/toolkit/themes/windows/global/icons/close-XPVista7.png b/toolkit/themes/windows/global/icons/close-win7.png Binary files differindex ea6ada49e..ea6ada49e 100644 --- a/toolkit/themes/windows/global/icons/close-XPVista7.png +++ b/toolkit/themes/windows/global/icons/close-win7.png diff --git a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-win7@2x.png Binary files differindex c25a64a4b..c25a64a4b 100644 --- a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png +++ b/toolkit/themes/windows/global/icons/close-win7@2x.png diff --git a/toolkit/themes/windows/global/icons/error-16-XP.png b/toolkit/themes/windows/global/icons/error-16-XP.png Binary files differdeleted file mode 100644 index 936d2abeb..000000000 --- a/toolkit/themes/windows/global/icons/error-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/error-64-XP.png b/toolkit/themes/windows/global/icons/error-64-XP.png Binary files differdeleted file mode 100644 index 75a00c490..000000000 --- a/toolkit/themes/windows/global/icons/error-64-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/folder-item-XP.png b/toolkit/themes/windows/global/icons/folder-item-XP.png Binary files differdeleted file mode 100644 index 26cda98c9..000000000 --- a/toolkit/themes/windows/global/icons/folder-item-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/information-16-XP.png b/toolkit/themes/windows/global/icons/information-16-XP.png Binary files differdeleted file mode 100644 index aa8ce6e88..000000000 --- a/toolkit/themes/windows/global/icons/information-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/information-24-XP.png b/toolkit/themes/windows/global/icons/information-24-XP.png Binary files differdeleted file mode 100644 index 7fa782d58..000000000 --- a/toolkit/themes/windows/global/icons/information-24-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/information-32-XP.png b/toolkit/themes/windows/global/icons/information-32-XP.png Binary files differdeleted file mode 100644 index 5120db685..000000000 --- a/toolkit/themes/windows/global/icons/information-32-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/question-16-XP.png b/toolkit/themes/windows/global/icons/question-16-XP.png Binary files differdeleted file mode 100644 index 0c8eafda0..000000000 --- a/toolkit/themes/windows/global/icons/question-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/question-32.png b/toolkit/themes/windows/global/icons/question-32.png Binary files differnew file mode 100644 index 000000000..7c80831b0 --- /dev/null +++ b/toolkit/themes/windows/global/icons/question-32.png diff --git a/toolkit/themes/windows/global/icons/question-48.png b/toolkit/themes/windows/global/icons/question-48.png Binary files differnew file mode 100644 index 000000000..dd2b21874 --- /dev/null +++ b/toolkit/themes/windows/global/icons/question-48.png diff --git a/toolkit/themes/windows/global/icons/question-64-XP.png b/toolkit/themes/windows/global/icons/question-64-XP.png Binary files differdeleted file mode 100644 index a1a51b8d8..000000000 --- a/toolkit/themes/windows/global/icons/question-64-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/sslWarning-XP.png b/toolkit/themes/windows/global/icons/sslWarning-XP.png Binary files differdeleted file mode 100644 index 09946986f..000000000 --- a/toolkit/themes/windows/global/icons/sslWarning-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/warning-16-XP.png b/toolkit/themes/windows/global/icons/warning-16-XP.png Binary files differdeleted file mode 100644 index a21574370..000000000 --- a/toolkit/themes/windows/global/icons/warning-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/warning-64-XP.png b/toolkit/themes/windows/global/icons/warning-64-XP.png Binary files differdeleted file mode 100644 index 832f34886..000000000 --- a/toolkit/themes/windows/global/icons/warning-64-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/warning-large-XP.png b/toolkit/themes/windows/global/icons/warning-large-XP.png Binary files differdeleted file mode 100644 index 0ec8e79f6..000000000 --- a/toolkit/themes/windows/global/icons/warning-large-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/icons/windowControls-XP.png b/toolkit/themes/windows/global/icons/windowControls-XP.png Binary files differdeleted file mode 100644 index d90efb05b..000000000 --- a/toolkit/themes/windows/global/icons/windowControls-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 48613e794..7f2f29942 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -44,102 +44,36 @@ toolkit.jar: skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg) skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) - skin/classic/global/icons/close-XPVista7.png (icons/close-XPVista7.png) - skin/classic/global/icons/close-XPVista7@2x.png (icons/close-XPVista7@2x.png) - skin/classic/global/icons/close-inverted-XPVista7.png (icons/close-inverted-XPVista7.png) - skin/classic/global/icons/close-inverted-XPVista7@2x.png (icons/close-inverted-XPVista7@2x.png) + skin/classic/global/icons/close-win7.png (icons/close-win7.png) + skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png) + skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png) + skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png) skin/classic/global/icons/resizer.png (icons/resizer.png) skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) * skin/classic/global/in-content/common.css (in-content/common.css) * skin/classic/global/in-content/info-pages.css (in-content/info-pages.css) skin/classic/global/toolbar/spring.png (toolbar/spring.png) - skin/classic/global/dirListing/folder-XP.png (dirListing/folder-XP.png) - skin/classic/global/dirListing/local-XP.png (dirListing/local-XP.png) - skin/classic/global/dirListing/remote-XP.png (dirListing/remote-XP.png) - skin/classic/global/dirListing/up-XP.png (dirListing/up-XP.png) - skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) - skin/classic/global/icons/autoscroll-XP.png (icons/autoscroll-XP.png) - skin/classic/global/icons/blacklist_favicon-XP.png (icons/blacklist_favicon-XP.png) - skin/classic/global/icons/blacklist_large-XP.png (icons/blacklist_large-XP.png) - skin/classic/global/icons/Error-XP.png (icons/Error-XP.png) - skin/classic/global/icons/error-16-XP.png (icons/error-16-XP.png) - skin/classic/global/icons/error-64-XP.png (icons/error-64-XP.png) - skin/classic/global/icons/folder-item-XP.png (icons/folder-item-XP.png) - skin/classic/global/icons/information-16-XP.png (icons/information-16-XP.png) - skin/classic/global/icons/information-24-XP.png (icons/information-24-XP.png) - skin/classic/global/icons/information-32-XP.png (icons/information-32-XP.png) - skin/classic/global/icons/Print-preview-XP.png (icons/Print-preview-XP.png) - skin/classic/global/icons/Portrait-XP.png (icons/Portrait-XP.png) - skin/classic/global/icons/Landscape-XP.png (icons/Landscape-XP.png) - skin/classic/global/icons/Question-XP.png (icons/Question-XP.png) - skin/classic/global/icons/question-16-XP.png (icons/question-16-XP.png) - skin/classic/global/icons/question-64-XP.png (icons/question-64-XP.png) - skin/classic/global/icons/Search-close-XP.png (icons/Search-close-XP.png) - skin/classic/global/icons/Search-glass-XP.png (icons/Search-glass-XP.png) - skin/classic/global/icons/sslWarning-XP.png (icons/sslWarning-XP.png) - skin/classic/global/icons/Warning-XP.png (icons/Warning-XP.png) - skin/classic/global/icons/warning-large-XP.png (icons/warning-large-XP.png) - skin/classic/global/icons/warning-16-XP.png (icons/warning-16-XP.png) - skin/classic/global/icons/warning-64-XP.png (icons/warning-64-XP.png) - skin/classic/global/icons/windowControls-XP.png (icons/windowControls-XP.png) - skin/classic/global/toolbar/spring-XP.png (toolbar/spring-XP.png) - skin/classic/global/tree/sort-asc-XP.png (tree/sort-asc-XP.png) - skin/classic/global/tree/sort-dsc-XP.png (tree/sort-dsc-XP.png) - skin/classic/global/tree/twisty.svg (tree/twisty.svg) - skin/classic/global/tree/twisty-XP.svg (tree/twisty-XP.svg) - skin/classic/global/tree/twisty-Vista78.svg (tree/twisty-Vista78.svg) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) + skin/classic/global/tree/twisty.svg (tree/twisty.svg) + skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif -% override chrome://global/skin/dirListing/folder.png chrome://global/skin/dirListing/folder-XP.png osversion<6 -% override chrome://global/skin/dirListing/local.png chrome://global/skin/dirListing/local-XP.png osversion<6 -% override chrome://global/skin/dirListing/remote.png chrome://global/skin/dirListing/remote-XP.png osversion<6 -% override chrome://global/skin/dirListing/up.png chrome://global/skin/dirListing/up-XP.png osversion<6 -% override chrome://global/skin/icons/autoscroll.png chrome://global/skin/icons/autoscroll-XP.png osversion<6 -% override chrome://global/skin/icons/blacklist_favicon.png chrome://global/skin/icons/blacklist_favicon-XP.png osversion<6 -% override chrome://global/skin/icons/blacklist_large.png chrome://global/skin/icons/blacklist_large-XP.png osversion<6 -% override chrome://global/skin/icons/Error.png chrome://global/skin/icons/Error-XP.png osversion<6 -% override chrome://global/skin/icons/error-16.png chrome://global/skin/icons/error-16-XP.png osversion<6 -% override chrome://global/skin/icons/error-64.png chrome://global/skin/icons/error-64-XP.png osversion<6 -% override chrome://global/skin/icons/folder-item.png chrome://global/skin/icons/folder-item-XP.png osversion<6 -% override chrome://global/skin/icons/information-16.png chrome://global/skin/icons/information-16-XP.png osversion<6 -% override chrome://global/skin/icons/information-24.png chrome://global/skin/icons/information-24-XP.png osversion<6 -% override chrome://global/skin/icons/information-32.png chrome://global/skin/icons/information-32-XP.png osversion<6 -% override chrome://global/skin/icons/Print-preview.png chrome://global/skin/icons/Print-preview-XP.png osversion<6 -% override chrome://global/skin/icons/Portrait.png chrome://global/skin/icons/Portrait-XP.png osversion<6 -% override chrome://global/skin/icons/Landscape.png chrome://global/skin/icons/Landscape-XP.png osversion<6 -% override chrome://global/skin/icons/Question.png chrome://global/skin/icons/Question-XP.png osversion<6 -% override chrome://global/skin/icons/question-16.png chrome://global/skin/icons/question-16-XP.png osversion<6 -% override chrome://global/skin/icons/question-64.png chrome://global/skin/icons/question-64-XP.png osversion<6 -% override chrome://global/skin/icons/Search-close.png chrome://global/skin/icons/Search-close-XP.png osversion<6 -% override chrome://global/skin/icons/Search-glass.png chrome://global/skin/icons/Search-glass-XP.png osversion<6 -% override chrome://global/skin/icons/sslWarning.png chrome://global/skin/icons/sslWarning-XP.png osversion<6 -% override chrome://global/skin/icons/Warning.png chrome://global/skin/icons/Warning-XP.png osversion<6 -% override chrome://global/skin/icons/warning-large.png chrome://global/skin/icons/warning-large-XP.png osversion<6 -% override chrome://global/skin/icons/warning-16.png chrome://global/skin/icons/warning-16-XP.png osversion<6 -% override chrome://global/skin/icons/warning-64.png chrome://global/skin/icons/warning-64-XP.png osversion<6 -% override chrome://global/skin/icons/windowControls.png chrome://global/skin/icons/windowControls-XP.png osversion<6 -% override chrome://global/skin/toolbar/spring.png chrome://global/skin/toolbar/spring-XP.png osversion<6 -% override chrome://global/skin/tree/sort-asc.png chrome://global/skin/tree/sort-asc-XP.png osversion<6 -% override chrome://global/skin/tree/sort-dsc.png chrome://global/skin/tree/sort-dsc-XP.png osversion<6 -% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-XPVista7.png osversion<=6.1 -% override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-XPVista7@2x.png osversion<=6.1 -% override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-XPVista7.png osversion<=6.1 -% override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-XPVista7@2x.png osversion<=6.1 +% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-win7.png osversion<=6.1 +% override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-win7@2x.png osversion<=6.1 +% override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-win7.png osversion<=6.1 +% override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-win7@2x.png osversion<=6.1 -% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-Vista78.svg#clsd osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-Vista78.svg#open osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-Vista78.svg#open-hover osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-hover-rtl osversion<=6.3 -# to be sure osversion<6 has always higher precedence than osversion<=6.3 we override twisty-Vista78.svg instead of twisty.svg -% override chrome://global/skin/tree/twisty-Vista78.svg#clsd chrome://global/skin/tree/twisty-XP.svg#clsd osversion<6 -% override chrome://global/skin/tree/twisty-Vista78.svg#open chrome://global/skin/tree/twisty-XP.svg#open osversion<6 +% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-preWin10.svg#clsd osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-preWin10.svg#open osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-preWin10.svg#open-hover osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-hover-rtl osversion<=6.3 diff --git a/toolkit/themes/windows/global/listbox.css b/toolkit/themes/windows/global/listbox.css index fd60b1693..ddea3f8fa 100644 --- a/toolkit/themes/windows/global/listbox.css +++ b/toolkit/themes/windows/global/listbox.css @@ -144,70 +144,67 @@ listheader[sortable="true"]:hover:active { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - listitem { - --listitem-selectedColor: rgb(217,217,217); - --listitem-selectedBorder: var(--listitem-selectedColor); - --listitem-selectedBottomBorder: rgb(204,204,204); - --listitem-selectedBackground: var(--listitem-selectedColor); - --listitem-selectedImage: none; - --listitem-selectedCurrentBorder: rgb(123,195,255); - --listitem-selectedFocusColor: rgb(205,232,255); - --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor); - --listitem-selectedFocusBottomBorder: rgb(165,214,255); - --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor); - --listitem-selectedFocusImage: none; - --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor); - --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder); - --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor); - - color: -moz-FieldText; - margin-inline-start: 1px; - margin-inline-end: 1px; - padding-top: 1px; - padding-bottom: 1px; - border-width: 1px; - background-repeat: no-repeat; - background-size: 100% 100%; - } + listitem { + --listitem-selectedColor: rgb(217,217,217); + --listitem-selectedBorder: var(--listitem-selectedColor); + --listitem-selectedBottomBorder: rgb(204,204,204); + --listitem-selectedBackground: var(--listitem-selectedColor); + --listitem-selectedImage: none; + --listitem-selectedCurrentBorder: rgb(123,195,255); + --listitem-selectedFocusColor: rgb(205,232,255); + --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor); + --listitem-selectedFocusBottomBorder: rgb(165,214,255); + --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor); + --listitem-selectedFocusImage: none; + --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor); + --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder); + --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor); + + color: -moz-FieldText; + margin-inline-start: 1px; + margin-inline-end: 1px; + padding-top: 1px; + padding-bottom: 1px; + border-width: 1px; + background-repeat: no-repeat; + background-size: 100% 100%; + } - listitem[selected="true"] { - border-top-color: var(--listitem-selectedBorder); - border-right-color: var(--listitem-selectedBorder); - border-left-color: var(--listitem-selectedBorder); - border-bottom-color: var(--listitem-selectedBottomBorder); - background-image: var(--listitem-selectedImage); - background-color: var(--listitem-selectedBackground); - color: -moz-DialogText; - } + listitem[selected="true"] { + border-top-color: var(--listitem-selectedBorder); + border-right-color: var(--listitem-selectedBorder); + border-left-color: var(--listitem-selectedBorder); + border-bottom-color: var(--listitem-selectedBottomBorder); + background-image: var(--listitem-selectedImage); + background-color: var(--listitem-selectedBackground); + color: -moz-DialogText; + } - listbox:focus > listitem[selected="true"] { - border-top-color: var(--listitem-selectedFocusBorder); - border-right-color: var(--listitem-selectedFocusBorder); - border-left-color: var(--listitem-selectedFocusBorder); - border-bottom-color: var(--listitem-selectedFocusBottomBorder); - background-image: var(--listitem-selectedFocusImage); - background-color: var(--listitem-selectedFocusBackground); - color: -moz-DialogText; - } + listbox:focus > listitem[selected="true"] { + border-top-color: var(--listitem-selectedFocusBorder); + border-right-color: var(--listitem-selectedFocusBorder); + border-left-color: var(--listitem-selectedFocusBorder); + border-bottom-color: var(--listitem-selectedFocusBottomBorder); + background-image: var(--listitem-selectedFocusImage); + background-color: var(--listitem-selectedFocusBackground); + color: -moz-DialogText; + } - listbox:focus > listitem[current="true"] { - border-color: var(--listitem-selectedCurrentBorder); - outline: none; - } + listbox:focus > listitem[current="true"] { + border-color: var(--listitem-selectedCurrentBorder); + outline: none; + } - listbox:focus > listitem[selected="true"][current="true"] { - border-top-color: var(--listitem-selectedFocusCurrentBorder); - border-right-color: var(--listitem-selectedFocusCurrentBorder); - border-left-color: var(--listitem-selectedFocusCurrentBorder); - border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder); - background-color: var(--listitem-selectedFocusCurrentBackground); - outline: none; - } + listbox:focus > listitem[selected="true"][current="true"] { + border-top-color: var(--listitem-selectedFocusCurrentBorder); + border-right-color: var(--listitem-selectedFocusCurrentBorder); + border-left-color: var(--listitem-selectedFocusCurrentBorder); + border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder); + background-color: var(--listitem-selectedFocusCurrentBackground); + outline: none; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { listitem { --listitem-selectedBottomBorder: var(--listitem-selectedColor); --listitem-selectedBackground: rgba(190,190,190,.15); diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css index 2a228251d..c22aedd7a 100644 --- a/toolkit/themes/windows/global/menu.css +++ b/toolkit/themes/windows/global/menu.css @@ -148,15 +148,13 @@ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - menubar > menu:-moz-lwtheme { - -moz-appearance: menuitem; - } - - menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { - color: inherit !important; - text-shadow: inherit; - } + menubar > menu:-moz-lwtheme { + -moz-appearance: menuitem; + } + + menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { + color: inherit !important; + text-shadow: inherit; } } diff --git a/toolkit/themes/windows/global/menulist.css b/toolkit/themes/windows/global/menulist.css index 9480bffda..de24dbdde 100644 --- a/toolkit/themes/windows/global/menulist.css +++ b/toolkit/themes/windows/global/menulist.css @@ -82,12 +82,6 @@ menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { border: 1px dotted ThreeDDarkShadow; } -@media (-moz-os-version: windows-xp) { - menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { - border: 1px dotted #F5DB95; - } -} - /* ..... disabled state ..... */ menulist[disabled="true"] { @@ -113,31 +107,29 @@ html|*.menulist-editable-input { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - .menulist-label-box { - background-color: transparent !important; - color: inherit !important; - } - - .menulist-label { - margin-top: -1px !important; - margin-bottom: -1px !important; - margin-inline-start: 0 !important; - } - - .menulist-description { - margin-inline-start: 1ex !important; - } - - menulist:not([editable="true"]) > .menulist-dropmarker { - margin-top: -2px; - margin-inline-start: 3px; - margin-inline-end: -3px; - } - - .menulist-icon { - margin-top: -1px; - margin-bottom: -1px; - } + .menulist-label-box { + background-color: transparent !important; + color: inherit !important; + } + + .menulist-label { + margin-top: -1px !important; + margin-bottom: -1px !important; + margin-inline-start: 0 !important; + } + + .menulist-description { + margin-inline-start: 1ex !important; + } + + menulist:not([editable="true"]) > .menulist-dropmarker { + margin-top: -2px; + margin-inline-start: 3px; + margin-inline-end: -3px; + } + + .menulist-icon { + margin-top: -1px; + margin-bottom: -1px; } } diff --git a/toolkit/themes/windows/global/popup.css b/toolkit/themes/windows/global/popup.css index 010e85a93..e5c3c4500 100644 --- a/toolkit/themes/windows/global/popup.css +++ b/toolkit/themes/windows/global/popup.css @@ -58,9 +58,7 @@ panel[type="arrow"][side="right"] { } %ifdef XP_WIN -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { %endif .panel-arrowcontent { border-radius: 4px; diff --git a/toolkit/themes/windows/global/textbox.css b/toolkit/themes/windows/global/textbox.css index 78ca7f320..7b136a0ea 100644 --- a/toolkit/themes/windows/global/textbox.css +++ b/toolkit/themes/windows/global/textbox.css @@ -37,10 +37,8 @@ html|*.textbox-textarea { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - textbox html|*.textbox-input::placeholder { - font-style: italic; - } + textbox html|*.textbox-input::placeholder { + font-style: italic; } } diff --git a/toolkit/themes/windows/global/toolbar/spring-XP.png b/toolkit/themes/windows/global/toolbar/spring-XP.png Binary files differdeleted file mode 100644 index e20f602c2..000000000 --- a/toolkit/themes/windows/global/toolbar/spring-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/toolbarbutton.css b/toolkit/themes/windows/global/toolbarbutton.css index e96e529cf..ac3c7ba4a 100644 --- a/toolkit/themes/windows/global/toolbarbutton.css +++ b/toolkit/themes/windows/global/toolbarbutton.css @@ -84,17 +84,11 @@ toolbarbutton[checked="true"]:not([disabled="true"]) { text-shadow: none; } - toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) { + toolbarbutton:-moz-lwtheme:not([disabled="true"]) { color: inherit; text-shadow: inherit; } - @media not all and (-moz-os-version: windows-xp) { - toolbarbutton:-moz-lwtheme:not([disabled="true"]) { - color: inherit; - text-shadow: inherit; - } - } } @media not all and (-moz-windows-default-theme) { diff --git a/toolkit/themes/windows/global/tree.css b/toolkit/themes/windows/global/tree.css index 130096824..2b4957c6c 100644 --- a/toolkit/themes/windows/global/tree.css +++ b/toolkit/themes/windows/global/tree.css @@ -310,7 +310,7 @@ treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descend /* ::::: twisty ::::: */ treechildren::-moz-tree-twisty { - padding-inline-end: 4px; + padding-inline-end: 1px; padding-top: 1px; width: 9px; /* The image's width is 9 pixels */ list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd"); @@ -320,8 +320,32 @@ treechildren::-moz-tree-twisty(open) { list-style-image: url("chrome://global/skin/tree/twisty.svg#open"); } +treechildren::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); +} + +treechildren::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); +} + treechildren::-moz-tree-indentation { - width: 18px; + width: 12px; } /* ::::: gridline style ::::: */ @@ -370,233 +394,196 @@ treechildren::-moz-tree-cell-text(active, selected, editing) { } %ifdef XP_WIN -@media not all and (-moz-os-version: windows-xp) { - /* ::::: twisty ::::: */ - - treechildren::-moz-tree-indentation { - width: 12px; +@media (-moz-windows-default-theme) { + treechildren { + --treechildren-outline: none; + --treechildren-2ndBorderColor: rgba(255,255,255,.4); + --treechildren-selectedColor: rgb(217,217,217); + --treechildren-focusColor: rgb(123,195,255); + --treechildren-selectedFocusColor: rgb(205,232,255); + --treechildren-currentColor: rgb(125,162,206); + --treechildren-hoverColor: rgb(229,243,255); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: rgb(204,204,204); + --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217)); + --treechildren-selectedBackground: transparent; + --treechildren-currentFocusBorder: var(--treechildren-focusColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusBottomBorder: rgb(165,214,255); + --treechildren-selectedFocusImage: none; + --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); + --treechildren-hoverBorder: var(--treechildren-hoverColor); + --treechildren-hoverBottomBorder: var(--treechildren-hoverColor); + --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); } - treechildren::-moz-tree-twisty { - padding-inline-end: 1px; + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + height: 1.8em; + color: -moz-FieldText; + margin-inline-start: 1px; + margin-inline-end: 1px; + border-width: 1px; + border-color: transparent; + background-repeat: no-repeat; + background-size: 100% 100%; } - treechildren::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { + -moz-border-top-colors: var(--treechildren-selectedBorder); + -moz-border-right-colors: var(--treechildren-selectedBorder); + -moz-border-left-colors: var(--treechildren-selectedBorder); + -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder); + background-image: var(--treechildren-selectedImage); + background-color: var(--treechildren-selectedBackground); + outline: var(--treechildren-outline); } - treechildren::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-currentFocusBorder); + -moz-border-right-colors: var(--treechildren-currentFocusBorder); + -moz-border-left-colors: var(--treechildren-currentFocusBorder); + -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder); + outline: var(--treechildren-outline); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus), + treechildren::-moz-tree-row(dropOn) { + -moz-border-top-colors: var(--treechildren-selectedFocusBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder); + background-image: var(--treechildren-selectedFocusImage); + background-color: var(--treechildren-selectedFocusBackground); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder); + background-image: var(--treechildren-selectedFocusCurrentImage); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) { + -moz-border-top-colors: var(--treechildren-hoverBorder); + -moz-border-right-colors: var(--treechildren-hoverBorder); + -moz-border-left-colors: var(--treechildren-hoverBorder); + -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder); + background-image: var(--treechildren-hoverImage); + outline: var(--treechildren-outline); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) { + -moz-border-top-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-right-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-left-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder); + background-image: var(--treechildren-hoverCurrentImage); } - @media (-moz-windows-default-theme) { - treechildren { - --treechildren-outline: none; - --treechildren-2ndBorderColor: rgba(255,255,255,.4); - --treechildren-selectedColor: rgb(217,217,217); - --treechildren-focusColor: rgb(123,195,255); - --treechildren-selectedFocusColor: rgb(205,232,255); - --treechildren-currentColor: rgb(125,162,206); - --treechildren-hoverColor: rgb(229,243,255); - --treechildren-selectedBorder: var(--treechildren-selectedColor); - --treechildren-selectedBottomBorder: rgb(204,204,204); - --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217)); - --treechildren-selectedBackground: transparent; - --treechildren-currentFocusBorder: var(--treechildren-focusColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor); - --treechildren-selectedFocusBottomBorder: rgb(165,214,255); - --treechildren-selectedFocusImage: none; - --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor); - --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); - --treechildren-hoverBorder: var(--treechildren-hoverColor); - --treechildren-hoverBottomBorder: var(--treechildren-hoverColor); - --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255)); - --treechildren-hoverCurrentBorder: var(--treechildren-currentColor); - --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor); - --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-focusColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor); - --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row { - height: 1.8em; - color: -moz-FieldText; - margin-inline-start: 1px; - margin-inline-end: 1px; - border-width: 1px; - border-color: transparent; - background-repeat: no-repeat; - background-size: 100% 100%; - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { - -moz-border-top-colors: var(--treechildren-selectedBorder); - -moz-border-right-colors: var(--treechildren-selectedBorder); - -moz-border-left-colors: var(--treechildren-selectedBorder); - -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder); - background-image: var(--treechildren-selectedImage); - background-color: var(--treechildren-selectedBackground); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) { - border-style: solid; - -moz-border-top-colors: var(--treechildren-currentFocusBorder); - -moz-border-right-colors: var(--treechildren-currentFocusBorder); - -moz-border-left-colors: var(--treechildren-currentFocusBorder); - -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus), - treechildren::-moz-tree-row(dropOn) { - -moz-border-top-colors: var(--treechildren-selectedFocusBorder); - -moz-border-right-colors: var(--treechildren-selectedFocusBorder); - -moz-border-left-colors: var(--treechildren-selectedFocusBorder); - -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder); - background-image: var(--treechildren-selectedFocusImage); - background-color: var(--treechildren-selectedFocusBackground); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) { - border-style: solid; - -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder); - background-image: var(--treechildren-selectedFocusCurrentImage); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) { - -moz-border-top-colors: var(--treechildren-hoverBorder); - -moz-border-right-colors: var(--treechildren-hoverBorder); - -moz-border-left-colors: var(--treechildren-hoverBorder); - -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder); - background-image: var(--treechildren-hoverImage); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) { - -moz-border-top-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-right-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-left-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder); - background-image: var(--treechildren-hoverCurrentImage); - } + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) { + -moz-border-top-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-right-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-left-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder); + background-image: var(--treechildren-hoverSelectedImage); + } - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) { - -moz-border-top-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-right-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-left-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder); - background-image: var(--treechildren-hoverSelectedImage); - } + tree[disabled="true"] > treechildren::-moz-tree-row { + background: none; + -moz-border-top-colors: transparent; + -moz-border-right-colors: transparent; + -moz-border-left-colors: transparent; + -moz-border-bottom-colors: transparent; + } - tree[disabled="true"] > treechildren::-moz-tree-row { - background: none; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-left-colors: transparent; - -moz-border-bottom-colors: transparent; - } + treechildren::-moz-tree-cell(dropOn) { + background-image: none; + background-color: transparent; + border-radius: 0; + } - treechildren::-moz-tree-cell(dropOn) { - background-image: none; - background-color: transparent; - border-radius: 0; - } + treechildren::-moz-tree-cell-text(primary, dropOn) { + color: -moz-FieldText; + } - treechildren::-moz-tree-cell-text(primary, dropOn) { - color: -moz-FieldText; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text { + padding-bottom: initial; + border-color: transparent; + background-color: transparent; + } - treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text { - padding-bottom: initial; - border-color: transparent; - background-color: transparent; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) { + color: -moz-DialogText; + } - treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) { - color: -moz-DialogText; + @media (-moz-os-version: windows-win7) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6); + --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor); + --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - treechildren { - --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); - --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6); - --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor); - --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4)); - --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375)); - --treechildren-selectedFocusBackground: transparent; - --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); - --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor); - --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); - --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row { - border-width: 2px; - border-radius: 3px; - -moz-outline-radius: 3px; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + border-width: 2px; + border-radius: 3px; + -moz-outline-radius: 3px; } + } - @media (-moz-os-version: windows-win8) { - treechildren { - --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); - --treechildren-selectedBorder: var(--treechildren-selectedColor); - --treechildren-selectedBottomBorder: var(--treechildren-selectedColor); - --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4)); - --treechildren-currentFocusBorder: var(--treechildren-currentColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375)); - --treechildren-selectedFocusBackground: transparent; - --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); - --treechildren-hoverBorder: rgb(184,214,251); - --treechildren-hoverBottomBorder: rgb(184,214,251); - --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-currentColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor); - --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); - } + @media (-moz-os-version: windows-win8) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251); + --treechildren-hoverBottomBorder: rgb(184,214,251); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); } } } diff --git a/toolkit/themes/windows/global/tree/sort-asc-XP.png b/toolkit/themes/windows/global/tree/sort-asc-XP.png Binary files differdeleted file mode 100644 index 64d077a8f..000000000 --- a/toolkit/themes/windows/global/tree/sort-asc-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/tree/sort-dsc-XP.png b/toolkit/themes/windows/global/tree/sort-dsc-XP.png Binary files differdeleted file mode 100644 index 9c4a82587..000000000 --- a/toolkit/themes/windows/global/tree/sort-dsc-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/global/tree/twisty-XP.svg b/toolkit/themes/windows/global/tree/twisty-XP.svg deleted file mode 100644 index 66219d513..000000000 --- a/toolkit/themes/windows/global/tree/twisty-XP.svg +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.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/. --> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9"> - <style> - use:not(:target) { - display: none; - } - use { - stroke: #000000; - stroke-width: 1; - } - </style> - <defs> - <linearGradient id="linearGradient1"> - <stop style="stop-color: #ffffff;" offset="0"/> - <stop style="stop-color: #e0e0e0;" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient2"> - <stop style="stop-color: #c9c9c9;" offset="0"/> - <stop style="stop-color: #f8f8f8;" offset="1"/> - </linearGradient> - <linearGradient id="gradient1" xlink:href="#linearGradient1" gradientUnits="userSpaceOnUse" x1="4.5" y1="2" x2="4.5" y2="7"/> - <linearGradient id="gradient2" xlink:href="#linearGradient2" gradientUnits="userSpaceOnUse" x1="4.5" y1="6" x2="4.5" y2="3"/> - <path id="clsd-shape" d="m 2,4.5 5,0 M 4.5,2 l 0,5"/> - <path id="open-shape" d="m 2,4.5 5,0"/> - </defs> - <rect style="fill: url(#gradient1); stroke: #5d5cc2; stroke-linejoin: round; stroke-opacity: 0.8" width="8" height="8" x="0.5" y="0.5"/> - <rect style="fill: url(#gradient2);" width="5" height="5" x="2" y="2"/> - <use id="clsd" xlink:href="#clsd-shape"/> - <use id="open" xlink:href="#open-shape"/> -</svg> diff --git a/toolkit/themes/windows/global/tree/twisty-Vista78.svg b/toolkit/themes/windows/global/tree/twisty-preWin10.svg index 0a6908634..0a6908634 100644 --- a/toolkit/themes/windows/global/tree/twisty-Vista78.svg +++ b/toolkit/themes/windows/global/tree/twisty-preWin10.svg diff --git a/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png b/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png Binary files differdeleted file mode 100644 index d36385ce5..000000000 --- a/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png b/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png Binary files differdeleted file mode 100644 index 8225b6c2d..000000000 --- a/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/extensions/about.css b/toolkit/themes/windows/mozapps/extensions/about.css index 19eaddca8..7188c11bf 100644 --- a/toolkit/themes/windows/mozapps/extensions/about.css +++ b/toolkit/themes/windows/mozapps/extensions/about.css @@ -31,10 +31,10 @@ } #extensionIcon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); max-width: 64px; max-height: 64px; - margin-inline-end: 6px; + -moz-margin-end: 6px; } #genericAbout[addontype="theme"] #extensionIcon { @@ -76,7 +76,7 @@ } .boxIndent { - margin-inline-start: 18px; + -moz-margin-start: 18px; } #extensionCreator, .contributor { diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-error.png b/toolkit/themes/windows/mozapps/extensions/alerticon-error.png Binary files differnew file mode 100644 index 000000000..8740e4911 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/alerticon-error.png diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png b/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png Binary files differnew file mode 100644 index 000000000..2c5f628ab --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png b/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png Binary files differnew file mode 100644 index 000000000..a186c6b7a --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png b/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png Binary files differnew file mode 100644 index 000000000..75ea826f9 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png diff --git a/toolkit/themes/windows/mozapps/extensions/blocklist.css b/toolkit/themes/windows/mozapps/extensions/blocklist.css index 1cdbb35ac..da92102d0 100644 --- a/toolkit/themes/windows/mozapps/extensions/blocklist.css +++ b/toolkit/themes/windows/mozapps/extensions/blocklist.css @@ -5,8 +5,8 @@ richlistitem { padding-top: 6px; padding-bottom: 6px; - padding-inline-start: 7px; - padding-inline-end: 7px; + -moz-padding-start: 7px; + -moz-padding-end: 7px; border-bottom: 1px solid #C0C0C0; } diff --git a/toolkit/themes/windows/mozapps/extensions/category-dictionaries.png b/toolkit/themes/windows/mozapps/extensions/category-dictionaries.png Binary files differnew file mode 100644 index 000000000..b26bb7100 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/category-dictionaries.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-experiments.png b/toolkit/themes/windows/mozapps/extensions/category-experiments.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/category-experiments.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins.png b/toolkit/themes/windows/mozapps/extensions/category-plugins.png Binary files differindex 100a90307..1fcbf154e 100644 --- a/toolkit/themes/windows/mozapps/extensions/category-plugins.png +++ b/toolkit/themes/windows/mozapps/extensions/category-plugins.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-searchengines.png b/toolkit/themes/windows/mozapps/extensions/category-searchengines.png Binary files differnew file mode 100644 index 000000000..b893cb48a --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/category-searchengines.png diff --git a/toolkit/themes/windows/mozapps/extensions/eula.css b/toolkit/themes/windows/mozapps/extensions/eula.css index 05aeb3c1c..5fb2c52df 100644 --- a/toolkit/themes/windows/mozapps/extensions/eula.css +++ b/toolkit/themes/windows/mozapps/extensions/eula.css @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); max-width: 48px; max-height: 48px; - margin-inline-end: 6px; + -moz-margin-end: 6px; } #eula-dialog[addontype="theme"] #icon { diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png Binary files differdeleted file mode 100644 index 36e7689a3..000000000 --- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png Binary files differindex 2724b9e7c..0ddee4c9b 100644 --- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png +++ b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-48.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-48.png Binary files differnew file mode 100644 index 000000000..27418fba8 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-48.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png Binary files differnew file mode 100644 index 000000000..5a3162363 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css index 335a31bde..f350f7ca6 100644 --- a/toolkit/themes/windows/mozapps/extensions/extensions.css +++ b/toolkit/themes/windows/mozapps/extensions/extensions.css @@ -2,11 +2,338 @@ * 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/extensions/extensions.inc.css +@import url("chrome://global/skin/inContentUI.css"); + + +.nav-button { + list-style-image: url(chrome://mozapps/skin/extensions/navigation.png); +} + +#forward-btn { + -moz-border-start: none; +} + +#back-btn:-moz-locale-dir(ltr), +#forward-btn:-moz-locale-dir(rtl) { + -moz-image-region: rect(0, 18px, 18px, 0); + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +#back-btn:-moz-locale-dir(rtl), +#forward-btn:-moz-locale-dir(ltr) { + -moz-image-region: rect(0, 36px, 18px, 18px); + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + + +/*** global warnings ***/ + +.global-warning-container { + overflow-x: hidden; +} + +.global-warning { + -moz-box-align: center; + padding: 0 8px; + color: #916D15; + font-weight: bold; +} + +#addons-page[warning] .global-warning-container { + background-color: rgba(255, 255, 0, 0.1); + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); + background-repeat: repeat-x; +} + +#detail-view .global-warning { + padding: 4px 12px; + border-bottom: 1px solid #CAD4E0; +} + +@media (max-width: 600px) { + .global-warning-text { + display: none; + } + + .global-warning .warning-icon { + background-color: #FFF; + box-shadow: 0px 0px 2px 5px #FFF; + border-radius: 10px; + } +} + +/*** global informations ***/ +#addons-page .global-info-container { + background-color: #f3f7fb; + border-top-right-radius: 5px; + border-top-left-radius: 5px; +} + +/* Plugins aren't yet disabled by safemode (bug 342333), + so don't show that warning when viewing plugins. */ +#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, +#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container { + background-color: inherit; + background-image: none; +} + + +/*** notification icons ***/ + +.warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.error-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.pending-icon, +.info-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + +.addon-view[pending="disable"] .pending-icon, +.addon-view[pending="uninstall"] .pending-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png"); + width: 16px; + height: 15px; + margin: 3px 0; +} + + +/*** view alert boxes ***/ + +.alert-container { + -moz-box-align: center; +} + +.alert-spacer-before { + -moz-box-flex: 1; +} + +.alert-spacer-after { + -moz-box-flex: 3; +} + +.alert { + -moz-box-align: center; + padding: 10px; + color: #373D48; + border: 1px solid #A8B8D1; + border-radius: 8px; + background-image: linear-gradient(#FFF, #ECF1F7); + background-clip: padding-box; + box-shadow: 2px 2px 4px #999; +} + +.alert .alert-title { + font-weight: bold; + font-size: 200%; + margin-bottom: 15px; +} + +.alert button { + margin: 1em 2em; +} + +.loading { + list-style-image: url("chrome://global/skin/icons/loading_16.png"); + padding-left: 20px; + padding-right: 20px; +} + + +/*** category selector ***/ + +#categories { + -moz-appearance: none; + border: none; + -moz-margin-end: -1px; + background-color: transparent; + position: relative; + margin-top: 31px; +} + +.category { + -moz-appearance: none; + background-color: transparent; + color: #252F3B; + min-height: 0; + padding: 10px 4px; + border-width: 1px; + border-style: solid; + border-color: transparent; + -moz-box-align: center; + overflow: hidden; +} + +%ifdef XP_WIN +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif + .category:-moz-locale-dir(ltr) { + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + } + + .category:-moz-locale-dir(rtl) { + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + } +%ifdef XP_WIN +} +%endif + +.category[disabled] { + border-top: 0; + border-bottom: 0; + height: 0; + opacity: 0; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category:not([disabled]) { + height: 52px; + transition-property: height, opacity; + transition-duration: 1s, 0.8s; +} + +.category[selected] { + background-color: rgba(255, 255, 255, 0.4); + color: #252F3B; + border-color: #C3CEDF; + -moz-border-end-color: #E2E9F2; +} + +.category-name { + font-size: 150%; +} + +/* Maximize the size of the viewport when the window is small */ +@media (max-width: 800px) { + .category-name { + display: none; + } +} + +.category-badge { + background-color: #55D4FF; + padding: 2px 8px; + margin: 6px 0; + border-radius: 10000px; + color: #FFF; + font-weight: bold; + text-align: center; +} + +.category-badge[value="0"] { + visibility: hidden; +} + +.category-icon { + width: 32px; + height: 32px; + -moz-margin-start: 6px; +} + +#category-search > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-search.png"); +} +#category-discover > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); +} +#category-locale > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); +} +#category-searchengine > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); +} +#category-extension > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); +} +#category-service > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); +} +#category-theme > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); +} +#category-plugin > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); +} +#category-dictionary > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); +} +#category-experiment > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); +} +#category-availableUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); +} +#category-recentUpdates > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png"); +} + + +/*** header ***/ + +#header { + margin-bottom: 18px; +} + +#header-search { + margin: 0; +} + +@media (max-width: 600px) { + #header-search { + width: 12em; + } +} + +@media (-moz-windows-default-theme) { + #header-search { + -moz-appearance: none; + border: 1px solid rgba(0, 0, 0, 0.32); + padding-bottom: 2px; + background-color: rgba(255, 255, 255, 0.4); + } + +%ifdef XP_WIN +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif + #header-search { + border-radius: 2.5px; + } +%ifdef XP_WIN +} +%endif + + #header-search:hover { + background-color: rgba(255, 255, 255, .75); + } + + #header-search[focused] { + background-color: white; + } +} #header-utils-btn { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); - margin-inline-end: 16px; + -moz-margin-end: 16px; } @media not all and (-moz-windows-default-theme) { @@ -15,6 +342,44 @@ } } +.view-header { + background-color: rgba(251, 252, 253, 0.25); + padding: 4px; + margin: 0; + min-height: 31px; + border-bottom: 1px solid #CAD4E0; +} + + +/*** sorters ***/ + +.sort-controls { + -moz-appearance: none; +} + +.sorter { + -moz-appearance: none; + border: none; + background-color: transparent; + color: #536680; + border-radius: 10000px; + padding: 0 6px; + margin: 0 6px; + min-width: 12px !important; + -moz-box-direction: reverse; +} + +.sorter .button-box { + padding-top: 0; + padding-bottom: 0; +} + +.sorter[checkState="1"], +.sorter[checkState="2"] { + background-color: rgba(194, 200, 206, 0.4); + box-shadow: 1px 1px 2px #B6BBC4 inset; +} + .sorter[checkState="1"] { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); } @@ -23,15 +388,584 @@ list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); } +.sorter .button-icon { + -moz-margin-start: 4px; +} + + +/*** discover view ***/ + +.discover-spacer-before, +.discover-spacer-after { + -moz-box-flex: 1; +} + +#discover-error .alert { + max-width: 45em; + -moz-box-flex: 1; +} + +.discover-logo { + list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png"); + -moz-margin-end: 15px; +} + +.discover-title { + font-weight: bold; + font-size: 24px; + font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif; + margin: 0 0 15px 0; +} + +.discover-description { + text-align: justify; + margin: 0 0 15px 0; +} + +.discover-footer { + text-align: justify; +} + + +/*** list ***/ + +.list { + -moz-appearance: none; + margin: 0; + border: none; + background-color: transparent; +} + +.addon { + color: black; + border-top: 2px solid; + -moz-border-top-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1); + border-bottom: 1px solid; + -moz-border-bottom-colors: rgba(255, 255, 255, 0.1); + padding: 5px; + background-origin: border-box; +} + +.view-pane:not(#search-view) .addon:first-of-type, +#search-view .addon[first] { + border-top-width: 1px; + -moz-border-top-colors: rgba(255, 255, 255, 0.1); +} + +.view-pane:not(#search-view) .addon:last-of-type, +#search-view .addon[last] { + border-bottom-width: 2px; + -moz-border-bottom-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1); +} + +.details { + cursor: pointer; + margin: 0; + -moz-margin-start: 10px; +} + +.icon-container { + width: 48px; + height: 48px; + margin: 3px 7px; + -moz-box-align: center; + -moz-box-pack: center; +} + +.icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + max-width: 48px; + max-height: 48px; +} + +.addon[active="false"] .icon { + filter: grayscale(1); +} + + +.addon-view[type="theme"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-view[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-view[type="plugin"] .icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-view[type="dictionary"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +.addon-view[type="experiment"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); +} + +.name-container { + font-size: 150%; + font-weight: bold; + color: #3F3F3F; + margin-bottom: 0; + -moz-box-align: end; + -moz-box-flex: 1; +} + +.creator { + font-weight: bold; +} + +.creator .text-link { + color: #0066CC; +} + +.description-container { + -moz-margin-start: 6px; + -moz-box-align: center; +} + +.description { + margin: 0; +} + +.warning, +.pending, +.error { + -moz-margin-start: 48px; + font-weight: bold; + -moz-box-align: center; +} + +.content-container, +.basicinfo-container { + -moz-box-align: start; +} + +.addon[status="installing"] > .content-container { + -moz-box-align: stretch; +} + +.advancedinfo-container, +.update-info-container { + -moz-box-align: center; +} + +.update-available { + -moz-box-align: end; +} + +.install-status-container { + -moz-box-pack: end; + -moz-box-align: end; +} + +.name-outer-container { + -moz-box-pack: center; +} + +.relnotes-toggle-container, +.icon-outer-container { + -moz-box-pack: start; +} + +.status-container, +.control-container { + -moz-box-pack: end; +} + +.addon-view .warning { + color: #916D15; +} + +.addon-view .error { + color: #864441; +} + +.addon-view .pending { + color: #1B7123; +} + +.addon-view[pending="disable"] .pending, +.addon-view[pending="uninstall"] .pending { + color: #62666E; +} + +.addon .relnotes-container { + -moz-box-align: start; + -moz-margin-start: 6px; + height: 0; + overflow: hidden; + opacity: 0; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon[show-relnotes] .relnotes-container { + opacity: 1; + transition-property: height, opacity; + transition-duration: 0.5s, 0.5s; +} + +.addon .relnotes-header { + font-weight: bold; + margin: 10px 0; +} + .addon .relnotes-toggle { + -moz-appearance: none; + border: none; + background: transparent; + font-weight: bold; -moz-box-direction: reverse; + cursor: pointer; list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); } +.addon .relnotes-toggle > .button-box > .button-icon { + -moz-padding-start: 4px; +} + .addon[show-relnotes] .relnotes-toggle { list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); } +.addon[active="false"] { + background-color: rgba(135, 135, 135, 0.1); + background-image: linear-gradient(rgba(135, 135, 135, 0), + rgba(135, 135, 135, 0.1)); +} + +.addon-view[active="false"], +.addon-view[active="false"] .name-container { + color: #888A8B; +} + +.addon-view[notification="warning"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), + linear-gradient(rgba(255, 255, 0, 0.04), + rgba(255, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[notification="error"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), + linear-gradient(rgba(255, 0, 0, 0.04), + rgba(255, 0, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="enable"], +.addon-view[pending="upgrade"], +.addon-view[pending="install"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), + linear-gradient(rgba(0, 255, 0, 0.04), + rgba(0, 255, 0, 0)); + background-repeat: repeat-x; +} + +.addon-view[pending="disable"], +.addon-view[pending="uninstall"] { + background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), + linear-gradient(rgba(128, 128, 128, 0.04), + rgba(128, 128, 128, 0)); + background-repeat: repeat-x; +} + +.addon[selected] { + background-color: rgba(148, 172, 204, 0.39); + color: black; +} + +.addon[active="false"][selected] .name-container { + color: #3F3F3F; +} + + +/*** item - uninstalled ***/ + +.addon[status="uninstalled"] { + border: none; +} + +.addon[status="uninstalled"] > .container { + -moz-box-align: center; + padding: 4px 20px; + background-color: #FDFFA8; + border-radius: 8px; + font-size: 120%; +} + +.addon[status="uninstalled"][selected] { + background-color: transparent; +} + + + +/*** search view ***/ + +#search-filter { + padding: 5px 20px; + font-size: 120%; + border-bottom: 1px solid #CAD4E0; + overflow-x: hidden; +} + +#search-filter-label { + font-weight: bold; + color: grey; +} + +.search-filter-radio { + -moz-appearance: none; + padding: 0 6px; + margin: 0 3px; + border-radius: 10000px; +} + +.search-filter-radio[selected] { + background-color: grey; + color: white; +} + +.search-filter-radio .radio-check-box1 { + display: none; +} + +.search-filter-radio .radio-icon { + display: none; +} + +#search-allresults-link { + margin-top: 1em; + margin-bottom: 2em; +} + +/*** detail view ***/ + +#detail-view .loading { + opacity: 0; +} + +#detail-view[loading-extended] .loading { + opacity: 1; + transition-property: opacity; + transition-duration: 1s; +} + +.detail-view-container { + padding: 0 2em 2em 2em; + font-size: 110%; +} + +#detail-notifications { + margin-top: 1em; + margin-bottom: 2em; +} + +#detail-notifications .warning, +#detail-notifications .pending, +#detail-notifications .error { + -moz-margin-start: 0; +} + +#detail-icon-container { + width: 64px; + -moz-margin-end: 10px; + margin-top: 6px; +} + +#detail-icon { + max-width: 64px; + max-height: 64px; +} + +#detail-summary { + margin-bottom: 2em; +} + +#detail-name-container { + font-size: 200%; +} + +#detail-screenshot { + -moz-margin-end: 2em; + max-width: 300px; + max-height: 300px; +} + +#detail-screenshot[loading] { + background-image: url("chrome://global/skin/icons/loading_16.png"), + linear-gradient(rgba(255, 255, 255, 0.5), transparent); + background-position: 50% 50%; + background-repeat: no-repeat; + border-radius: 3px; +} + +#detail-screenshot[loading="error"] { + background-image: url("chrome://global/skin/media/error.png"), + linear-gradient(rgba(255, 255, 255, 0.5), transparent); +} + +#detail-desc-container { + margin-bottom: 2em; +} + +#detail-desc, #detail-fulldesc { + -moz-margin-start: 6px; + /* This is necessary to fix layout issues with multi-line descriptions, see + bug 592712*/ + outline: solid transparent; + white-space: pre-wrap; + min-width: 10em; +} + +#detail-fulldesc { + margin-top: 1em; +} + +#detail-contributions { + border-radius: 5px; + border: 1px solid #D2DBE8; + margin-bottom: 2em; + padding: 1em; + background-color: #F3F7FB; +} + +#detail-contrib-description { + font-style: italic; + margin-bottom: 1em; + color: #373D48; +} + +#detail-contrib-suggested { + color: grey; + font-weight: bold; +} + +#detail-contrib-btn { + -moz-appearance: none; + color: #FFF; + border: 1px solid #3A4EEE; + border-radius: 3px; + list-style-image: url("chrome://mozapps/skin/extensions/heart.png"); + background-color: #2F73EF; + background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%, + rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1)); +} + +#detail-contrib-btn .button-box { + padding: 0 6px 1px 6px; +} + +#detail-contrib-btn .button-icon { + -moz-margin-end: 3px; +} + +#detail-contrib-btn:not(:active):hover { + border-color: #4271FF; + background-color: #0459F7; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1), + 0 0 3.5px hsl(190, 90%, 80%); + transition: background-color .4s ease-in, + border-color .3s ease-in, + box-shadow .3s ease-in; +} + +#detail-contrib-btn:active:hover { + background-color: #8FA1C1; + border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset, + 0 0 2px rgba(0, 0, 0, 0.4) inset, + 0 1px 0 rgba(255, 255, 255, 0.4); +} + +#detail-grid { + margin-bottom: 2em; +} + +#detail-grid > columns > column:first-child { + min-width: 15em; + max-width: 25em; +} + +.detail-row[first-row="true"], +.detail-row-complex[first-row="true"], +setting[first-row="true"] { + border-top: none; +} + +.detail-row, +.detail-row-complex, +setting { + border-top: 2px solid; + -moz-border-top-colors: rgba(28, 31, 37, 0.1) rgba(255, 255, 255, 0.1); + -moz-box-align: center; + min-height: 30px; +} + +#detail-controls { + margin-bottom: 1em; +} + +#detail-view[active="false"]:not([pending]):not([notification]) { + background-image: linear-gradient(rgba(135, 135, 135, 0.1), + rgba(135, 135, 135, 0)); +} + +setting[first-row="true"] { + margin-top: 2em; +} + +setting { + -moz-box-align: start; +} + +.preferences-alignment { + min-height: 30px; + -moz-box-align: center; +} + +.preferences-description { + font-size: 90.9%; + color: graytext; + margin-top: -2px; + -moz-margin-start: 2em; + white-space: pre-wrap; +} + +.preferences-description:empty { + display: none; +} + +setting[type="radio"] > radiogroup { + -moz-box-orient: horizontal; +} + +menulist { /* Fixes some styling inconsistencies */ + margin: 1px 5px 2px 5px; +} + +/*** creator ***/ + +.creator > label { + -moz-margin-start: 0; + -moz-margin-end: 0; +} + +.creator > .text-link { + margin-top: 1px; + margin-bottom: 1px; +} + + +/*** rating ***/ + +.meta-rating { + -moz-margin-end: 0; + padding-top: 2px; +} + .meta-rating > .star { list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png"); padding: 0 1px; @@ -40,3 +974,261 @@ .meta-rating > .star[on="true"] { list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); } + + +/*** download progress ***/ + +.download-progress { + background-color: rgba(151,152,153,.05); + background-image: linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0.47) 49%, + rgba(231, 232, 233, 0.45) 51%, rgba(225, 226, 229, 0.3)); + background-clip: padding-box; + border-radius: 3px; + border: 1px solid; + border-color: rgba(0, 0, 0, 0.12) rgba(0, 0, 0, 0.19) rgba(0, 0, 0, 0.38); + box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset, + 0 0 0 2px rgba(255, 255, 255, 0.1) inset; + width: 200px; + height: 21px; + margin: 0 8px; +} + +.download-progress[mode="undetermined"] { + border-color: #358942 #317F3D #2E773A; +} + +.download-progress[mode="undetermined"] .status-container { + padding: 0 2px; +} + +.download-progress .start-cap, +.download-progress[complete] .end-cap, +.download-progress[mode="undetermined"] .end-cap, +.download-progress .progress .progress-bar { + -moz-appearance: none; + background-image: linear-gradient(#92DDA0, #6FC483 49%, #5EB272 51%, #80CE91); + margin-top: -1px; + margin-bottom: -1px; + border: 1px solid; + border-color: #358942 #317F3D #2E773A; +} + +.download-progress .start-cap { + -moz-margin-start: -1px; + -moz-border-end-width: 0; +} + +.download-progress .end-cap { + -moz-margin-end: -1px; + -moz-border-start-width: 0px !important; +} + +.download-progress .progress .progress-bar { + border-left-width: 0; + border-right-width: 0; + min-height: 21px; +} + +.download-progress .progress { + -moz-appearance: none; + background-color: transparent; + padding: 0; + margin: 0; + border: none; +} + +.download-progress .start-cap, +.download-progress .end-cap { + width: 4px; +} + +.download-progress .start-cap:-moz-locale-dir(ltr), +.download-progress .end-cap:-moz-locale-dir(rtl) { + border-radius: 3px 0 0 3px; +} + +.download-progress .end-cap:-moz-locale-dir(ltr), +.download-progress .start-cap:-moz-locale-dir(rtl) { + border-radius: 0 3px 3px 0; +} + +.download-progress .cancel { + -moz-appearance: none; + background-color: rgba(255, 255, 255, 0.4); + border: 1px solid rgba(0, 0, 0, 0.4); + padding: 3px; + border-radius: 3px; + min-width: 0; + margin: 3px; +} + +.download-progress .cancel:hover { + background-color: rgba(255, 255, 255, 0.6); + border: 1px solid rgba(0, 0, 0, 0.8); +} + +.download-progress .cancel:active:hover { + box-shadow: inset rgba(0, 0, 0, 0.5) 1px 1px 2px; +} + +.download-progress .cancel .button-box { + padding: 0; + border: none; +} + +.download-progress .cancel .button-text { + display: none; +} + +.download-progress .cancel .button-icon { + -moz-margin-start: 0; +} + +.download-progress .cancel { + list-style-image: url('chrome://mozapps/skin/extensions/cancel.png'); +} + +.download-progress .status-container { + -moz-box-align: center; +} + +.download-progress .status { + text-shadow: #FFF 0 0 2px; +} + +/*** install status ***/ + +.install-status { + -moz-box-align: center; +} + + +/*** check for updates ***/ + +#updates-container { + -moz-box-align: center; +} + +#updates-container .button-link { + font-weight: bold; +} + +#updates-installed, +#updates-downloaded { + color: #00BB00; + font-weight: bold; +} + +#update-selected { + margin: 12px; +} + + +/*** buttons ***/ + +.addon-control[disabled="true"]:not(.no-auto-hide) { + display: none; +} + +.no-auto-hide .addon-control { + display: block !important; +} + +button.button-link { + -moz-appearance: none; + background: transparent; + border: none; + box-shadow: none; + text-decoration: underline; + color: #0066CC; + cursor: pointer; + min-width: 0; + margin: 0 6px; +} + +.text-link { + color: #3386D5; +} + +.button-link:hover, +.text-link:hover { + color: #3DA1FF; +} + +/* Needed to override normal button style from inContent.css */ +button.button-link:not([disabled="true"]):active:hover { + background: transparent; + border: none; + box-shadow: none; +} + +.header-button { + -moz-appearance: none; + padding: 1px 3px; + color: #444; + text-shadow: 0 0 3px white; + background: linear-gradient(rgba(251, 252, 253, 0.95), transparent 49%, + rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3)); + background-clip: padding-box; + border: 1px solid rgba(31, 64, 100, 0.4); + border-top-color: rgba(31, 64, 100, 0.3); + box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset, + 0 0 2px 1px rgba(255, 255, 255, 0.25) inset; +} + +%ifdef XP_WIN +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif + .header-button { + border-radius: 2.5px; + } +%ifdef XP_WIN +} +%endif + +.header-button[disabled="true"] { + opacity: 0.8; +} + +.header-button[disabled="true"] > .toolbarbutton-icon { + opacity: 0.4; +} + +.header-button:not([disabled="true"]):active:hover, +.header-button[open="true"] { + background-color: rgba(61, 76, 92, 0.2); + border-color: rgba(39, 53, 68, 0.5); + box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset; +} + +.header-button > .toolbarbutton-text { + display: none; +} + +/*** telemetry experiments ***/ + +#detail-experiment-container { + font-size: 80%; + margin-bottom: 1em; +} + +#detail-experiment-bullet-container, +#detail-experiment-state, +#detail-experiment-time, +.experiment-bullet-container, +.experiment-state, +.experiment-time { + vertical-align: middle; + display: inline-block; +} + +.addon .experiment-bullet, +#detail-experiment-bullet { + fill: rgb(158, 158, 158); +} + +.addon[active="true"] .experiment-bullet, +#detail-view[active="true"] #detail-experiment-bullet { + fill: rgb(106, 201, 20); +} diff --git a/toolkit/themes/windows/mozapps/extensions/navigation.png b/toolkit/themes/windows/mozapps/extensions/navigation.png Binary files differnew file mode 100644 index 000000000..8ff639127 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/navigation.png diff --git a/toolkit/themes/windows/mozapps/extensions/newaddon.css b/toolkit/themes/windows/mozapps/extensions/newaddon.css index edfba0ef5..b3c429ec7 100644 --- a/toolkit/themes/windows/mozapps/extensions/newaddon.css +++ b/toolkit/themes/windows/mozapps/extensions/newaddon.css @@ -2,4 +2,109 @@ * 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/extensions/newaddon.inc.css +@import url("chrome://global/skin/inContentUI.css"); + +#addon-page { + padding: 0; +} + +#addon-scrollbox { + overflow: auto; + -moz-box-orient: vertical; + -moz-box-flex: 1; +} + +#spacer-start { + -moz-box-flex: 1; +} + +#spacer-end { + -moz-box-flex: 3; +} + +#addon-container { + overflow: visible; + max-width: 600px; + margin: 20px; + padding: 30px 90px; +} + +#addon-info { + -moz-box-align: start; + margin: 25px 10px; +} + +#icon { + -moz-margin-end: 10px; + max-width: 64px; + max-height: 64px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); +} + +.addon-info[type="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +.addon-info[type="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +.addon-info[type="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +.addon-info[type="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#name { + font-size: 130%; +} + +#author { + color: GrayText; +} + +#location { + color: GrayText; +} + +#warning { + margin-bottom: 25px; + -moz-box-align: start; +} + +#warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + width: 16px; + height: 15px; + -moz-margin-end: 5px; +} + +#allow { + -moz-margin-start: 84px; + margin-bottom: 20px; +} + +#continuePanel, +#restartPanel { + margin-top: 25px; + -moz-box-pack: end; + -moz-box-align: center; +} + +#continuePanel { + -moz-box-pack: end; +} + +#restartMessage { + text-align: right; +} + +#restartSpacer { + -moz-box-flex: 1; +} + +#later { + color: GrayText; +} diff --git a/toolkit/themes/windows/mozapps/extensions/selectAddons.css b/toolkit/themes/windows/mozapps/extensions/selectAddons.css new file mode 100644 index 000000000..e15ca9c72 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/selectAddons.css @@ -0,0 +1,185 @@ +/* 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/. */ + +#view-deck { + background: Window; +} + +.heading { + font-size: 270%; + text-align: center; + margin: 0 120px; +} + +.progress { + margin: 10px 128px; +} + +.progress-label, +#errors-description { + text-align: center; + margin: 0 10px; +} + +#checking-heading, +#update-heading, +#errors-heading { + margin-top: 90px; +} + +#select-heading, +#confirm-heading { + margin-top: 10px; + margin-bottom: 10px; + text-align: center; +} + +#select-description, +#confirm-description { + margin: 10px; +} + +#select-list { + border-top: 1px solid #D6E5F5; + background-color: Window; +} + +#select-grid column { + -moz-box-align: center; +} + +#select-grid row { + -moz-box-align: stretch; +} + +#select-grid label { + margin-top: 0; + margin-bottom: 0; +} + +.select-cell { + -moz-box-align: center; + -moz-box-pack: start; +} + +#select-header .select-cell { + box-sizing: border-box; +} + +#select-header .select-keep, +#select-header .select-icon, +#select-header .select-name, +#select-header .select-action { + background-image: linear-gradient(#D6E5F5 0%, Window 100%); + background-size: 1px 100%; + background-position: right; + background-repeat: no-repeat; +} + +.select-keep { + -moz-box-pack: center; +} + +.select-icon { + width: 20px; +} + +.select-keep .addon-keep-checkbox { + margin: 0; + padding: 0; + width: 13px; +} + +.select-keep .addon-keep-checkbox:-moz-focusring { + outline: 1px dotted ThreeDDarkShadow; +} + +.select-keep .checkbox-label-box { + display: none; +} + +.addon-name, +.addon-action-message, +.addon-action-update { + box-sizing: border-box; + margin: 0; + padding-top: 1px; + padding-bottom: 2px; + -moz-padding-start: 6px; + -moz-padding-end: 5px; +} + +#select-grid separator { + border-top: 1px solid #D6E5F5; + height: 0; + margin-top: 0.4em; + margin-bottom: 0.4em; +} + +.addon:not([active]) .addon-name, +.addon:not([active]) .addon-action-message, +.addon:not([active]) .addon-action-update { + color: GrayText; +} + +.addon-icon { + height: 16px; + width: 16px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); +} + +.addon-icon[type="theme"] { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric-16.png"); +} + +.addon-icon[type="plugin"] { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); +} + +.addon-icon[type="dictionary"] { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png"); +} + +.action-list { + margin-top: 10px; + -moz-margin-start: 5em; +} + +.action-header { + margin-bottom: 10px; +} + +#confirm .addon { + -moz-margin-start: 3em; + -moz-box-align: center; +} + +.addon:not([active]) .addon-icon, +#disable-list .addon-icon, +#incompatible-list .addon-icon { + filter: grayscale(1); +} + +#footer { + padding: 15px 12px; +} + +.progress-label, +#footer-label { + color: GrayText; +} + +%ifdef XP_WIN +.progress-label, +#footer-label { + font-style: italic; +} + +@media (-moz-windows-default-theme) { + #footer { + background-color: #f1f5fb; + box-shadow: 0px 1px 2px rgb(204,214,234) inset; + } +} +%endif diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-error.png b/toolkit/themes/windows/mozapps/extensions/stripes-error.png Binary files differnew file mode 100644 index 000000000..1dc2d8504 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/stripes-error.png diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png b/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png Binary files differnew file mode 100644 index 000000000..901ab1ec2 --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png b/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png Binary files differnew file mode 100644 index 000000000..370ceec0f --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-warning.png b/toolkit/themes/windows/mozapps/extensions/stripes-warning.png Binary files differnew file mode 100644 index 000000000..69463fb1a --- /dev/null +++ b/toolkit/themes/windows/mozapps/extensions/stripes-warning.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png b/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png Binary files differdeleted file mode 100644 index 16d77a4a2..000000000 --- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/extensions/update.css b/toolkit/themes/windows/mozapps/extensions/update.css index 0db179330..d35438ac9 100644 --- a/toolkit/themes/windows/mozapps/extensions/update.css +++ b/toolkit/themes/windows/mozapps/extensions/update.css @@ -2,20 +2,18 @@ * 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/. */ +#alert { + list-style-image: url("chrome://mozapps/skin/update/update.png"); +} + .throbber { - list-style-image: url("chrome://global/skin/icons/loading.png"); + list-style-image: url("chrome://global/skin/icons/loading_16.png"); width: 16px; height: 16px; margin-top: 5px; margin-bottom: 5px; - margin-inline-start: 5px; - margin-inline-end: 2px; -} - -@media (min-resolution: 1.1dppx) { - .throbber { - list-style-image: url("chrome://global/skin/icons/loading@2x.png"); - } + -moz-margin-start: 5px; + -moz-margin-end: 2px; } .alertBox { diff --git a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css index 42db4cd4d..d038e1abf 100644 --- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css +++ b/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css @@ -20,7 +20,7 @@ } #itemWarningIntro { - margin-inline-start: 8px; + -moz-margin-start: 8px; } #dialogContentBox { @@ -30,8 +30,8 @@ installitem { padding-top: 5px; padding-bottom: 5px; - padding-inline-start: 5px; - padding-inline-end: 0; + -moz-padding-start: 5px; + -moz-padding-end: 0; border-bottom: 1px dotted #C0C0C0; margin-bottom: 5px; } @@ -42,7 +42,7 @@ installitem { width: 48px; height: 48px; %endif - margin-inline-end: 20px; + -moz-margin-end: 20px; } .warning { @@ -54,7 +54,7 @@ installitem { .xpinstallIconContainer { width: 32px; height: 32px; - margin-inline-end: 5px; + -moz-margin-end: 5px; } .xpinstallItemName { @@ -74,14 +74,14 @@ installitem { color: -moz-FieldText; margin-top: 1px; margin-bottom: 1px; - margin-inline-start: 6px; - margin-inline-end: 5px; + -moz-margin-start: 6px; + -moz-margin-end: 5px; } .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } installitem[type="theme"] .xpinstallItemIcon { diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 9cf4acda3..0d77a4e79 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -6,60 +6,81 @@ toolkit.jar: #include ../../shared/mozapps.inc.mn skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) +#else + skin/classic/mozapps/extensions/about.css (extensions/about.css) + skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) * skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) +* skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) + skin/classic/mozapps/extensions/update.css (extensions/update.css) skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) + skin/classic/mozapps/extensions/category-languages.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png) + skin/classic/mozapps/extensions/category-extensions.png (extensions/extensionGeneric.png) + skin/classic/mozapps/extensions/category-themes.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) + skin/classic/mozapps/extensions/category-dictionaries.png (extensions/dictionaryGeneric.png) skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) + skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) + skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/extensionGeneric-48.png (extensions/extensionGeneric-48.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/experimentGeneric.png (extensions/experimentGeneric.png) skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png) + skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) skin/classic/mozapps/extensions/heart.png (extensions/heart.png) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) + skin/classic/mozapps/extensions/navigation.png (extensions/navigation.png) + skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png) + skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png) + skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png) + skin/classic/mozapps/extensions/stripes-info-negative.png (extensions/stripes-info-negative.png) + skin/classic/mozapps/extensions/alerticon-warning.png (extensions/alerticon-warning.png) + skin/classic/mozapps/extensions/alerticon-error.png (extensions/alerticon-error.png) + skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png) + skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png) + skin/classic/mozapps/extensions/eula.css (extensions/eula.css) + skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) +* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric.png) +#endif + skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png) + skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) + skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) + skin/classic/mozapps/plugins/pluginGeneric-48.png (plugins/pluginGeneric-48.png) skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) - skin/classic/mozapps/downloads/downloadButtons-XP.png (downloads/downloadButtons-XP.png) - skin/classic/mozapps/downloads/downloadIcon-XP.png (downloads/downloadIcon-XP.png) - skin/classic/mozapps/extensions/category-discover-XP.png (extensions/category-discover-XP.png) - skin/classic/mozapps/extensions/category-plugins-XP.png (extensions/category-plugins-XP.png) - skin/classic/mozapps/extensions/category-recent-XP.png (extensions/category-recent-XP.png) - skin/classic/mozapps/extensions/category-available-XP.png (extensions/category-available-XP.png) - skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png) - skin/classic/mozapps/extensions/themeGeneric-XP.png (extensions/themeGeneric-XP.png) - skin/classic/mozapps/extensions/themeGeneric-16-XP.png (extensions/themeGeneric-16-XP.png) - skin/classic/mozapps/extensions/localeGeneric-XP.png (extensions/localeGeneric-XP.png) - skin/classic/mozapps/plugins/pluginGeneric-XP.png (plugins/pluginGeneric-XP.png) - skin/classic/mozapps/plugins/pluginBlocked-XP.png (plugins/pluginBlocked-XP.png) - skin/classic/mozapps/plugins/pluginGeneric-16-XP.png (plugins/pluginGeneric-16-XP.png) - skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png) - skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png) -#if MOZ_BUILD_APP == browser +#ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif -% override chrome://mozapps/skin/downloads/downloadButtons.png chrome://mozapps/skin/downloads/downloadButtons-XP.png osversion<6 -% override chrome://mozapps/skin/downloads/downloadIcon.png chrome://mozapps/skin/downloads/downloadIcon-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-discover.png chrome://mozapps/skin/extensions/category-discover-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-plugins.png chrome://mozapps/skin/extensions/category-plugins-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-recent.png chrome://mozapps/skin/extensions/category-recent-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-available.png chrome://mozapps/skin/extensions/category-available-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/extensionGeneric-16.png chrome://mozapps/skin/extensions/extensionGeneric-16-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/themeGeneric.png chrome://mozapps/skin/extensions/themeGeneric-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/themeGeneric-16.png chrome://mozapps/skin/extensions/themeGeneric-16-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/localeGeneric.png chrome://mozapps/skin/extensions/localeGeneric-XP.png osversion<6 -% override chrome://mozapps/skin/plugins/pluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-XP.png osversion<6 -% override chrome://mozapps/skin/plugins/pluginBlocked.png chrome://mozapps/skin/plugins/pluginBlocked-XP.png osversion<6 -% override chrome://mozapps/skin/plugins/pluginGeneric-16.png chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png osversion<6 -% override chrome://mozapps/skin/profile/profileicon.png chrome://mozapps/skin/profile/profileicon-XP.png osversion<6 -% override chrome://mozapps/skin/update/downloadButtons.png chrome://mozapps/skin/update/downloadButtons-XP.png osversion<6 diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key-16.png b/toolkit/themes/windows/mozapps/passwordmgr/key-16.png Binary files differnew file mode 100644 index 000000000..ac135b847 --- /dev/null +++ b/toolkit/themes/windows/mozapps/passwordmgr/key-16.png diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key-64.png b/toolkit/themes/windows/mozapps/passwordmgr/key-64.png Binary files differnew file mode 100644 index 000000000..0fb69f382 --- /dev/null +++ b/toolkit/themes/windows/mozapps/passwordmgr/key-64.png diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key.png b/toolkit/themes/windows/mozapps/passwordmgr/key.png Binary files differnew file mode 100644 index 000000000..b5e8afefc --- /dev/null +++ b/toolkit/themes/windows/mozapps/passwordmgr/key.png diff --git a/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png Binary files differdeleted file mode 100644 index 954036c1f..000000000 --- a/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png Binary files differdeleted file mode 100644 index d6dffb29b..000000000 --- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png Binary files differindex 5d796cc4c..080b0e502 100644 --- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png +++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png Binary files differnew file mode 100644 index 000000000..173679448 --- /dev/null +++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png Binary files differdeleted file mode 100644 index 3e6d43c9a..000000000 --- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png Binary files differindex d8b270ae5..1fcbf154e 100644 --- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png +++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png diff --git a/toolkit/themes/windows/mozapps/profile/profileicon-XP.png b/toolkit/themes/windows/mozapps/profile/profileicon-XP.png Binary files differdeleted file mode 100644 index 0854ee177..000000000 --- a/toolkit/themes/windows/mozapps/profile/profileicon-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png b/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png Binary files differdeleted file mode 100644 index d36385ce5..000000000 --- a/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png +++ /dev/null diff --git a/toolkit/themes/windows/mozapps/webextensions/about.css b/toolkit/themes/windows/mozapps/webextensions/about.css new file mode 100644 index 000000000..19eaddca8 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/about.css @@ -0,0 +1,91 @@ +/* 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/. */ + +#genericAbout { + padding: 0px; + min-height: 200px; + max-height: 400px; + width: 30em; +} + +#clientBox { + background-color: -moz-Dialog; + color: -moz-DialogText; +} + +@media (-moz-windows-compositor) { + #genericAbout { + -moz-appearance: -moz-win-glass; + background: transparent; + } + + #clientBox { + -moz-appearance: -moz-win-exclude-glass; + } +} + + +.basic-info { + padding: 10px; +} + +#extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 64px; + max-height: 64px; + margin-inline-end: 6px; +} + +#genericAbout[addontype="theme"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +#genericAbout[addontype="locale"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +#genericAbout[addontype="plugin"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +#genericAbout[addontype="dictionary"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#extensionName { + font-size: 200%; + font-weight: bolder; +} + +#extensionVersion { + font-weight: bold; +} + +#extensionDescription { + margin-top: 4px; +} + +#groove { + margin-top: 8px; +} + +#extensionDetailsBox { + overflow: auto; + min-height: 100px; +} + +.boxIndent { + margin-inline-start: 18px; +} + +#extensionCreator, .contributor { + margin: 0px; +} + +.sectionTitle { + padding: 2px 0px 3px 0px; + margin-top: 3px; + font-weight: bold; +} + diff --git a/toolkit/themes/windows/mozapps/webextensions/blocklist.css b/toolkit/themes/windows/mozapps/webextensions/blocklist.css new file mode 100644 index 000000000..1cdbb35ac --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/blocklist.css @@ -0,0 +1,20 @@ +/* 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/. */ + +richlistitem { + padding-top: 6px; + padding-bottom: 6px; + padding-inline-start: 7px; + padding-inline-end: 7px; + border-bottom: 1px solid #C0C0C0; +} + +.addonName { + font-weight: bold; +} + +.blockedLabel { + font-weight: bold; + font-style: italic; +} diff --git a/toolkit/themes/windows/mozapps/webextensions/cancel.png b/toolkit/themes/windows/mozapps/webextensions/cancel.png Binary files differnew file mode 100644 index 000000000..0d98ab235 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/cancel.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-available.png b/toolkit/themes/windows/mozapps/webextensions/category-available.png Binary files differnew file mode 100644 index 000000000..9341f2aa7 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-discover.png b/toolkit/themes/windows/mozapps/webextensions/category-discover.png Binary files differnew file mode 100644 index 000000000..af954a613 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-plugins.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png Binary files differnew file mode 100644 index 000000000..100a90307 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-recent.png b/toolkit/themes/windows/mozapps/webextensions/category-recent.png Binary files differnew file mode 100644 index 000000000..d65158646 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-search.png b/toolkit/themes/windows/mozapps/webextensions/category-search.png Binary files differnew file mode 100644 index 000000000..52e91a7ce --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/windows/mozapps/webextensions/category-service.png b/toolkit/themes/windows/mozapps/webextensions/category-service.png Binary files differnew file mode 100644 index 000000000..997c8541c --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png Binary files differnew file mode 100644 index 000000000..37e2a5e4c --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png Binary files differnew file mode 100644 index 000000000..b26bb7100 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/windows/mozapps/webextensions/discover-logo.png b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png Binary files differnew file mode 100644 index 000000000..cd50735a8 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png diff --git a/toolkit/themes/windows/mozapps/webextensions/eula.css b/toolkit/themes/windows/mozapps/webextensions/eula.css new file mode 100644 index 000000000..05aeb3c1c --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/eula.css @@ -0,0 +1,47 @@ +/* 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/. */ + +#icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 48px; + max-height: 48px; + margin-inline-end: 6px; +} + +#eula-dialog[addontype="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +#eula-dialog[addontype="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +#eula-dialog[addontype="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +#eula-dialog[addontype="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#heading-container { + -moz-box-align: center; +} + +#heading { + font-size: 120%; +} + +#eula { + -moz-appearance: none; + color: -moz-FieldText; + background-color: -moz-Field; + margin: 1em; + border: 1px solid; + -moz-border-top-colors: ActiveBorder; + -moz-border-right-colors: ActiveBorder; + -moz-border-bottom-colors: ActiveBorder; + -moz-border-left-colors: ActiveBorder; +} + diff --git a/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png Binary files differnew file mode 100644 index 000000000..a9d00545e --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png diff --git a/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png Binary files differnew file mode 100644 index 000000000..2724b9e7c --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/webextensions/extensions.css b/toolkit/themes/windows/mozapps/webextensions/extensions.css new file mode 100644 index 000000000..7c4aed05e --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/extensions.css @@ -0,0 +1,42 @@ +/* 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/webextensions/extensions.inc.css + +#header-utils-btn { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); + margin-inline-end: 16px; +} + +@media not all and (-moz-windows-default-theme) { + #header-utils-btn { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); + } +} + +.sorter[checkState="1"] { + list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); +} + +.sorter[checkState="2"] { + list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); +} + +.addon .relnotes-toggle { + -moz-box-direction: reverse; + list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); +} + +.addon[show-relnotes] .relnotes-toggle { + list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); +} + +.meta-rating > .star { + list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png"); + padding: 0 1px; +} + +.meta-rating > .star[on="true"] { + list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); +} diff --git a/toolkit/themes/windows/mozapps/webextensions/heart.png b/toolkit/themes/windows/mozapps/webextensions/heart.png Binary files differnew file mode 100644 index 000000000..655f4c4be --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/heart.png diff --git a/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png Binary files differnew file mode 100644 index 000000000..623ba3a6a --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/windows/mozapps/webextensions/newaddon.css b/toolkit/themes/windows/mozapps/webextensions/newaddon.css new file mode 100644 index 000000000..5856c08b5 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/newaddon.css @@ -0,0 +1,5 @@ +/* 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/webextensions/newaddon.inc.css diff --git a/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png Binary files differnew file mode 100644 index 000000000..2761f1925 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png diff --git a/toolkit/themes/windows/mozapps/webextensions/rating-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-won.png Binary files differnew file mode 100644 index 000000000..336dd8f6e --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/rating-won.png diff --git a/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png Binary files differnew file mode 100644 index 000000000..ff13ce37f --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png Binary files differnew file mode 100644 index 000000000..9cea549dd --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/windows/mozapps/webextensions/update.css b/toolkit/themes/windows/mozapps/webextensions/update.css new file mode 100644 index 000000000..0db179330 --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/update.css @@ -0,0 +1,28 @@ +/* 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/. */ + +.throbber { + list-style-image: url("chrome://global/skin/icons/loading.png"); + width: 16px; + height: 16px; + margin-top: 5px; + margin-bottom: 5px; + margin-inline-start: 5px; + margin-inline-end: 2px; +} + +@media (min-resolution: 1.1dppx) { + .throbber { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } +} + +.alertBox { + background-color: InfoBackground; + color: InfoText; + border: 1px outset InfoBackground; + margin-left: 3px; + margin-right: 3px; + padding: 5px; +} diff --git a/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css new file mode 100644 index 000000000..42db4cd4d --- /dev/null +++ b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css @@ -0,0 +1,101 @@ +/* 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/. */ + +#xpinstallheader { + margin-bottom: 2em; +} + +#itemList { + -moz-appearance: listbox; + margin: 3px 4px 10px 4px; + height: 14em; + border: 2px solid; + -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; + -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; + background-color: -moz-Field; + color: -moz-FieldText; +} + +#itemWarningIntro { + margin-inline-start: 8px; +} + +#dialogContentBox { + padding: 5px; +} + +installitem { + padding-top: 5px; + padding-bottom: 5px; + padding-inline-start: 5px; + padding-inline-end: 0; + border-bottom: 1px dotted #C0C0C0; + margin-bottom: 5px; +} + +.alert-icon { +%ifdef XP_WIN + list-style-image: url("chrome://global/skin/icons/warning-large.png"); + width: 48px; + height: 48px; +%endif + margin-inline-end: 20px; +} + +.warning { + font-weight: bold; + font-size: 1.25em; + margin-bottom: 1em; +} + +.xpinstallIconContainer { + width: 32px; + height: 32px; + margin-inline-end: 5px; +} + +.xpinstallItemName { + font-weight: bold; +} + +.xpinstallItemSigned { + font-style: italic; + font-size: 0.9em; +} + +.xpinstallItemURL { + -moz-appearance: none; + border: none; + padding: 0; + background-color: -moz-Field; + color: -moz-FieldText; + margin-top: 1px; + margin-bottom: 1px; + margin-inline-start: 6px; + margin-inline-end: 5px; +} + +.xpinstallItemIcon { + max-width: 32px; + max-height: 32px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); +} + +installitem[type="theme"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +installitem[type="locale"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +installitem[type="plugin"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +installitem[type="dictionary"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} |
