Bug 1636775 - Fix foldermenu icon, tree-image sizing, shared/updated subscribe dialog css. r=Paenglab
authoralta88@fixall.com
Fri, 15 May 2020 13:56:04 +0300
changeset 39156 8570a1102c50b4d562aaf85da4c38d39ae6c311f
parent 39155 13bfde4dfdd7b2e49fea9be50a56b427333e5119
child 39157 1fcf2af4ad4391975b42f66d6009cb3c19c1ccfe
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersPaenglab
bugs1636775
Bug 1636775 - Fix foldermenu icon, tree-image sizing, shared/updated subscribe dialog css. r=Paenglab
mail/themes/linux/mail/newsblog/feed-subscriptions.css
mail/themes/osx/mail/newsblog/feed-subscriptions.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/feedSubscribe.css
mail/themes/shared/mail/folderMenus.css
mail/themes/shared/mail/folderPane.css
mail/themes/windows/mail/newsblog/feed-subscriptions.css
--- a/mail/themes/linux/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/linux/mail/newsblog/feed-subscriptions.css
@@ -1,44 +1,8 @@
 /* -*- 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/. */
 
 /* ::::: Feed Subscription styling :::::: */
 
-#subscriptionsDialog {
-  width: 40em;
-  height: 30em;
-  padding: 0px;
-}
-
-#contentPane {
-  margin: 9px 8px 5px;
-}
-
-#rssFeedInfoBox {
-  border: 1px solid ThreeDShadow;
-  margin: 4px;
-  padding-top: 4px;
-  background-color: rgba(0, 0, 0, 0.05);
-}
-
-#rssFeedInfoBox row,
-#statusContainerBox {
-  height: 2.4em;
-}
-
-#autotagPrefix {
-  width: 35ch;
-}
-
-#nameValue,
-#locationValue,
-#selectFolderValue {
-  padding-top: 0;
-  padding-bottom: 1px;
-}
-
-#rssSubscriptionsList > treechildren::-moz-tree-image {
-  width: 16px;
-  height: 16px;
-}
+@import url("chrome://messenger/skin/shared/feedSubscribe.css");
--- a/mail/themes/osx/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/osx/mail/newsblog/feed-subscriptions.css
@@ -1,32 +1,12 @@
 /* -*- 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/. */
 
 /* ::::: Feed Subscription styling :::::: */
 
-#subscriptionsDialog {
-  width: 40em;
-  height: 30em;
-  padding: 14px;
-}
-
-#rssFeedInfoBox {
-  border: 1px solid ThreeDShadow;
-  margin: 4px;
-  padding-top: 4px;
-  background-color: rgba(0, 0, 0, 0.05);
-}
+@import url("chrome://messenger/skin/shared/feedSubscribe.css");
 
-#statusContainerBox {
-  height: 2.3em;
+#subscriptionsDialog {
+  padding: 4px;
 }
-
-#autotagPrefix {
-  width: 35ch;
-}
-
-#rssSubscriptionsList > treechildren::-moz-tree-image {
-  width: 16px;
-  height: 16px;
-}
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -186,16 +186,17 @@
   skin/classic/messenger/shared/accountCreation.css           (../shared/mail/accountCreation.css)
   skin/classic/messenger/shared/newInstallPage.css            (../shared/mail/newInstallPage.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/EditorDialog.css              (../shared/mail/EditorDialog.css)
+  skin/classic/messenger/shared/feedSubscribe.css             (../shared/mail/feedSubscribe.css)
   skin/classic/messenger/shared/filterDialog.css              (../shared/mail/filterDialog.css)
   skin/classic/messenger/shared/folderMenus.css               (../shared/mail/folderMenus.css)
   skin/classic/messenger/shared/folderPane.css                (../shared/mail/folderPane.css)
   skin/classic/messenger/shared/preferences/applications.css  (../shared/mail/preferences/applications.css)
   skin/classic/messenger/shared/preferences/dialog.css        (../shared/mail/preferences/dialog.css)
   skin/classic/messenger/shared/preferences/passwordmgr.css   (../shared/mail/preferences/passwordmgr.css)
   skin/classic/messenger/shared/preferences/preferences.css   (../shared/mail/preferences/preferences.css)
   skin/classic/messenger/shared/preferences/calendar.svg      (../shared/mail/preferences/calendar.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/feedSubscribe.css
@@ -0,0 +1,32 @@
+/* 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/. */
+
+#subscriptionsDialog {
+  width: 40em;
+  height: 30em;
+}
+
+#contentPane {
+  margin: 10px;
+}
+
+#rssSubscriptionsList > treechildren::-moz-tree-image {
+  width: 16px;
+  height: 16px;
+}
+
+#rssFeedInfoBox {
+  border: 1px solid ThreeDShadow;
+  margin: 4px;
+  padding-top: 4px;
+  background-color: rgba(0, 0, 0, 0.05);
+}
+
+#autotagPrefix {
+  flex: 0;
+}
+
+#statusContainerBox {
+  height: 2.4em;
+}
--- a/mail/themes/shared/mail/folderMenus.css
+++ b/mail/themes/shared/mail/folderMenus.css
@@ -24,17 +24,17 @@ menulist.folderMenuItem::part(icon) {
 
 /* Newsgroup */
 .folderMenuItem[ServerType="nntp"] {
   list-style-image: url("chrome://messenger/skin/icons/newsgroup.svg");
 }
 
 /* Feed folder */
 .folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
+  list-style-image: url("chrome://messenger/skin/icons/feeds-folder.svg");
 }
 
 /* Special folders */
 
 .folderMenuItem[SpecialFolder="Inbox"] {
   list-style-image: url("chrome://messenger/skin/icons/inbox.svg");
 }
 
--- a/mail/themes/shared/mail/folderPane.css
+++ b/mail/themes/shared/mail/folderPane.css
@@ -27,17 +27,17 @@
 }
 
 /* ::::: Folder Pane ::::: */
 
 #folderTree > treechildren::-moz-tree-image,
 #accounttree > treechildren::-moz-tree-image {
   opacity: 0.85;
   width: 16px;
-  height: auto;
+  height: 16px;
 }
 
 /* reduce the padding set from messenger.css */
 #folderTree > treechildren::-moz-tree-cell-text {
   padding-inline-start: 3px;
 }
 
 treechildren::-moz-tree-image(folderNameCol) {
--- a/mail/themes/windows/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/windows/mail/newsblog/feed-subscriptions.css
@@ -1,51 +1,8 @@
 /* -*- 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/. */
 
 /* ::::: Feed Subscription styling :::::: */
 
-#subscriptionsDialog {
-  width: 40em;
-  height: 30em;
-  padding: 0px;
-}
-
-#contentPane {
-  margin: 9px 8px 5px;
-}
-
-#rssFeedInfoBox {
-  border: 1px solid ThreeDShadow;
-  margin: 4px;
-  padding-top: 4px;
-  background-color: rgba(0, 0, 0, 0.05);
-}
-
-#rssFeedInfoBox row,
-#statusContainerBox {
-  height: 2.3em;
-}
-
-@media not all and (-moz-windows-default-theme) {
-  #rssFeedInfoBox row,
-  #statusContainerBox {
-    height: 2.4em;
-  }
-}
-
-#autotagPrefix {
-  width: 35ch;
-}
-
-#nameValue,
-#locationValue,
-#selectFolderValue {
-  padding-top: 0;
-  padding-bottom: 1px;
-}
-
-#rssSubscriptionsList > treechildren::-moz-tree-image {
-  width: 16px;
-  height: 16px;
-}
+@import url("chrome://messenger/skin/shared/feedSubscribe.css");