Bug 1251835 - Override global/netError.css with our own netError styles. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Sat, 27 Feb 2016 14:16:31 +0100
changeset 19042 0cd048db58c2e2263e29416419885aad4880b9f7
parent 19041 afa056cc4fd9957381009e172a389d89d356d856
child 19043 8045b9718c6a6eed6036eebcb2f2d74ccddffa31
push id11692
push userrichard.marti@gmail.com
push dateFri, 04 Mar 2016 14:11:55 +0000
treeherdercomm-central@8045b9718c6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1251835
Bug 1251835 - Override global/netError.css with our own netError styles. r=mkmelin
mail/themes/linux/jar.mn
mail/themes/osx/jar.mn
mail/themes/shared/mail/aboutNetError.css
mail/themes/shared/mail/icons/blacklist.svg
mail/themes/shared/mail/icons/cert-error.svg
mail/themes/windows/jar.mn
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -24,16 +24,17 @@ classic.jar:
   skin/classic/messenger/voice.png                            (../../components/im/themes/voice.png)
   skin/classic/messenger/browserRequest.css                   (mail/browserRequest.css)
   skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
+  skin/classic/messenger/aboutNetError.css                    (../shared/mail/aboutNetError.css)
   skin/classic/messenger/messengerLWTheme.css                 (../shared/mail/messengerLWTheme.css)
   skin/classic/messenger/attachmentList.css                   (mail/attachmentList.css)
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/tagColors.css                        (mail/tagColors.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
@@ -142,16 +143,18 @@ classic.jar:
   skin/classic/messenger/icons/empty-search-results.png       (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/update.png                     (mail/icons/update.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/tick.png                       (mail/icons/tick.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
+  skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
+  skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-new-star.png            (mail/icons/folder-new-star.png)
   skin/classic/messenger/icons/message-list.png               (mail/icons/message-list.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png   (mail/icons/attachment-deleted-large.png)
@@ -262,8 +265,9 @@ classic.jar:
   skin/classic/messenger/sharedPlatform.css                   (mail/linuxShared.css)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/accountProvisioner.css         (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
 % override chrome://global/skin/icons/close.png               chrome://global/skin/icons/close.svg
+% override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 classic.jar:
 % skin messenger classic/1.0 %skin/classic/messenger/
   skin/classic/messenger/glodaFacetView.css                      (mail/glodaFacetView.css)
   skin/classic/messenger/multimessageview.css                    (mail/multimessageview.css)
   skin/classic/messenger/dialogs.css                             (mail/dialogs.css)
   skin/classic/messenger/messenger.css                           (mail/messenger.css)
+  skin/classic/messenger/aboutNetError.css                       (../shared/mail/aboutNetError.css)
   skin/classic/messenger/messengerLWTheme.css                    (../shared/mail/messengerLWTheme.css)
   skin/classic/messenger/primaryToolbar.css                      (mail/primaryToolbar.css)
   skin/classic/messenger/aboutSupport.css                        (../windows/mail/aboutSupport.css)
   skin/classic/messenger/accountCentral.css                      (mail/accountCentral.css)
   skin/classic/messenger/accountCreation.css                     (mail/accountCreation.css)
   skin/classic/messenger/accountManage.css                       (mail/accountManage.css)
   skin/classic/messenger/accountWizard.css                       (mail/accountWizard.css)
 * skin/classic/messenger/chat.css                                (mail/chat.css)
@@ -166,16 +167,18 @@ classic.jar:
   skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
   skin/classic/messenger/icons/folder-pane.png                   (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-pane@2x.png                (mail/icons/folder-pane@2x.png)
   skin/classic/messenger/icons/exclude.png                       (mail/icons/exclude.png)
   skin/classic/messenger/icons/exclude-selected.png              (mail/icons/exclude-selected.png)
   skin/classic/messenger/icons/group-background.gif              (mail/icons/group-background.gif)
   skin/classic/messenger/icons/junk-column-header.png            (mail/icons/junk-column-header.png)
+  skin/classic/messenger/icons/blacklist.svg                     (../shared/mail/icons/blacklist.svg)
+  skin/classic/messenger/icons/cert-error.svg                    (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/mail-toolbar.svg                  (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/message-mail-attach.png           (mail/icons/message-mail-attach.png)
   skin/classic/messenger/icons/message-mail-imapdelete.png       (mail/icons/message-mail-imapdelete.png)
   skin/classic/messenger/icons/message-mail-new.png              (mail/icons/message-mail-new.png)
   skin/classic/messenger/icons/message-mail.png                  (mail/icons/message-mail.png)
   skin/classic/messenger/icons/message-news-attach-offl.png      (mail/icons/message-news-attach-offl.png)
   skin/classic/messenger/icons/message-news-attach.png           (mail/icons/message-news-attach.png)
   skin/classic/messenger/icons/message-news-new-attach.png       (mail/icons/message-news-new-attach.png)
@@ -349,8 +352,9 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                      (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                      (mail/osxShared.css)
   skin/classic/messenger/shared/mailWindow1.css                  (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                    (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css                (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                      (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/addressbook.css                  (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css           (../shared/mail/accountProvisioner.css)
+% override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/aboutNetError.css
@@ -0,0 +1,136 @@
+/* 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://global/skin/in-content/common.css");
+
+body {
+  display: flex;
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding: 0 48px;
+  align-items: center;
+  justify-content: center;
+}
+
+ul, ol {
+  margin: 0;
+  padding: 0;
+  -moz-margin-start: 1em;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: disc;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 320px;
+  max-width: 512px;
+  margin-top: 2em;
+  margin-bottom: 2em;
+}
+
+#errorPageContainer:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+#errorTitle {
+  background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat;
+  background-size: 3em;
+  margin-inline-start: -5em;
+  padding-inline-start: 5em;
+}
+
+@media (max-width: 675px) {
+  #errorTitle {
+    padding-top: 0;
+    background-image: none !important;
+    margin-inline-start: 0;
+    padding-inline-start: 0;
+  }
+}
+
+#errorPageContainer.certerror > #errorTitle {
+  background-image: url("chrome://messenger/skin/icons/cert-error.svg");
+}
+
+#errorTitleText {
+  border-bottom: 1px solid #c1c1c1;
+  padding-bottom: 0.4em;
+}
+
+#errorTitleText:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+#errorTryAgain {
+  margin-top: 1.2em;
+  min-width: 150px
+}
+
+#errorContainer {
+  display: none;
+}
+
+/* Pressing the retry button will cause the cursor to flicker from a pointer to
+ * not-allowed. Override the disabled cursor behaviour since we will never show
+ * the button disabled as the initial state. */
+button:disabled {
+  cursor: pointer;
+}
+
+#brand {
+  position: absolute;
+  right: 0;
+  bottom: -1.5em;
+  margin-inline-end: 10px;
+  opacity: .4;
+}
+
+#brand:-moz-dir(rtl) {
+  right: auto;
+  left: 0;
+}
+
+#brand > p {
+  margin: 0;
+}
+
+#securityOverrideDiv {
+  padding-top: 10px;
+}
+
+#securityOverrideContent {
+  background-color: InfoBackground;
+  color: InfoText;
+  padding: 10px;
+  border: 1px solid #c1c1c1;
+}
+
+/* Custom styling for 'blacklist' error class */
+:root.blacklist {
+  color: white;
+  background-color: #722;
+}
+
+:root.blacklist #errorPageContainer > #errorTitle {
+  background-image: url("chrome://messenger/skin/icons/blacklist.svg");
+}
+
+:root.blacklist #errorTitleText {
+  color: white;
+  border-bottom-color: white;
+}
+
+:root.blacklist a {
+  color: white;
+}
+
+:root.blacklist #errorTryAgain {
+  display: none;
+}
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/blacklist.svg
@@ -0,0 +1,7 @@
+<!-- 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" viewBox="0 0 100 100" fill="#ffffff">
+  <circle cx="50" cy="50" r="44" stroke="#ffffff" stroke-width="11"/>
+  <rect x="15.6" y="40" width="68.8" height="20" fill="#772222"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/cert-error.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="45"
+     height="45"
+     viewBox="0 0 45 45">
+
+  <style>
+    .icon-default {
+      fill: #999;
+    }
+  </style>
+
+  <defs>
+    <rect id="shape-lock-clasp-outer" x="8" y="2" width="28" height="40" rx="14" ry="14" />
+    <rect id="shape-lock-clasp-inner" x="14" y="8" width="16" height="28" rx="8" ry="8" />
+    <rect id="shape-lock-base" x="4" y="18" width="36" height="24" rx="3" ry="3" />
+
+    <mask id="mask-clasp-cutout">
+      <rect width="48" height="48" fill="#000" />
+      <use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
+      <use xlink:href="#shape-lock-clasp-inner" fill="#000" />
+      <line x1="4" y1="38" x2="41" y2="3" stroke="#000" stroke-width="5.5" />
+      <line x1="4" y1="46" x2="41" y2="11" stroke="#000" stroke-width="5.5" />
+      <rect x="4" y="18" width="36" height="26" rx="6" ry="6" />
+    </mask>
+
+    <mask id="mask-base-cutout">
+      <rect width="45" height="45" fill="#000" />
+      <use xlink:href="#shape-lock-base" fill="#fff" />
+      <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#000" stroke-width="8.5" />
+    </mask>
+  </defs>
+
+  <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#999" />
+  <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" fill="#999" />
+
+  <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#d92d21" stroke-width="5.5" />
+
+</svg>
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -45,16 +45,17 @@ classic.jar:
   skin/classic/messenger/voice.png                            (../../components/im/themes/voice.png)
   skin/classic/messenger/browserRequest.css                   (mail/browserRequest.css)
   skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
+  skin/classic/messenger/aboutNetError.css                    (../shared/mail/aboutNetError.css)
   skin/classic/messenger/messengerLWTheme.css                 (../shared/mail/messengerLWTheme.css)
   skin/classic/messenger/attachmentList.css                   (mail/attachmentList.css)
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/tagColors.css                        (mail/tagColors.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
@@ -192,16 +193,18 @@ classic.jar:
   skin/classic/messenger/smime/icons/sbSignOk-XP.png          (mail/smime/sbSignOk-XP.png)
   skin/classic/messenger/smime/icons/sbSignUnknown.png     (mail/smime/sbSignUnknown.png)
   skin/classic/messenger/smime/icons/sbSignUnknown-XP.png     (mail/smime/sbSignUnknown-XP.png)
   skin/classic/messenger/icons/zoomout.png                    (mail/icons/zoomout.png)
   skin/classic/messenger/icons/zoomout-hover.png              (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/readmail.png                   (mail/icons/readmail.png)
   skin/classic/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar.png)
   skin/classic/messenger/icons/mail-toolbar-small.png         (mail/icons/mail-toolbar-small.png)
+  skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
+  skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
   skin/classic/messenger/icons/folder-XP.png                  (mail/icons/folder-XP.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/message-XP.png                 (mail/icons/message-XP.png)
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/messenger/icons/license.txt                    (mail/icons/license.txt)
   skin/classic/messenger/icons/appmenu-icons.png              (mail/icons/appmenu-icons.png)
@@ -335,8 +338,9 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                   (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                   (mail/windowsShared.css)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
+% override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css