Bug 1681083 - Make the newmail alert dark with dark themes. r=aleca

This commit is contained in:
Richard Marti 2020-12-08 12:57:52 +02:00
Родитель e9812f26f2
Коммит 40bd5d104a
8 изменённых файлов: 43 добавлений и 53 удалений

Просмотреть файл

@ -44,7 +44,6 @@ classic.jar:
skin/classic/messenger/multimessageview.css (mail/multimessageview.css)
skin/classic/messenger/glodaFacetView.css (mail/glodaFacetView.css)
skin/classic/messenger/dialogs.css (mail/dialogs.css)
skin/classic/messenger/newmailalert.css (mail/newmailalert.css)
skin/classic/messenger/tabmail.css (mail/tabmail.css)
skin/classic/messenger/themeableDialog.css (mail/themeableDialog.css)
skin/classic/messenger/editContactPanel.css (mail/editContactPanel.css)
@ -82,7 +81,6 @@ classic.jar:
skin/classic/messenger/icons/identity.png (mail/icons/identity.png)
skin/classic/messenger/icons/error.png (mail/icons/error.png)
skin/classic/messenger/icons/multicolor.png (mail/icons/multicolor.png)
skin/classic/messenger/icons/close-button.png (mail/icons/close-button.png)
skin/classic/messenger/icons/arrow/arrow-left.png (mail/icons/arrow/arrow-left.png)
skin/classic/messenger/icons/arrow/arrow-right.png (mail/icons/arrow/arrow-right.png)
skin/classic/messenger/icons/arrow/arrow-up.png (mail/icons/arrow/arrow-up.png)

Двоичные данные
mail/themes/linux/mail/icons/close-button.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 1.4 KiB

Просмотреть файл

@ -1,22 +0,0 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* 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/. */
@import url("chrome://messenger/skin/shared/newmailalert.css");
#closeButton {
list-style-image: url("chrome://messenger/skin/icons/close-button.png");
-moz-image-region: rect(0px, 16px, 16px, 0px);
appearance: none;
border: none !important;
padding: 2px;
}
#closeButton:hover {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
#closeButton:hover:active {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}

Просмотреть файл

@ -15,6 +15,9 @@
skin/classic/messenger/folderProps.css (../shared/mail/folderProps.css)
skin/classic/messenger/messageQuotes.css (../shared/mail/messageQuotes.css)
skin/classic/messenger/msgSelectOffline.css (../shared/mail/msgSelectOffline.css)
#ifndef XP_MACOSX
skin/classic/messenger/newmailalert.css (../shared/mail/newmailalert.css)
#endif
skin/classic/messenger/subscribe.css (../shared/mail/subscribe.css)
skin/classic/messenger/tagColors.css (../shared/mail/tagColors.css)
skin/classic/messenger/addressbook/abResultsPane.css (../shared/mail/abResultsPane.css)
@ -244,9 +247,6 @@
skin/classic/messenger/shared/grid-layout.css (../shared/mail/grid-layout.css)
skin/classic/messenger/shared/input-fields.css (../shared/mail/input-fields.css)
skin/classic/messenger/messengercompose/format-dropmarker.svg (../shared/mail/icons/format-dropmarker.svg)
#ifndef XP_MACOSX
skin/classic/messenger/shared/newmailalert.css (../shared/mail/newmailalert.css)
#endif
skin/classic/messenger/images/account-watermark.png (../shared/mail/images/account-watermark.png)
skin/classic/messenger/images/account-watermark-light.png (../shared/mail/images/account-watermark-light.png)
skin/classic/messenger/openpgp/attach-active-18.svg (../shared/openpgp/attach-active-18.svg)

Просмотреть файл

@ -16,11 +16,19 @@
border: 1px solid threedshadow;
border-radius: 3px;
background-color: -moz-Dialog;
color: -moz-DialogText;
}
@media (prefers-color-scheme: dark) {
#newMailAlertNotification {
background-color: #2a2a2e;
color: #f9f9fa;
}
}
#alertImageBox {
padding: 4px;
background-image: linear-gradient(rgba(255, 255, 255, .7),
background-image: linear-gradient(rgba(255, 255, 255, .6),
rgba(255, 255, 255, .6));
border-inline-end: 1px solid rgba(0, 0, 0, .1);
}
@ -29,11 +37,17 @@
list-style-image: url("chrome://branding/content/icon64.png");
}
@media (min-resolution: 1.1dppx) {
#alertImage {
list-style-image: url("chrome://branding/content/icon128.png");
width: 64px;
height: 64px;
}
}
#alertTextBox {
padding: 4px;
padding-inline-end: 25px;
background-image: linear-gradient(rgba(255, 255, 255, .2),
rgba(255, 255, 255, .1));
}
#alertTitle {
@ -43,8 +57,17 @@
padding-inline-end: 5px;
}
#alertGroove {
#alertSeparator {
margin-inline-start: 11px;
border-top: 1px solid -moz-DialogText;
height: 0;
margin-block: 0.4em;
}
@media (prefers-color-scheme: dark) {
#alertSeparator {
border-top-color: #f9f9fa;
}
}
folder-summary {
@ -91,6 +114,5 @@ folder-summary {
}
#closeButton {
justify-self: end;
align-self: start;
-moz-box-align: start;
}

Просмотреть файл

@ -44,7 +44,6 @@ classic.jar:
skin/classic/messenger/dialogs.css (mail/dialogs.css)
skin/classic/messenger/multimessageview.css (mail/multimessageview.css)
skin/classic/messenger/glodaFacetView.css (mail/glodaFacetView.css)
skin/classic/messenger/newmailalert.css (mail/newmailalert.css)
skin/classic/messenger/tabmail.css (mail/tabmail.css)
skin/classic/messenger/themeableDialog.css (mail/themeableDialog.css)
skin/classic/messenger/editContactPanel.css (mail/editContactPanel.css)

Просмотреть файл

@ -1,6 +0,0 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* 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/. */
@import url("chrome://messenger/skin/shared/newmailalert.css");

Просмотреть файл

@ -8,7 +8,8 @@
<?xml-stylesheet href="chrome://messenger/skin/newmailalert.css" type="text/css"?>
<window id="newMailAlertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
windowtype="alert:alert"
role="alert"
align="start"
@ -17,19 +18,17 @@
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<script src="chrome://messenger/content/newmailalert.js"/>
<stack id="alertContainer">
<hbox id="alertBox">
<hbox id ="alertImageBox" align="center" pack="center">
<image id="alertImage"/>
</hbox>
<vbox id="alertTextBox">
<label id="alertTitle"/>
<separator id="alertGroove" class="groove"/>
<folder-summary id="folderSummaryInfo"/>
</vbox>
<hbox id="alertContainer">
<hbox id ="alertImageBox" align="center" pack="center">
<image id="alertImage"/>
</hbox>
<vbox id="alertTextBox">
<label id="alertTitle"/>
<separator id="alertSeparator"/>
<folder-summary id="folderSummaryInfo"/>
</vbox>
<toolbarbutton id="closeButton" class="close-icon" onclick="closeAlert();"/>
</stack>
</hbox>
</window>