Bug 1625703 - Port bug 1624882: Scope dialog.css styles to dialog custom element. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Sat, 28 Mar 2020 20:53:47 +0100
changeset 38631 98de3c95ba0faeef2e8ecfae2d4bb9bf7de78bc8
parent 38630 8109a76635860585e606347626eca5709065978c
child 38632 bdbc2ecaead23f5464c838358670b8b7d8e0a413
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersmkmelin
bugs1625703, 1624882
Bug 1625703 - Port bug 1624882: Scope dialog.css styles to dialog custom element. r=mkmelin m-c changeset: https://hg.mozilla.org/mozilla-central/rev/03281cc4980b
calendar/base/themes/common/calendar-alarms.css
chat/themes/otrFingerprintDialog.css
mail/themes/osx/mail/accountManage.css
mail/themes/shared/mail/incontentprefs/dialog.css
mail/themes/shared/mail/incontentprefs/preferences.css
--- a/calendar/base/themes/common/calendar-alarms.css
+++ b/calendar/base/themes/common/calendar-alarms.css
@@ -56,17 +56,20 @@
     fill: #ffbf00;
 }
 
 #reminder-notifications {
   padding: 0 4px 4px;
 }
 
 #reminder-actions-caption,
-#reminder-details-caption,
-#calendar-event-dialog-reminder > .dialog-button-box {
+#reminder-details-caption {
     padding-top: 20px;
 }
 
+#reminder-actions-menulist {
+    margin-bottom: 20px;
+}
+
 .reminder-icon > .menu-iconic-left > .menu-iconic-icon {
     width: auto;
     height: auto;
 }
--- a/chat/themes/otrFingerprintDialog.css
+++ b/chat/themes/otrFingerprintDialog.css
@@ -8,20 +8,16 @@
   --warning-color: #FF9400;
   --error-color: #5A0002;
 }
 
 .dialog-container {
   width: 36em;
 }
 
-.dialog-button-box {
-  margin-top: 5px;
-}
-
 .header-container {
   margin: 0px 10px 5px;
 }
 
 .label-title {
   font-weight: bold;
   margin-bottom: 5px;
   color: var(--text-color);
--- a/mail/themes/osx/mail/accountManage.css
+++ b/mail/themes/osx/mail/accountManage.css
@@ -24,17 +24,17 @@ treechildren::-moz-tree-image(folderName
     -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/icon32.png");
   }
 }
 
-button:not(.dialog-button) {
+button {
   min-height: 19px; /* aqua size for small buttons */
 }
 
 description {
   margin: 4px 4px 8px;
 }
 
 #archiveTree > treechildren {
--- a/mail/themes/shared/mail/incontentprefs/dialog.css
+++ b/mail/themes/shared/mail/incontentprefs/dialog.css
@@ -1,12 +1,14 @@
 /* - 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/. */
 
+@namespace html url("http://www.w3.org/1999/xhtml");
+
 dialog,
 window,
 prefpane,
 .windowDialog {
   -moz-appearance: none;
   background-color: var(--in-content-page-background);
   color: var(--in-content-page-color);
   margin: 0;
@@ -16,23 +18,24 @@ prefpane,
 prefpane {
   -moz-box-orient: vertical;
 }
 
 .contentPane {
   margin: 0;
 }
 
-.contentPane {
-  /* This allows the focus ring to display fully when scrolling is enabled.
-    Note: dialog.js CE have a matching style for dialog-content-box */
+.contentPane,
+dialog::part(content-box) {
+  /* This allows the focus ring to display fully when scrolling is enabled. */
   padding: 4px;
 }
 
-.contentPane.doScroll {
+.contentPane.doScroll,
+dialog.doScroll::part(content-box) {
   overflow-y: auto;
 }
 
 tabbox {
   /* override the rule in certManager.xhtml */
   margin: 0 0 5px !important;
 }
 
@@ -47,17 +50,17 @@ description,
   margin-inline: 4px;
 }
 
 tree {
   min-height: 15em;
 }
 
 .actionButtons {
-  margin: 3px 0 0;
+  margin: 3px 4px 0;
 }
 
 caption {
   padding-inline-start: 0;
 }
 
 groupbox {
   margin-top: 0;
@@ -76,18 +79,20 @@ groupbox description {
 menulist label {
   font-weight: unset;
 }
 
 .actionButtons + resizer {
   display: none;
 }
 
-#ReturnReceiptsDialogPane {
-  margin-inline: 4px;
+menulist,
+button:not([dlgtype]),
+html|input[type="number"] {
+  margin-inline-end: 0;
 }
 
 #configDeck {
   min-width: 750px;
   min-height: 500px;
 }
 
 /* Create a separate rule to unset these styles on .tree-input instead of
@@ -101,8 +106,13 @@ textbox.tree-input {
   margin-top: 10px;
   margin-inline-start: 4px;
 }
 
 #logView {
   border: 1px solid var(--in-content-box-border-color);
   margin: 0 4px 5px;
 }
+
+#cookieInfoSettings {
+  margin-top: 8px;
+  margin-inline-end: -4px;
+}
--- a/mail/themes/shared/mail/incontentprefs/preferences.css
+++ b/mail/themes/shared/mail/incontentprefs/preferences.css
@@ -453,40 +453,30 @@ richlistbox:focus > richlistitem[selecte
   min-height: 360px;
 }
 
 #defaultMessengerLanguage {
   margin-inline: 0 4px;
   min-width: 20em;
 }
 
-#MessengerLanguagesDialog > .dialog-button-box > .dialog-button[dlgtype="accept"] {
-  margin-inline-end: 0;
-}
-
 #availableLocales {
-  margin: 0;
-  margin-inline-end: 4px;
+  margin-inline: 0;
 }
 
 #warning-message {
   margin-top: 8px;
 }
 
 #warning-message > .message-bar-description {
   width: 32em;
 }
 
-.add-messenger-language {
-  margin: 0;
-  margin-inline-start: 4px;
-}
-
 .action-button {
-  margin-inline-end: 0;
+  margin-inline-start: 8px;
 }
 
 #tagList {
   margin-inline-end: 4px;
 }
 
 #tagButtons > button:first-child {
   margin-top: 0;