Bug 1560727 - use shared accountManage.css for shared CSS. r=Paenglab
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sun, 23 Jun 2019 15:36:39 +0300
changeset 35928 f7382be702d4214d3f3046576bd8bdaa011f6be5
parent 35927 7ad11431613a9329d152abd7a6ffd45f69d72ed9
child 35929 70cded2918d3b83c273da5a55a72f91ce7b2a442
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersPaenglab
bugs1560727
Bug 1560727 - use shared accountManage.css for shared CSS. r=Paenglab
mail/themes/linux/mail/accountManage.css
mail/themes/osx/mail/accountManage.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/accountManage.css
mail/themes/windows/mail/accountManage.css
--- a/mail/themes/linux/mail/accountManage.css
+++ b/mail/themes/linux/mail/accountManage.css
@@ -1,106 +1,11 @@
 /* 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/. */
 
-/* ===== accountManage.css ==============================================
-  == Styles for the Mail Account Manager.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/");
-@import url("chrome://global/skin/in-content/common.css");
-@import url("chrome://messenger/skin/preferences/aboutPreferences.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-page {
-  font-size: 0.95em;
-  margin-inline-start: 4px;
-}
-
-page groupbox {
-  margin-left: 6px;
-  margin-right: 6px;
-}
+@import url("chrome://messenger/skin/shared/accountManage.css");
 
-/* ::::: account manager :::::: */
-
-.specialFolderPickerGrid {
-  margin-inline-start: 20px;
-}
-
-.fccReplyFollowsParent {
-  margin-inline-start: 20px;
-}
-
-.signatureBox {
-  font-family: -moz-fixed;
-}
-
-listitem[default="true"],
-#identitiesList > listitem:first-child {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(isDefaultServer-true) {
-  text-decoration: underline;
-}
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(16px 64px 32px 48px);
 }
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
-  list-style-image: url("chrome://chat/skin/prpl-generic/icon.png");
-}
-
-#accounttree treechildren::-moz-tree-indentation {
-  width: 1ch;
-}
-
-#accountActionsButton {
-  margin-left: 0;
-  margin-right: 0;
-}
-
-#accountActionsDropdown {
-  min-width: 30ch;
-}
-
-/* ::::: SMTP Server Panel :::::: */
-
-#smtpList {
-  margin-inline-start: 6px;
-}
-
-#backgroundBox {
-  background-color: var(--in-content-box-background);
-}
-
-#smtpServerInfoBox {
-  background-color: var(--in-content-box-background);
-  margin: 0 6px 5px;
-}
-
-#smtpServerInfoBox label {
-  height: 30px;
-  padding-top: 5px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#smtpServerInfoBox textbox {
-  background-color: transparent !important;
-}
-
-/* ::::: dialog header ::::: */
-
-.dialogheader-title {
-  margin-top: 0;
-  margin-bottom: 8px;
-  margin-inline-start: 6px;
-  font-size: 1.46em;
-  font-weight: 300;
-  line-height: 1.3em;
-  color: var(--in-content-text-color);
-}
--- a/mail/themes/osx/mail/accountManage.css
+++ b/mail/themes/osx/mail/accountManage.css
@@ -1,126 +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/. */
 
-/* ===== accountManage.css ==============================================
-  == Styles for the Mail Account Manager.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/");
-@import url("chrome://global/skin/in-content/common.css");
-@import url("chrome://messenger/skin/preferences/aboutPreferences.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-page {
-  font-size: 0.95em;
-  margin-inline-start: 4px;
-}
-
-page groupbox {
-  margin-left: 6px;
-  margin-right: 6px;
-}
-
-/* ::::: account manager :::::: */
-
-.specialFolderPickerGrid {
-  margin-inline-start: 20px;
-}
-
-.fccReplyFollowsParent {
-  margin-inline-start: 20px;
-}
-
-.signatureBox {
-  font-family: -moz-fixed;
-}
-
-#am-main-title, .dialogheader {
-  display: none;
-}
-
-.dialog-button[dlgtype="help"] {
-  display: none;
-}
+@import url("chrome://messenger/skin/shared/accountManage.css");
 
 #accountActionsButton {
   margin-left: 0;
   margin-right: 0;
 }
 
 #accountActionsDropdown {
   min-width: 30ch;
 }
 
-listitem[default="true"],
-#identitiesList > listitem:first-child,
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(isDefaultServer-true) {
-  text-decoration: underline;
+description {
+  margin: 4px 4px 8px;
 }
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(0 112px 16px 96px);
 }
 
 @media (min-resolution: 2dppx) {
   treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
     list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
     -moz-image-region: rect(0 224px 32px 192px);
   }
-}
 
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
-  list-style-image: url("chrome://chat/skin/prpl-generic/icon.png");
-}
-
-@media (min-resolution: 2dppx) {
   treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
     list-style-image: url("chrome://chat/skin/prpl-generic/icon32.png");
   }
 }
 
-#accounttree treechildren::-moz-tree-indentation {
-  width: 1ch;
-}
-
-description {
-  margin: 4px 4px 8px;
-}
-
-#smtpList {
-  margin-inline-start: 6px;
-}
-
-#backgroundBox {
-  background-color: var(--in-content-box-background);
-}
-
-#smtpServerInfoBox {
-  background-color: var(--in-content-box-background);
-  margin: 0 6px 5px;
-}
-
-#smtpServerInfoBox label {
-  height: 30px;
-  padding-top: 5px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-/* ::::: dialog header ::::: */
-
-.dialogheader-title {
-  margin-top: 0;
-  margin-bottom: 8px;
-  margin-inline-start: 6px;
-  font-size: 1.46em;
-  font-weight: 300;
-  line-height: 1.3em;
-  color: var(--in-content-text-color);
-}
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -99,16 +99,17 @@
   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/waiting.svg                    (../shared/mail/icons/waiting.svg)
   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/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/account.svg        (../shared/mail/incontentprefs/account.svg)
   skin/classic/messenger/shared/in-content/advanced.svg       (../shared/mail/incontentprefs/advanced.svg)
   skin/classic/messenger/shared/in-content/attachment.svg     (../shared/mail/incontentprefs/attachment.svg)
copy from mail/themes/windows/mail/accountManage.css
copy to mail/themes/shared/mail/accountManage.css
--- a/mail/themes/windows/mail/accountManage.css
+++ b/mail/themes/shared/mail/accountManage.css
@@ -31,17 +31,16 @@ page groupbox {
 .fccReplyFollowsParent {
   margin-inline-start: 20px;
 }
 
 .signatureBox {
   font-family: -moz-fixed;
 }
 
-listitem[default="true"],
 #identitiesList > listitem:first-child {
   font-weight: bold;
 }
 
 treechildren::-moz-tree-cell-text(isDefaultServer-true) {
   text-decoration: underline;
 }
 
--- a/mail/themes/windows/mail/accountManage.css
+++ b/mail/themes/windows/mail/accountManage.css
@@ -1,106 +1,10 @@
 /* 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/. */
 
-/* ===== accountManage.css ==============================================
-  == Styles for the Mail Account Manager.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/");
-@import url("chrome://global/skin/in-content/common.css");
-@import url("chrome://messenger/skin/preferences/aboutPreferences.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-page {
-  font-size: 0.95em;
-  margin-inline-start: 4px;
-}
-
-page groupbox {
-  margin-left: 6px;
-  margin-right: 6px;
-}
-
-/* ::::: account manager :::::: */
-
-.specialFolderPickerGrid {
-  margin-inline-start: 20px;
-}
-
-.fccReplyFollowsParent {
-  margin-inline-start: 20px;
-}
-
-.signatureBox {
-  font-family: -moz-fixed;
-}
-
-listitem[default="true"],
-#identitiesList > listitem:first-child {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(isDefaultServer-true) {
-  text-decoration: underline;
-}
+@import url("chrome://messenger/skin/shared/accountManage.css");
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(16px 64px 32px 48px);
 }
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
-  list-style-image: url("chrome://chat/skin/prpl-generic/icon.png");
-}
-
-#accounttree treechildren::-moz-tree-indentation {
-  width: 1ch;
-}
-
-#accountActionsButton {
-  margin-left: 0;
-  margin-right: 0;
-}
-
-#accountActionsDropdown {
-  min-width: 30ch;
-}
-
-/* ::::: SMTP Server Panel :::::: */
-
-#smtpList {
-  margin-inline-start: 6px;
-}
-
-#backgroundBox {
-  background-color: var(--in-content-box-background);
-}
-
-#smtpServerInfoBox {
-  background-color: var(--in-content-box-background);
-  margin: 0 6px 5px;
-}
-
-#smtpServerInfoBox label {
-  height: 30px;
-  padding-top: 5px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#smtpServerInfoBox textbox {
-  background-color: transparent;
-}
-
-/* ::::: dialog header ::::: */
-
-.dialogheader-title {
-  margin-top: 0;
-  margin-bottom: 8px;
-  margin-inline-start: 6px;
-  font-size: 1.46em;
-  font-weight: 300;
-  line-height: 1.3em;
-  color: var(--in-content-text-color);
-}