Bug 1631394 - Rename the directories /incontentprefs/ and /in-content/ into /preferences/. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Mon, 20 Apr 2020 13:09:31 +0200
changeset 38889 d78ead15b14ff1ce22eee4c883cf9ef8b3a8e2d7
parent 38888 0665e9d6b9ecba9d68c5868324b4aa4f2e9f3670
child 38890 27e481da98bca19adb077c641249ad6b83621be3
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersaleca
bugs1631394
Bug 1631394 - Rename the directories /incontentprefs/ and /in-content/ into /preferences/. r=aleca
calendar/base/themes/common/lightning-toolbar.css
calendar/base/themes/common/lightning.css
mail/components/preferences/passwordManager.xhtml
mail/themes/linux/mail/preferences/applications.css
mail/themes/linux/mail/preferences/dialog.css
mail/themes/linux/mail/preferences/preferences.css
mail/themes/osx/mail/preferences/applications.css
mail/themes/osx/mail/preferences/dialog.css
mail/themes/osx/mail/preferences/preferences.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/accountCentral.css
mail/themes/shared/mail/incontentprefs/applications.css
mail/themes/shared/mail/incontentprefs/calendar.svg
mail/themes/shared/mail/incontentprefs/chat.svg
mail/themes/shared/mail/incontentprefs/dialog.css
mail/themes/shared/mail/incontentprefs/general.svg
mail/themes/shared/mail/incontentprefs/passwordmgr.css
mail/themes/shared/mail/incontentprefs/preferences.css
mail/themes/shared/mail/incontentprefs/security.svg
mail/themes/shared/mail/preferences/applications.css
mail/themes/shared/mail/preferences/calendar.svg
mail/themes/shared/mail/preferences/chat.svg
mail/themes/shared/mail/preferences/dialog.css
mail/themes/shared/mail/preferences/general.svg
mail/themes/shared/mail/preferences/passwordmgr.css
mail/themes/shared/mail/preferences/preferences.css
mail/themes/shared/mail/preferences/security.svg
mail/themes/windows/mail/preferences/applications.css
mail/themes/windows/mail/preferences/dialog.css
mail/themes/windows/mail/preferences/preferences.css
--- a/calendar/base/themes/common/lightning-toolbar.css
+++ b/calendar/base/themes/common/lightning-toolbar.css
@@ -1,15 +1,15 @@
 /* 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/. */
 
 /* Lightning "Calendar" Toolbarbutton */
 #lightning-button-calendar {
-    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
+    list-style-image: url(chrome://messenger/skin/shared/preferences/calendar.svg);
 }
 
 /* Lightning "Tasks" Toolbarbutton */
 #lightning-button-tasks {
     list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
 }
 
 /* Toolbar buttons */
--- a/calendar/base/themes/common/lightning.css
+++ b/calendar/base/themes/common/lightning.css
@@ -5,30 +5,30 @@
 /* For deactivating calendar, see calCalendarDeactivator.jsm. */
 :root[calendar-deactivated] .hide-when-calendar-deactivated {
   display: none;
 }
 
 /* ::: new tab buttons ::: */
 #calendar-tab-button,
 #newMsgButton-calendar-menuitem {
-    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
+    list-style-image: url(chrome://messenger/skin/shared/preferences/calendar.svg);
     -moz-image-region: auto;
 }
 
 #task-tab-button,
 #newMsgButton-task-menuitem {
     list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
     -moz-image-region: auto;
 }
 
 /* ::: tab icons ::: */
 .icon-holder[type="calendar"],
 .tabmail-tab[type="calendar"] {
-    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
+    list-style-image: url(chrome://messenger/skin/shared/preferences/calendar.svg);
     -moz-image-region: auto;
 }
 
 .icon-holder[type="tasks"],
 .tabmail-tab[type="tasks"] {
     list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
     -moz-image-region: auto;
 }
--- a/mail/components/preferences/passwordManager.xhtml
+++ b/mail/components/preferences/passwordManager.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!-- 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 https://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/in-content/passwordmgr.css"?>
+<?xml-stylesheet href="chrome://messenger/skin/shared/preferences/passwordmgr.css"?>
 
 <window id="SignonViewerDialog"
         windowtype="Toolkit:PasswordManager"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         onunload="Shutdown();"
         data-l10n-id="saved-logins"
--- a/mail/themes/linux/mail/preferences/applications.css
+++ b/mail/themes/linux/mail/preferences/applications.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/applications.css");
+@import url("chrome://messenger/skin/shared/preferences/applications.css");
 
 /**
  * Line up the actions menu with action labels above and below it.
  * Equalize the distance from the left side of the action box to the left side
  * of the icon for both the menu and the non-menu versions of the action box.
  * Also make sure the labels are the same distance away from the icons.
  */
 .actionsMenu {
--- a/mail/themes/linux/mail/preferences/dialog.css
+++ b/mail/themes/linux/mail/preferences/dialog.css
@@ -1,9 +1,9 @@
 /* - 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://messenger/skin/shared/in-content/dialog.css");
+@import url("chrome://messenger/skin/shared/preferences/dialog.css");
 
 :root > * {
   font-size: 1.05em;
 }
--- a/mail/themes/linux/mail/preferences/preferences.css
+++ b/mail/themes/linux/mail/preferences/preferences.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/preferences.css");
+@import url("chrome://messenger/skin/shared/preferences/preferences.css");
 @namespace html "http://www.w3.org/1999/xhtml";
 
 .dialogBox,
 #MailPreferences prefpane {
   font-size: 1.11em;
 }
 
 radio[pane] > .radio-label-box {
--- a/mail/themes/osx/mail/preferences/applications.css
+++ b/mail/themes/osx/mail/preferences/applications.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/applications.css");
+@import url("chrome://messenger/skin/shared/preferences/applications.css");
 
 /**
  * Line up the actions menu with action labels above and below it.
  * Equalize the distance from the left side of the action box to the left side
  * of the icon for both the menu and the non-menu versions of the action box.
  * Also make sure the labels are the same distance away from the icons.
  */
 .actionsMenu {
--- a/mail/themes/osx/mail/preferences/dialog.css
+++ b/mail/themes/osx/mail/preferences/dialog.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/dialog.css");
+@import url("chrome://messenger/skin/shared/preferences/dialog.css");
 
 .windowDialog {
   font: message-box !important;
 }
 
 :root > * {
   font-size: 1.18em;
 }
--- a/mail/themes/osx/mail/preferences/preferences.css
+++ b/mail/themes/osx/mail/preferences/preferences.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/preferences.css");
+@import url("chrome://messenger/skin/shared/preferences/preferences.css");
 @namespace html "http://www.w3.org/1999/xhtml";
 
 .dialogBox,
 #MailPreferences prefpane {
   font-size: 1.36em;
 }
 
 radio[pane] > .radio-label-box {
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -131,24 +131,24 @@
   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/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)
+  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)
+  skin/classic/messenger/shared/preferences/chat.svg          (../shared/mail/preferences/chat.svg)
+  skin/classic/messenger/shared/preferences/general.svg       (../shared/mail/preferences/general.svg)
+  skin/classic/messenger/shared/preferences/security.svg      (../shared/mail/preferences/security.svg)
   skin/classic/messenger/shared/newInstall.css                (../shared/mail/newInstall.css)
   skin/classic/messenger/icons/information.svg                (../shared/mail/icons/information.svg)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messengercompose.css          (../shared/mail/messengercompose.css)
   skin/classic/messenger/shared/searchBox.css                 (../shared/mail/searchBox.css)
   skin/classic/messenger/shared/searchDialog.css              (../shared/mail/searchDialog.css)
--- a/mail/themes/shared/mail/accountCentral.css
+++ b/mail/themes/shared/mail/accountCentral.css
@@ -316,17 +316,17 @@ aside.settings-btn-container {
   color: var(--btn-color-hover) !important;
 }
 
 #setupEmail::before {
   background-image: url("chrome://messenger/skin/icons/message.svg");
 }
 
 #setupCalendar::before {
-  background-image: url("chrome://messenger/skin/shared/in-content/calendar.svg");
+  background-image: url("chrome://messenger/skin/shared/preferences/calendar.svg");
 }
 
 #setupAddressBook::before {
   background-image: url("chrome://messenger/skin/icons/address.svg");
 }
 
 #setupChat::before {
   background-image: url("chrome://messenger/skin/icons/chat.svg");
rename from mail/themes/shared/mail/incontentprefs/applications.css
rename to mail/themes/shared/mail/preferences/applications.css
rename from mail/themes/shared/mail/incontentprefs/calendar.svg
rename to mail/themes/shared/mail/preferences/calendar.svg
rename from mail/themes/shared/mail/incontentprefs/chat.svg
rename to mail/themes/shared/mail/preferences/chat.svg
rename from mail/themes/shared/mail/incontentprefs/dialog.css
rename to mail/themes/shared/mail/preferences/dialog.css
rename from mail/themes/shared/mail/incontentprefs/general.svg
rename to mail/themes/shared/mail/preferences/general.svg
rename from mail/themes/shared/mail/incontentprefs/passwordmgr.css
rename to mail/themes/shared/mail/preferences/passwordmgr.css
rename from mail/themes/shared/mail/incontentprefs/preferences.css
rename to mail/themes/shared/mail/preferences/preferences.css
--- a/mail/themes/shared/mail/incontentprefs/preferences.css
+++ b/mail/themes/shared/mail/preferences/preferences.css
@@ -226,33 +226,33 @@ radio[pane][selected] > .radio-check {
   }
 
   #preferencesContainer {
     padding-inline: 15px;
   }
 }
 
 radio[pane=paneGeneral] > .radio-check {
-  list-style-image: url("chrome://messenger/skin/shared/in-content/general.svg");
+  list-style-image: url("chrome://messenger/skin/shared/preferences/general.svg");
 }
 
 radio[pane=panePrivacy] > .radio-check {
-  list-style-image: url("chrome://messenger/skin/shared/in-content/security.svg");
+  list-style-image: url("chrome://messenger/skin/shared/preferences/security.svg");
 }
 
 radio[pane=paneCompose] > .radio-check {
   list-style-image: url("chrome://messenger/skin/icons/newmsg.svg");
 }
 
 radio[pane=paneChat] > .radio-check {
-  list-style-image: url("chrome://messenger/skin/shared/in-content/chat.svg");
+  list-style-image: url("chrome://messenger/skin/shared/preferences/chat.svg");
 }
 
 radio[pane=paneLightning] > .radio-check {
-  list-style-image: url("chrome://messenger/skin/shared/in-content/calendar.svg");
+  list-style-image: url("chrome://messenger/skin/shared/preferences/calendar.svg");
 }
 
 html|input[type="number"] {
   margin-inline-start: 4px;
   padding: 1px;
 }
 /* sizes: chars + 8px padding + 1px borders + spin buttons 25+2+10px  */
 html|input[type="number"].size2 {
rename from mail/themes/shared/mail/incontentprefs/security.svg
rename to mail/themes/shared/mail/preferences/security.svg
--- a/mail/themes/windows/mail/preferences/applications.css
+++ b/mail/themes/windows/mail/preferences/applications.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/applications.css");
+@import url("chrome://messenger/skin/shared/preferences/applications.css");
 
 /**
  * Line up the actions menu with action labels above and below it.
  * Equalize the distance from the left side of the action box to the left side
  * of the icon for both the menu and the non-menu versions of the action box.
  * Also make sure the labels are the same distance away from the icons.
  */
 .actionsMenu {
--- a/mail/themes/windows/mail/preferences/dialog.css
+++ b/mail/themes/windows/mail/preferences/dialog.css
@@ -1,9 +1,9 @@
 /* - 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://messenger/skin/shared/in-content/dialog.css");
+@import url("chrome://messenger/skin/shared/preferences/dialog.css");
 
 :root > * {
   font-size: 1.12em;
 }
--- a/mail/themes/windows/mail/preferences/preferences.css
+++ b/mail/themes/windows/mail/preferences/preferences.css
@@ -1,13 +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/. */
 
-@import url("chrome://messenger/skin/shared/in-content/preferences.css");
+@import url("chrome://messenger/skin/shared/preferences/preferences.css");
 @namespace html "http://www.w3.org/1999/xhtml";
 
 .dialogBox,
 #MailPreferences prefpane {
   font-size: 1.25em;
 }
 
 radio[pane] > .radio-label-box {