From 4c466e0652c52ffdb4dc62dfc845da1962b5bf45 Mon Sep 17 00:00:00 2001 From: Richard Marti Date: Mon, 20 Apr 2020 13:09:31 +0200 Subject: [PATCH] Bug 1631394 - Rename the directories /incontentprefs/ and /in-content/ into /preferences/. r=aleca --HG-- rename : mail/themes/shared/mail/incontentprefs/applications.css => mail/themes/shared/mail/preferences/applications.css rename : mail/themes/shared/mail/incontentprefs/calendar.svg => mail/themes/shared/mail/preferences/calendar.svg rename : mail/themes/shared/mail/incontentprefs/chat.svg => mail/themes/shared/mail/preferences/chat.svg rename : mail/themes/shared/mail/incontentprefs/dialog.css => mail/themes/shared/mail/preferences/dialog.css rename : mail/themes/shared/mail/incontentprefs/general.svg => mail/themes/shared/mail/preferences/general.svg rename : mail/themes/shared/mail/incontentprefs/passwordmgr.css => mail/themes/shared/mail/preferences/passwordmgr.css rename : mail/themes/shared/mail/incontentprefs/preferences.css => mail/themes/shared/mail/preferences/preferences.css rename : mail/themes/shared/mail/incontentprefs/security.svg => mail/themes/shared/mail/preferences/security.svg --- .../base/themes/common/lightning-toolbar.css | 2 +- calendar/base/themes/common/lightning.css | 4 ++-- .../components/preferences/passwordManager.xhtml | 2 +- .../linux/mail/preferences/applications.css | 2 +- mail/themes/linux/mail/preferences/dialog.css | 2 +- .../linux/mail/preferences/preferences.css | 2 +- .../themes/osx/mail/preferences/applications.css | 2 +- mail/themes/osx/mail/preferences/dialog.css | 2 +- mail/themes/osx/mail/preferences/preferences.css | 2 +- mail/themes/shared/jar.inc.mn | 16 ++++++++-------- mail/themes/shared/mail/accountCentral.css | 2 +- .../applications.css | 0 .../{incontentprefs => preferences}/calendar.svg | 0 .../{incontentprefs => preferences}/chat.svg | 0 .../{incontentprefs => preferences}/dialog.css | 0 .../{incontentprefs => preferences}/general.svg | 0 .../passwordmgr.css | 0 .../preferences.css | 8 ++++---- .../{incontentprefs => preferences}/security.svg | 0 .../windows/mail/preferences/applications.css | 2 +- mail/themes/windows/mail/preferences/dialog.css | 2 +- .../windows/mail/preferences/preferences.css | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename mail/themes/shared/mail/{incontentprefs => preferences}/applications.css (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/calendar.svg (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/chat.svg (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/dialog.css (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/general.svg (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/passwordmgr.css (100%) rename mail/themes/shared/mail/{incontentprefs => preferences}/preferences.css (97%) rename mail/themes/shared/mail/{incontentprefs => preferences}/security.svg (100%) diff --git a/calendar/base/themes/common/lightning-toolbar.css b/calendar/base/themes/common/lightning-toolbar.css index 58f683b961..fd1aa21a2a 100644 --- a/calendar/base/themes/common/lightning-toolbar.css +++ b/calendar/base/themes/common/lightning-toolbar.css @@ -4,7 +4,7 @@ /* 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 */ diff --git a/calendar/base/themes/common/lightning.css b/calendar/base/themes/common/lightning.css index 92b6a5b3c1..9955e4af1e 100644 --- a/calendar/base/themes/common/lightning.css +++ b/calendar/base/themes/common/lightning.css @@ -10,7 +10,7 @@ /* ::: 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; } @@ -23,7 +23,7 @@ /* ::: 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; } diff --git a/mail/components/preferences/passwordManager.xhtml b/mail/components/preferences/passwordManager.xhtml index ca64d33ed5..da47572559 100644 --- a/mail/components/preferences/passwordManager.xhtml +++ b/mail/components/preferences/passwordManager.xhtml @@ -4,7 +4,7 @@ - file, You can obtain one at https://mozilla.org/MPL/2.0/. --> - + * { font-size: 1.05em; diff --git a/mail/themes/linux/mail/preferences/preferences.css b/mail/themes/linux/mail/preferences/preferences.css index b281e04701..3656a6970b 100644 --- a/mail/themes/linux/mail/preferences/preferences.css +++ b/mail/themes/linux/mail/preferences/preferences.css @@ -2,7 +2,7 @@ * 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, diff --git a/mail/themes/osx/mail/preferences/applications.css b/mail/themes/osx/mail/preferences/applications.css index ef1e6fb101..fe115db36d 100644 --- a/mail/themes/osx/mail/preferences/applications.css +++ b/mail/themes/osx/mail/preferences/applications.css @@ -2,7 +2,7 @@ * 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. diff --git a/mail/themes/osx/mail/preferences/dialog.css b/mail/themes/osx/mail/preferences/dialog.css index bccb9a1094..9740d6b4e2 100644 --- a/mail/themes/osx/mail/preferences/dialog.css +++ b/mail/themes/osx/mail/preferences/dialog.css @@ -2,7 +2,7 @@ - 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; diff --git a/mail/themes/osx/mail/preferences/preferences.css b/mail/themes/osx/mail/preferences/preferences.css index a09140a929..b57f88d64d 100644 --- a/mail/themes/osx/mail/preferences/preferences.css +++ b/mail/themes/osx/mail/preferences/preferences.css @@ -2,7 +2,7 @@ * 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, diff --git a/mail/themes/shared/jar.inc.mn b/mail/themes/shared/jar.inc.mn index e017ceac24..cf02d970fe 100644 --- a/mail/themes/shared/jar.inc.mn +++ b/mail/themes/shared/jar.inc.mn @@ -136,14 +136,14 @@ 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) diff --git a/mail/themes/shared/mail/accountCentral.css b/mail/themes/shared/mail/accountCentral.css index 6a2ae57f74..cbe33fdf2e 100644 --- a/mail/themes/shared/mail/accountCentral.css +++ b/mail/themes/shared/mail/accountCentral.css @@ -321,7 +321,7 @@ aside.settings-btn-container { } #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 { diff --git a/mail/themes/shared/mail/incontentprefs/applications.css b/mail/themes/shared/mail/preferences/applications.css similarity index 100% rename from mail/themes/shared/mail/incontentprefs/applications.css rename to mail/themes/shared/mail/preferences/applications.css diff --git a/mail/themes/shared/mail/incontentprefs/calendar.svg b/mail/themes/shared/mail/preferences/calendar.svg similarity index 100% rename from mail/themes/shared/mail/incontentprefs/calendar.svg rename to mail/themes/shared/mail/preferences/calendar.svg diff --git a/mail/themes/shared/mail/incontentprefs/chat.svg b/mail/themes/shared/mail/preferences/chat.svg similarity index 100% rename from mail/themes/shared/mail/incontentprefs/chat.svg rename to mail/themes/shared/mail/preferences/chat.svg diff --git a/mail/themes/shared/mail/incontentprefs/dialog.css b/mail/themes/shared/mail/preferences/dialog.css similarity index 100% rename from mail/themes/shared/mail/incontentprefs/dialog.css rename to mail/themes/shared/mail/preferences/dialog.css diff --git a/mail/themes/shared/mail/incontentprefs/general.svg b/mail/themes/shared/mail/preferences/general.svg similarity index 100% rename from mail/themes/shared/mail/incontentprefs/general.svg rename to mail/themes/shared/mail/preferences/general.svg diff --git a/mail/themes/shared/mail/incontentprefs/passwordmgr.css b/mail/themes/shared/mail/preferences/passwordmgr.css similarity index 100% rename from mail/themes/shared/mail/incontentprefs/passwordmgr.css rename to mail/themes/shared/mail/preferences/passwordmgr.css diff --git a/mail/themes/shared/mail/incontentprefs/preferences.css b/mail/themes/shared/mail/preferences/preferences.css similarity index 97% rename from mail/themes/shared/mail/incontentprefs/preferences.css rename to mail/themes/shared/mail/preferences/preferences.css index b4c349cb9c..54fcde29e2 100644 --- a/mail/themes/shared/mail/incontentprefs/preferences.css +++ b/mail/themes/shared/mail/preferences/preferences.css @@ -231,11 +231,11 @@ radio[pane][selected] > .radio-check { } 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 { @@ -243,11 +243,11 @@ radio[pane=paneCompose] > .radio-check { } 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"] { diff --git a/mail/themes/shared/mail/incontentprefs/security.svg b/mail/themes/shared/mail/preferences/security.svg similarity index 100% rename from mail/themes/shared/mail/incontentprefs/security.svg rename to mail/themes/shared/mail/preferences/security.svg diff --git a/mail/themes/windows/mail/preferences/applications.css b/mail/themes/windows/mail/preferences/applications.css index 53898dbfa3..5944be7d7b 100644 --- a/mail/themes/windows/mail/preferences/applications.css +++ b/mail/themes/windows/mail/preferences/applications.css @@ -2,7 +2,7 @@ * 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. diff --git a/mail/themes/windows/mail/preferences/dialog.css b/mail/themes/windows/mail/preferences/dialog.css index a8848ad60b..f3c4f393d6 100644 --- a/mail/themes/windows/mail/preferences/dialog.css +++ b/mail/themes/windows/mail/preferences/dialog.css @@ -2,7 +2,7 @@ - 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; diff --git a/mail/themes/windows/mail/preferences/preferences.css b/mail/themes/windows/mail/preferences/preferences.css index 1f1bd457ee..d7ad7d3c16 100644 --- a/mail/themes/windows/mail/preferences/preferences.css +++ b/mail/themes/windows/mail/preferences/preferences.css @@ -2,7 +2,7 @@ * 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,