зеркало из https://github.com/mozilla/gecko-dev.git
Bug 822258 - Add winstripe theming for the new Downloads view in Places. r=mak.
This commit is contained in:
Родитель
ecec5b899d
Коммит
25f417dab5
|
@ -0,0 +1,35 @@
|
||||||
|
/* 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/. */
|
||||||
|
|
||||||
|
%define WINSTRIPE_AERO
|
||||||
|
%include allDownloadsViewOverlay.css
|
||||||
|
%undef WINSTRIPE_AERO
|
||||||
|
|
||||||
|
@media (-moz-windows-default-theme) {
|
||||||
|
/*
|
||||||
|
-moz-appearance: menuitem is almost right, but the hover effect is not
|
||||||
|
transparent and is lighter than desired.
|
||||||
|
|
||||||
|
Copied from the autocomplete richlistbox styling in
|
||||||
|
toolkit/themes/winstripe/global/autocomplete.css
|
||||||
|
|
||||||
|
This styling should be kept in sync with the style from the above file.
|
||||||
|
*/
|
||||||
|
#downloadsRichListBox > richlistitem.download[selected] {
|
||||||
|
color: inherit;
|
||||||
|
background-color: transparent;
|
||||||
|
/* four gradients for the bevel highlights on each edge, one for blue background */
|
||||||
|
background-image:
|
||||||
|
-moz-linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, rgba(255,255,255,0) 3px),
|
||||||
|
-moz-linear-gradient(to right, rgba(255,255,255,0.5) 3px, rgba(255,255,255,0) 3px),
|
||||||
|
-moz-linear-gradient(to left, rgba(255,255,255,0.5) 3px, rgba(255,255,255,0) 3px),
|
||||||
|
-moz-linear-gradient(to top, rgba(255,255,255,0.4) 3px, rgba(255,255,255,0) 3px),
|
||||||
|
-moz-linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
|
||||||
|
background-clip: content-box;
|
||||||
|
border-radius: 6px;
|
||||||
|
outline: 1px solid rgb(124,163,206);
|
||||||
|
-moz-outline-radius: 3px;
|
||||||
|
outline-offset: -2px;
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,100 +2,23 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
* 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/. */
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
/*** Panel and outer controls ***/
|
#downloadsRichListBox {
|
||||||
|
-moz-appearance: none;
|
||||||
#downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsListBox {
|
|
||||||
background-color: transparent;
|
|
||||||
padding: 4px;
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsPanel:not([hasdownloads]) > #downloadsListBox {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsHistory {
|
|
||||||
background: transparent;
|
|
||||||
color: -moz-nativehyperlinktext;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsHistory > .button-box {
|
|
||||||
margin: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (-moz-windows-default-theme) {
|
|
||||||
#downloadsPanel[hasdownloads] > #downloadsFooter {
|
|
||||||
%ifdef WINSTRIPE_AERO
|
|
||||||
background-color: #f1f5fb;
|
|
||||||
%else
|
|
||||||
background-color: hsla(216,45%,88%,.98);
|
|
||||||
%endif
|
|
||||||
box-shadow: 0px 1px 2px rgb(204,214,234) inset;
|
|
||||||
border-bottom-left-radius: 3px;
|
|
||||||
border-bottom-right-radius: 3px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Downloads Summary and List items ***/
|
|
||||||
|
|
||||||
#downloadsSummary,
|
|
||||||
richlistitem[type="download"] {
|
|
||||||
height: 7em;
|
|
||||||
-moz-padding-end: 0;
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsSummary {
|
|
||||||
padding: 8px 38px 8px 12px;
|
|
||||||
cursor: pointer;
|
|
||||||
-moz-user-focus: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsSummary:-moz-focusring {
|
|
||||||
outline: 1px -moz-dialogtext dotted;
|
|
||||||
outline-offset: -5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsSummary > .downloadTypeIcon {
|
|
||||||
height: 24px;
|
|
||||||
width: 24px;
|
|
||||||
list-style-image: url("chrome://mozapps/skin/downloads/downloadIcon.png");
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsSummaryDescription {
|
|
||||||
color: -moz-nativehyperlinktext;
|
|
||||||
}
|
|
||||||
|
|
||||||
richlistitem[type="download"] {
|
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-top: 1px solid hsla(0,0%,100%,.3);
|
|
||||||
border-bottom: 1px solid hsla(220,18%,51%,.25);
|
|
||||||
background: transparent;
|
|
||||||
padding: 8px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
richlistitem[type="download"]:first-child {
|
#downloadsRichListBox > richlistitem.download {
|
||||||
border-top: 1px solid transparent;
|
height: 6em;
|
||||||
}
|
%ifndef WINSTRIPE_AERO
|
||||||
|
padding: 5px 8px;
|
||||||
@media (-moz-windows-default-theme) {
|
%endif
|
||||||
richlistitem[type="download"]:last-child {
|
|
||||||
border-bottom: 1px solid transparent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloadsListBox:-moz-focusring > richlistitem[type="download"][selected] {
|
|
||||||
outline: 1px -moz-dialogtext dotted;
|
|
||||||
outline-offset: -1px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloadTypeIcon {
|
.downloadTypeIcon {
|
||||||
-moz-margin-end: 8px;
|
-moz-margin-end: 8px;
|
||||||
|
%ifdef WINSTRIPE_AERO
|
||||||
|
-moz-margin-start: 8px;
|
||||||
|
%endif
|
||||||
/* Prevent flickering when changing states. */
|
/* Prevent flickering when changing states. */
|
||||||
min-height: 32px;
|
min-height: 32px;
|
||||||
min-width: 32px;
|
min-width: 32px;
|
||||||
|
@ -106,214 +29,37 @@ richlistitem[type="download"]:first-child {
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloadTarget {
|
.downloadTarget {
|
||||||
margin-bottom: 6px;
|
margin-bottom: 3px;
|
||||||
cursor: inherit;
|
cursor: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloadDetails {
|
.downloadDetails {
|
||||||
opacity: 0.6;
|
opacity: 0.7;
|
||||||
font-size: 90%;
|
font-size: 95%;
|
||||||
cursor: inherit;
|
cursor: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloadButton {
|
.downloadButton {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
|
background: transparent;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
margin: 3px;
|
margin: 3px;
|
||||||
border: none;
|
border: none;
|
||||||
background: transparent;
|
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
list-style-image: url("chrome://browser/skin/downloads/buttons.png");
|
list-style-image: url("chrome://browser/skin/downloads/buttons.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloadButton > .button-box {
|
/*** Button icons ***/
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Highlighted list items ***/
|
|
||||||
|
|
||||||
richlistitem[type="download"][state="1"]:hover {
|
|
||||||
border-radius: 3px;
|
|
||||||
border-top: 1px solid hsla(0,0%,100%,.2);
|
|
||||||
border-bottom: 1px solid hsla(0,0%,0%,.2);
|
|
||||||
background-color: Highlight;
|
|
||||||
color: HighlightText;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Button icons ***/
|
|
||||||
|
|
||||||
.downloadButton.downloadCancel {
|
.downloadButton.downloadCancel {
|
||||||
-moz-image-region: rect(0px, 16px, 16px, 0px);
|
-moz-image-region: rect(0px, 16px, 16px, 0px);
|
||||||
}
|
}
|
||||||
.downloadButton.downloadCancel:hover {
|
|
||||||
-moz-image-region: rect(0px, 32px, 16px, 16px);
|
|
||||||
}
|
|
||||||
.downloadButton.downloadCancel:active {
|
|
||||||
-moz-image-region: rect(0px, 48px, 16px, 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.downloadButton.downloadShow {
|
.downloadButton.downloadShow {
|
||||||
-moz-image-region: rect(16px, 16px, 32px, 0px);
|
-moz-image-region: rect(16px, 16px, 32px, 0px);
|
||||||
}
|
}
|
||||||
.downloadButton.downloadShow:hover {
|
|
||||||
-moz-image-region: rect(16px, 32px, 32px, 16px);
|
|
||||||
}
|
|
||||||
.downloadButton.downloadShow:active {
|
|
||||||
-moz-image-region: rect(16px, 48px, 32px, 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.downloadButton.downloadRetry {
|
.downloadButton.downloadRetry {
|
||||||
-moz-image-region: rect(32px, 16px, 48px, 0px);
|
-moz-image-region: rect(32px, 16px, 48px, 0px);
|
||||||
}
|
}
|
||||||
.downloadButton.downloadRetry:hover {
|
|
||||||
-moz-image-region: rect(32px, 32px, 48px, 16px);
|
|
||||||
}
|
|
||||||
.downloadButton.downloadRetry:active {
|
|
||||||
-moz-image-region: rect(32px, 48px, 48px, 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
%ifdef WINSTRIPE_AERO
|
|
||||||
@media not all and (-moz-windows-default-theme) {
|
|
||||||
%endif
|
|
||||||
|
|
||||||
richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow {
|
|
||||||
-moz-image-region: rect(48px, 16px, 64px, 0px);
|
|
||||||
}
|
|
||||||
richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:hover {
|
|
||||||
-moz-image-region: rect(48px, 32px, 64px, 16px);
|
|
||||||
}
|
|
||||||
richlistitem[type="download"][state="1"]:hover > .downloadButton.downloadShow:active {
|
|
||||||
-moz-image-region: rect(48px, 48px, 64px, 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
%ifdef WINSTRIPE_AERO
|
|
||||||
}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
/*** Status and progress indicator ***/
|
|
||||||
|
|
||||||
#downloads-indicator-anchor {
|
|
||||||
/* Makes the outermost stack element positioned, so that its contents are
|
|
||||||
rendered over the main browser window in the Z order. This is required by
|
|
||||||
the animated event notification. */
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Main indicator icon ***/
|
|
||||||
|
|
||||||
#downloads-indicator-icon {
|
|
||||||
background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
|
|
||||||
0, 108, 18, 90) center no-repeat;
|
|
||||||
min-width: 18px;
|
|
||||||
min-height: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator-icon:-moz-lwtheme-brighttext {
|
|
||||||
background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
|
|
||||||
0, 108, 18, 90) center no-repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
|
|
||||||
background-image: url("chrome://browser/skin/downloads/download-glow.png");
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
|
|
||||||
background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
|
|
||||||
0, 108, 18, 90) center no-repeat;
|
|
||||||
background-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
|
|
||||||
background-image: url("chrome://browser/skin/downloads/download-glow.png");
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Event notification ***/
|
|
||||||
|
|
||||||
#downloads-indicator-notification {
|
|
||||||
opacity: 0;
|
|
||||||
background: url("chrome://browser/skin/downloads/download-notification.png")
|
|
||||||
center no-repeat;
|
|
||||||
background-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes downloadsIndicatorNotificationRight {
|
|
||||||
from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
|
|
||||||
20% { opacity: .85; animation-timing-function: ease-out; }
|
|
||||||
to { opacity: 0; transform: translate(0) scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes downloadsIndicatorNotificationLeft {
|
|
||||||
from { opacity: 0; transform: translate(128px, 128px) scale(8); }
|
|
||||||
20% { opacity: .85; animation-timing-function: ease-out; }
|
|
||||||
to { opacity: 0; transform: translate(0) scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator[notification] > #downloads-indicator-anchor > #downloads-indicator-notification {
|
|
||||||
animation-name: downloadsIndicatorNotificationRight;
|
|
||||||
animation-duration: 1s;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator[notification]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
|
|
||||||
animation-name: downloadsIndicatorNotificationLeft;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** Progress bar and text ***/
|
|
||||||
|
|
||||||
#downloads-indicator-counter {
|
|
||||||
height: 9px;
|
|
||||||
margin: -3px 0px 0px 0px;
|
|
||||||
color: hsl(0,0%,30%);
|
|
||||||
text-shadow: hsla(0,0%,100%,.5) 0 1px;
|
|
||||||
font-size: 9px;
|
|
||||||
line-height: 9px;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator-counter:-moz-lwtheme-brighttext {
|
|
||||||
color: white;
|
|
||||||
text-shadow: 0 0 1px rgba(0,0,0,.7),
|
|
||||||
0 1px 1.5px rgba(0,0,0,.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator-progress {
|
|
||||||
width: 16px;
|
|
||||||
height: 5px;
|
|
||||||
min-width: 0;
|
|
||||||
min-height: 0;
|
|
||||||
margin-top: 1px;
|
|
||||||
margin-bottom: 2px;
|
|
||||||
border-radius: 2px;
|
|
||||||
box-shadow: 0 1px 0 hsla(0,0%,100%,.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator-progress > .progress-bar {
|
|
||||||
-moz-appearance: none;
|
|
||||||
min-width: 0;
|
|
||||||
min-height: 0;
|
|
||||||
background-color: rgb(90, 201, 66);
|
|
||||||
background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px);
|
|
||||||
border: 1px solid;
|
|
||||||
border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
|
|
||||||
border-radius: 2px 0 0 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator-progress > .progress-remainder {
|
|
||||||
-moz-appearance: none;
|
|
||||||
min-width: 0;
|
|
||||||
min-height: 0;
|
|
||||||
background-image: linear-gradient(#505050, #575757);
|
|
||||||
border: 1px solid;
|
|
||||||
border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
|
|
||||||
-moz-border-start: none;
|
|
||||||
border-radius: 0 2px 2px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
|
|
||||||
background-color: rgb(220, 230, 81);
|
|
||||||
}
|
|
||||||
|
|
||||||
#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
|
|
||||||
background-image: linear-gradient(#4b5000, #515700);
|
|
||||||
}
|
|
||||||
|
|
|
@ -278,7 +278,7 @@ browser.jar:
|
||||||
skin/classic/aero/browser/downloads/download-glow.png (downloads/download-glow.png)
|
skin/classic/aero/browser/downloads/download-glow.png (downloads/download-glow.png)
|
||||||
skin/classic/aero/browser/downloads/download-notification.png (downloads/download-notification.png)
|
skin/classic/aero/browser/downloads/download-notification.png (downloads/download-notification.png)
|
||||||
* skin/classic/aero/browser/downloads/downloads.css (downloads/downloads-aero.css)
|
* skin/classic/aero/browser/downloads/downloads.css (downloads/downloads-aero.css)
|
||||||
skin/classic/aero/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
|
* skin/classic/aero/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay-aero.css)
|
||||||
skin/classic/aero/browser/feeds/feedIcon.png (feeds/feedIcon-aero.png)
|
skin/classic/aero/browser/feeds/feedIcon.png (feeds/feedIcon-aero.png)
|
||||||
skin/classic/aero/browser/feeds/feedIcon16.png (feeds/feedIcon16-aero.png)
|
skin/classic/aero/browser/feeds/feedIcon16.png (feeds/feedIcon16-aero.png)
|
||||||
skin/classic/aero/browser/feeds/audioFeedIcon.png (feeds/feedIcon-aero.png)
|
skin/classic/aero/browser/feeds/audioFeedIcon.png (feeds/feedIcon-aero.png)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче