From 9b5fa0c78c780ad69c4730a400f8c1d74df35764 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Fri, 5 Sep 2014 15:14:27 +0200 Subject: [PATCH] Bug 1035536 - move CSS to themes directory, r=dao --HG-- rename : browser/base/content/aboutneterror/netError.xhtml => browser/base/content/aboutNetError.xhtml rename : browser/base/content/aboutneterror/info.svg => browser/themes/shared/aboutNetError_info.svg extra : rebase_source : c78b55b877ded23ad05aa942ab7983516a688cd8 --- .../netError.xhtml => aboutNetError.xhtml} | 1 - .../base/content/aboutneterror/netError.css | 69 ------------------ browser/base/jar.mn | 6 +- browser/themes/linux/jar.mn | 1 + browser/themes/osx/jar.mn | 1 + browser/themes/shared/aboutNetError.css | 70 ++++++++++++++++++- .../shared/aboutNetError_info.svg} | 0 browser/themes/windows/jar.mn | 2 + 8 files changed, 75 insertions(+), 75 deletions(-) rename browser/base/content/{aboutneterror/netError.xhtml => aboutNetError.xhtml} (99%) delete mode 100644 browser/base/content/aboutneterror/netError.css rename browser/{base/content/aboutneterror/info.svg => themes/shared/aboutNetError_info.svg} (100%) diff --git a/browser/base/content/aboutneterror/netError.xhtml b/browser/base/content/aboutNetError.xhtml similarity index 99% rename from browser/base/content/aboutneterror/netError.xhtml rename to browser/base/content/aboutNetError.xhtml index e1f173f6d619..f7326af17759 100644 --- a/browser/base/content/aboutneterror/netError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -20,7 +20,6 @@ &loadError.label; - diff --git a/browser/base/content/aboutneterror/netError.css b/browser/base/content/aboutneterror/netError.css deleted file mode 100644 index 14b206b99547..000000000000 --- a/browser/base/content/aboutneterror/netError.css +++ /dev/null @@ -1,69 +0,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 http://mozilla.org/MPL/2.0/. */ - -@import url("chrome://global/skin/in-content/common.css"); - -body { - display: flex; - box-sizing: padding-box; - min-height: 100vh; - padding: 0 48px; - align-items: center; - justify-content: center; -} - -ul, ol { - margin: 0; - padding: 0; - -moz-margin-start: 1em; -} - -ul > li, ol > li { - margin-bottom: .5em; -} - -ul { - list-style: disc; -} - -#errorPageContainer { - min-width: 320px; - max-width: 512px; -} - -#errorTitleText { - background: url("info.svg") left 0 no-repeat; - background-size: 1.2em; - -moz-margin-start: -2em; - -moz-padding-start: 2em; -} - -#errorTitleText:-moz-dir(rtl) { - background-position: right 0; -} - -#errorTryAgain { - margin-top: 1.2em; - min-width: 150px -} - -#errorContainer { - display: none; -} - -@media (max-width: 675px) { - #errorTitleText { - padding-top: 0; - background-image: none; - -moz-padding-start: 0; - -moz-margin-start: 0; - } -} - -/* Pressing the retry button will cause the cursor to flicker from a pointer to - * not-allowed. Override the disabled cursor behaviour since we will never show - * the button disabled as the initial state. */ -button:disabled { - cursor: pointer; -} diff --git a/browser/base/jar.mn b/browser/base/jar.mn index d3e57a695f4f..373b196b342c 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -46,9 +46,7 @@ browser.jar: content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) - content/browser/aboutneterror/netError.xhtml (content/aboutneterror/netError.xhtml) - content/browser/aboutneterror/netError.css (content/aboutneterror/netError.css) - content/browser/aboutneterror/info.svg (content/aboutneterror/info.svg) + content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) #ifdef MOZ_SERVICES_HEALTHREPORT content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) @@ -175,4 +173,4 @@ browser.jar: % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul #endif -% override chrome://global/content/netError.xhtml chrome://browser/content/aboutneterror/netError.xhtml +% override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index e60fd8d1ccb0..faba4c43bbda 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -14,6 +14,7 @@ browser.jar: skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/browser/aboutCertError_sectionExpanded.png skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) + skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg) skin/classic/browser/aboutSocialError.css #ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index ca4733382d0b..25abe78e440c 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -6,6 +6,7 @@ browser.jar: % skin browser classic/1.0 %skin/classic/browser/ skin/classic/browser/sanitizeDialog.css (sanitizeDialog.css) skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) + skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg) * skin/classic/browser/aboutSessionRestore.css (aboutSessionRestore.css) skin/classic/browser/aboutSessionRestore-window-icon.png skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css) diff --git a/browser/themes/shared/aboutNetError.css b/browser/themes/shared/aboutNetError.css index 66c2acfc468a..71da6fbf7956 100644 --- a/browser/themes/shared/aboutNetError.css +++ b/browser/themes/shared/aboutNetError.css @@ -1 +1,69 @@ -/* This deliberately left empty for themes to use/override. */ +/* 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://global/skin/in-content/common.css"); + +body { + display: flex; + box-sizing: padding-box; + min-height: 100vh; + padding: 0 48px; + align-items: center; + justify-content: center; +} + +ul, ol { + margin: 0; + padding: 0; + -moz-margin-start: 1em; +} + +ul > li, ol > li { + margin-bottom: .5em; +} + +ul { + list-style: disc; +} + +#errorPageContainer { + min-width: 320px; + max-width: 512px; +} + +#errorTitleText { + background: url("aboutNetError_info.svg") left 0 no-repeat; + background-size: 1.2em; + -moz-margin-start: -2em; + -moz-padding-start: 2em; +} + +#errorTitleText:-moz-dir(rtl) { + background-position: right 0; +} + +#errorTryAgain { + margin-top: 1.2em; + min-width: 150px +} + +#errorContainer { + display: none; +} + +@media (max-width: 675px) { + #errorTitleText { + padding-top: 0; + background-image: none; + -moz-padding-start: 0; + -moz-margin-start: 0; + } +} + +/* Pressing the retry button will cause the cursor to flicker from a pointer to + * not-allowed. Override the disabled cursor behaviour since we will never show + * the button disabled as the initial state. */ +button:disabled { + cursor: pointer; +} diff --git a/browser/base/content/aboutneterror/info.svg b/browser/themes/shared/aboutNetError_info.svg similarity index 100% rename from browser/base/content/aboutneterror/info.svg rename to browser/themes/shared/aboutNetError_info.svg diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index a9f3825ae9b4..19b72ad38e61 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -16,6 +16,7 @@ browser.jar: skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/browser/aboutCertError_sectionExpanded.png skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) + skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg) skin/classic/browser/aboutSocialError.css #ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css @@ -430,6 +431,7 @@ browser.jar: skin/classic/aero/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/aero/browser/aboutCertError_sectionExpanded.png skin/classic/aero/browser/aboutNetError.css (../shared/aboutNetError.css) + skin/classic/aero/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg) skin/classic/aero/browser/aboutSocialError.css #ifdef MOZ_SERVICES_SYNC skin/classic/aero/browser/aboutSyncTabs.css