From a520cde0b1bf896f93a5aa053a0478b49bc92ae0 Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Wed, 7 Oct 2015 13:01:12 -0700 Subject: [PATCH] Bug 1212456 - Merge platform-specific aboutCertError.css files into a single shared file;r=paolo --HG-- rename : browser/themes/osx/aboutCertError.css => browser/themes/shared/aboutCertError.css extra : commitid : 8E8FNpzEX7I --- browser/themes/linux/jar.mn | 1 - browser/themes/osx/aboutCertError.css | 72 ------------------- browser/themes/osx/jar.mn | 1 - .../{linux => shared}/aboutCertError.css | 0 browser/themes/shared/jar.inc.mn | 1 + browser/themes/windows/aboutCertError.css | 72 ------------------- browser/themes/windows/jar.mn | 1 - 7 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 browser/themes/osx/aboutCertError.css rename browser/themes/{linux => shared}/aboutCertError.css (100%) delete mode 100644 browser/themes/windows/aboutCertError.css diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 77e9a00dbf05..f915ed2490ba 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -8,7 +8,6 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png - skin/classic/browser/aboutCertError.css skin/classic/browser/aboutCertError_sectionCollapsed.png skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/browser/aboutCertError_sectionExpanded.png diff --git a/browser/themes/osx/aboutCertError.css b/browser/themes/osx/aboutCertError.css deleted file mode 100644 index c7caf531e875..000000000000 --- a/browser/themes/osx/aboutCertError.css +++ /dev/null @@ -1,72 +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/. */ - - -html { - background: -moz-Dialog; -} - -body { - margin: 0; - padding: 0 1em; - color: -moz-FieldText; - font: message-box; -} - -h1 { - margin: 0 0 .6em 0; - border-bottom: 1px solid ThreeDLightShadow; - font-size: 160%; -} - -h2 { - font-size: 130%; -} - -#errorPageContainer { - position: relative; - min-width: 13em; - max-width: 52em; - margin: 4em auto; - border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */ - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; - background-origin: content-box; -} - -#errorPageContainer:-moz-dir(rtl) { - background-position: right 0; -} - -#errorTitle { - -moz-margin-start: 80px; -} - -#errorLongContent { - -moz-margin-start: 80px; -} - -.expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; - background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; - border: none; - font: inherit; - color: inherit; - cursor: pointer; -} - -.expander > button:-moz-dir(rtl) { - background-position: right center; -} - -.expander[collapsed] > button { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png"); -} - -.expander[collapsed] > button:-moz-dir(rtl) { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png"); -} diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index df9f8c2f8c92..ee9ea6eb0d30 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -7,7 +7,6 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png - skin/classic/browser/aboutCertError.css skin/classic/browser/aboutCertError_sectionCollapsed.png skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/browser/aboutCertError_sectionExpanded.png diff --git a/browser/themes/linux/aboutCertError.css b/browser/themes/shared/aboutCertError.css similarity index 100% rename from browser/themes/linux/aboutCertError.css rename to browser/themes/shared/aboutCertError.css diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 44bed3c76da4..12470b12db69 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -7,6 +7,7 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. + skin/classic/browser/aboutCertError.css (../shared/aboutCertError.css) skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg) skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg) diff --git a/browser/themes/windows/aboutCertError.css b/browser/themes/windows/aboutCertError.css deleted file mode 100644 index c7caf531e875..000000000000 --- a/browser/themes/windows/aboutCertError.css +++ /dev/null @@ -1,72 +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/. */ - - -html { - background: -moz-Dialog; -} - -body { - margin: 0; - padding: 0 1em; - color: -moz-FieldText; - font: message-box; -} - -h1 { - margin: 0 0 .6em 0; - border-bottom: 1px solid ThreeDLightShadow; - font-size: 160%; -} - -h2 { - font-size: 130%; -} - -#errorPageContainer { - position: relative; - min-width: 13em; - max-width: 52em; - margin: 4em auto; - border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */ - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; - background-origin: content-box; -} - -#errorPageContainer:-moz-dir(rtl) { - background-position: right 0; -} - -#errorTitle { - -moz-margin-start: 80px; -} - -#errorLongContent { - -moz-margin-start: 80px; -} - -.expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; - background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; - border: none; - font: inherit; - color: inherit; - cursor: pointer; -} - -.expander > button:-moz-dir(rtl) { - background-position: right center; -} - -.expander[collapsed] > button { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png"); -} - -.expander[collapsed] > button:-moz-dir(rtl) { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png"); -} diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index b9377adbf03f..f8411dc00b5a 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -7,7 +7,6 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png - skin/classic/browser/aboutCertError.css skin/classic/browser/aboutCertError_sectionCollapsed.png skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png skin/classic/browser/aboutCertError_sectionExpanded.png