Bug 1471833 - use a shared CSS file for aboutDownloads.css. r=Paenglab
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 11 Sep 2019 12:00:13 +0300
changeset 36777 b72e1eda063028c348eaebeac2b1ea39604372d6
parent 36776 7bea3e17e209ebec8be4a5805ae1c0e73c6d5bed
child 36778 94486e3577749d981642e418ab7c550060b853aa
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersPaenglab
bugs1471833
Bug 1471833 - use a shared CSS file for aboutDownloads.css. r=Paenglab
mail/themes/linux/mail/downloads/aboutDownloads.css
mail/themes/osx/mail/downloads/aboutDownloads.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/aboutDownloads.css
mail/themes/windows/mail/downloads/aboutDownloads.css
--- a/mail/themes/linux/mail/downloads/aboutDownloads.css
+++ b/mail/themes/linux/mail/downloads/aboutDownloads.css
@@ -1,58 +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/. */
 
-/*** Panel and outer controls ***/
-
-#aboutDownloads {
-  background-color: #f9f9fa;
-  color: #0c0c0d;
-  padding: 18px;
-}
-
-#msgDownloadsListEmptyDescription {
-  margin: 1em;
-  text-align: center;
-  color: GrayText;
-}
-
-#msgDownloadsRichListBox {
-  /** The default listbox appearance comes with an unwanted margin. **/
-  -moz-appearance: none;
-  margin: 0;
-  border: 1px solid hsla(210,4%,10%,.14);
-}
-
-#msgDownloadsRichListBox > richlistitem.download {
-  height: 5em;
-  padding: 5px 8px;
-  border-bottom: 1px solid #f1f1f1;
-}
-
-#clearDownloads {
-  margin-inline-start: 0;
-}
-
-#searchBox {
-  margin-inline-end: 0;
-}
-
-.fileTypeIcon {
-  margin-inline-end: 8px;
-  margin-top: 12px;
-  /* Prevent flickering when changing states. */
-  max-height: 32px;
-  min-width: 32px;
-}
-
-.fileName {
-  margin-bottom: 3px;
-  cursor: inherit;
-}
-
-.size,
-.startDate {
-  opacity: 0.7;
-  font-size: 95%;
-  cursor: inherit;
-}
+@import url("chrome://messenger/skin/shared/aboutDownloads.css");
--- a/mail/themes/osx/mail/downloads/aboutDownloads.css
+++ b/mail/themes/osx/mail/downloads/aboutDownloads.css
@@ -1,58 +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/. */
 
-/*** Panel and outer controls ***/
-
-#aboutDownloads {
-  background-color: #f9f9fa;
-  color: #0c0c0d;
-  padding: 18px;
-}
-
-#msgDownloadsListEmptyDescription {
-  margin: 1em;
-  text-align: center;
-  color: GrayText;
-}
-
-#msgDownloadsRichListBox {
-  /** The default listbox appearance comes with an unwanted margin. **/
-  -moz-appearance: none;
-  margin: 0;
-  border: 1px solid hsla(210,4%,10%,.14);
-}
-
-#msgDownloadsRichListBox > richlistitem.download {
-  height: 6em;
-  padding: 5px 8px;
-  border-bottom: 1px solid #f1f1f1;
-}
-
-#clearDownloads {
-  margin-inline-start: 0;
-}
-
-#searchBox {
-  margin-inline-end: 0;
-}
-
-.fileTypeIcon {
-  margin-inline-end: 8px;
-  margin-top: 12px;
-  /* Ensure icons are displayed at 32px size even on Retina display */
-  max-height: 32px;
-  width: 32px;
-}
-
-.fileName {
-  margin-bottom: 3px;
-  cursor: inherit;
-}
-
-.size,
-.startDate {
-  opacity: 0.7;
-  font-size: 95%;
-  cursor: inherit;
-}
+@import url("chrome://messenger/skin/shared/aboutDownloads.css");
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -102,23 +102,24 @@
   skin/classic/messenger/icons/tag.svg                        (../shared/mail/icons/tag.svg)
   skin/classic/messenger/icons/thread-col.svg                 (../shared/mail/icons/thread-col.svg)
   skin/classic/messenger/icons/tick.png                       (../shared/mail/icons/tick.png)
   skin/classic/messenger/icons/timeline.svg                   (../shared/mail/icons/timeline.svg)
   skin/classic/messenger/icons/toolbarbutton-arrow.svg        (../shared/mail/icons/toolbarbutton-arrow.svg)
   skin/classic/messenger/icons/userIcon.svg                   (../shared/mail/icons/userIcon.svg)
   skin/classic/messenger/icons/visible.svg                    (../shared/mail/icons/visible.svg)
   skin/classic/messenger/icons/waiting.svg                    (../shared/mail/icons/waiting.svg)
-  skin/classic/messenger/shared/creationDialog.css            (../shared/mail/creationDialog.css)
+  skin/classic/messenger/shared/aboutDownloads.css            (../shared/mail/aboutDownloads.css)
   skin/classic/messenger/shared/accountCentral.css            (../shared/mail/accountCentral.css)
   skin/classic/messenger/shared/accountCreation.css           (../shared/mail/accountCreation.css)
   skin/classic/messenger/shared/accountManage.css             (../shared/mail/accountManage.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/compacttheme.css              (../shared/mail/compacttheme.css)
+  skin/classic/messenger/shared/creationDialog.css            (../shared/mail/creationDialog.css)
   skin/classic/messenger/shared/in-content/applications.css   (../shared/mail/incontentprefs/applications.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/passwordmgr.css    (../shared/mail/incontentprefs/passwordmgr.css)
   skin/classic/messenger/shared/in-content/preferences.css    (../shared/mail/incontentprefs/preferences.css)
   skin/classic/messenger/shared/in-content/calendar.svg       (../shared/mail/incontentprefs/calendar.svg)
   skin/classic/messenger/shared/in-content/chat.svg           (../shared/mail/incontentprefs/chat.svg)
   skin/classic/messenger/shared/in-content/general.svg        (../shared/mail/incontentprefs/general.svg)
   skin/classic/messenger/shared/in-content/security.svg       (../shared/mail/incontentprefs/security.svg)
copy from mail/themes/windows/mail/downloads/aboutDownloads.css
copy to mail/themes/shared/mail/aboutDownloads.css
--- a/mail/themes/windows/mail/downloads/aboutDownloads.css
+++ b/mail/themes/shared/mail/aboutDownloads.css
@@ -1,14 +1,12 @@
 /* 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/. */
 
-/*** Panel and outer controls ***/
-
 #aboutDownloads {
   background-color: #f9f9fa;
   color: #0c0c0d;
   padding: 18px;
 }
 
 #msgDownloadsListEmptyDescription {
   margin: 1em;
@@ -52,36 +50,8 @@
 }
 
 .size,
 .startDate {
   opacity: 0.7;
   font-size: 95%;
   cursor: inherit;
 }
-
-@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/windows/global/autocomplete.css
-
-  This styling should be kept in sync with the style from the above file.
-  */
-  #msgDownloadsRichListBox > richlistitem.download[selected] {
-    color: inherit;
-    background-color: transparent;
-    /* four gradients for the bevel highlights on each edge, one for blue background */
-    background-image:
-      linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
-      linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
-      linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
-      linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
-      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;
-  }
-}
--- a/mail/themes/windows/mail/downloads/aboutDownloads.css
+++ b/mail/themes/windows/mail/downloads/aboutDownloads.css
@@ -1,67 +1,13 @@
 /* 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/. */
 
-/*** Panel and outer controls ***/
-
-#aboutDownloads {
-  background-color: #f9f9fa;
-  color: #0c0c0d;
-  padding: 18px;
-}
-
-#msgDownloadsListEmptyDescription {
-  margin: 1em;
-  text-align: center;
-  color: GrayText;
-}
-
-#msgDownloadsRichListBox {
-  /** The default listbox appearance comes with an unwanted margin. **/
-  -moz-appearance: none;
-  margin: 0;
-  border: 1px solid hsla(210,4%,10%,.14);
-}
-
-#msgDownloadsRichListBox > richlistitem.download {
-  height: 6em;
-  border-bottom: 1px solid #f1f1f1;
-}
-
-#clearDownloads {
-  margin-inline-start: 0;
-}
-
-#searchBox {
-  margin-inline-end: 0;
-  padding-inline-start: 5px;
-}
-
-.fileTypeIcon {
-  margin-inline-start: 8px;
-  margin-inline-end: 8px;
-  margin-top: 12px;
-  /* explicitly size the icon, so size doesn't vary on hidpi systems */
-  max-height: 32px;
-  width: 32px;
-}
-
-.fileName {
-  margin-bottom: 3px;
-  cursor: inherit;
-}
-
-.size,
-.startDate {
-  opacity: 0.7;
-  font-size: 95%;
-  cursor: inherit;
-}
+@import url("chrome://messenger/skin/shared/aboutDownloads.css");
 
 @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/windows/global/autocomplete.css