From f620f94dee99ce15aab05b4cc15cbadd57bc5658 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 7 Oct 2011 22:12:27 +0200 Subject: [PATCH 1/1] adopt both themes for changes affecting add-ons manager between Mozilla 6 and 7 --- EarlyBlue/global/inContentUI.css | 55 +++++++++++++++++++ EarlyBlue/mozapps/extensions/extensions.css | 58 +++++++++++++-------- LCARStrek/global/inContentUI.css | 55 +++++++++++++++++++ LCARStrek/mozapps/extensions/extensions.css | 58 +++++++++++++-------- 4 files changed, 182 insertions(+), 44 deletions(-) create mode 100644 EarlyBlue/global/inContentUI.css create mode 100644 LCARStrek/global/inContentUI.css diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css new file mode 100644 index 00000000..bc87a6e2 --- /dev/null +++ b/EarlyBlue/global/inContentUI.css @@ -0,0 +1,55 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is In-Content UI. + * + * The Initial Developer of the Original Code is + * the Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Blair McBride + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* Page background */ +:root { + background-color: #CCD0DD; + color: #000000; + margin: 20px; +} + +/* Content */ +.main-content { + /* Needed to allow the radius to clip the inner content, see bug 595656 */ + /* Disabled because of bug 623615 + overflow: hidden; + */ + background-color: #FFFFFF; + border: 1px solid #666699; +} diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index f650d2dc..77dab190 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -35,22 +35,9 @@ * * ***** END LICENSE BLOCK ***** */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -#addons-page { - background-color: #CCD0DD; - color: #000000; - margin: 20px; -} +@import url("chrome://global/skin/inContentUI.css"); -#view-port-container { - /* Needed to allow the radius to clip the inner content, see bug 595656 */ - /* Disabled because of bug 623615 - overflow: hidden; - */ - background-color: #FFFFFF; - border: 1px solid #666699; -} +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .nav-button { list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); @@ -814,19 +801,22 @@ margin-bottom: 2em; } +#detail-grid > columns > column:first-child { + max-width: 25em; +} + .detail-row[first-row="true"], -.detail-row-complex[first-row="true"] { +.detail-row-complex[first-row="true"], +setting[first-row="true"] { border-top: none; } .detail-row, -.detail-row-complex { +.detail-row-complex, +setting { border-top: 1px solid #808080; -moz-box-align: center; -} - -.detail-row-value { - -moz-margin-start: 0; + min-height: 30px; } #detail-controls { @@ -837,6 +827,25 @@ /* background-color: foo; */ } +setting[first-row="true"] { + margin-top: 2em; +} + +.preferences-description { + font-size: 90.9%; + color: #808080; + margin-top: -2px; + -moz-margin-start: 2em; +} + +setting[type="string"] > .setting-input > textbox { + -moz-box-flex: 1; +} + +menulist { /* Fixes some styling inconsistencies */ + margin: 1px 5px 2px 5px; +} + /*** creator ***/ .creator > label { @@ -853,7 +862,6 @@ /*** rating ***/ .meta-rating { - -moz-margin-start: 0; -moz-margin-end: 0; padding-top: 2px; } @@ -983,6 +991,12 @@ display: none; } +setting[type="color"] colorpicker[type="button"] { +/* margin: 1px 5px 2px 5px; + padding: 3px; + height: 25px; */ +} + .button-link { background: transparent; border: none; diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css new file mode 100644 index 00000000..c43074ae --- /dev/null +++ b/LCARStrek/global/inContentUI.css @@ -0,0 +1,55 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is In-Content UI. + * + * The Initial Developer of the Original Code is + * the Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Blair McBride + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* Page background */ +:root { + background-color: #000000; + color: #FF9F00; + margin: 20px; +} + +/* Content */ +.main-content { + /* Needed to allow the radius to clip the inner content, see bug 595656 */ + /* Disabled because of bug 623615 + overflow: hidden; + */ + border: 1px solid #9C9CFF; + border-radius: 5px; +} diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 9e5a783a..254c07eb 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -35,22 +35,9 @@ * * ***** END LICENSE BLOCK ***** */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@import url("chrome://global/skin/inContentUI.css"); -#addons-page { - background-color: #000000; - color: #FF9F00; - margin: 20px; -} - -#view-port-container { - /* Needed to allow the radius to clip the inner content, see bug 595656 */ - /* Disabled because of bug 623615 - overflow: hidden; - */ - border: 1px solid #9C9CFF; - border-radius: 5px; -} +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .nav-button { list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); @@ -861,19 +848,22 @@ margin-bottom: 2em; } +#detail-grid > columns > column:first-child { + max-width: 25em; +} + .detail-row[first-row="true"], -.detail-row-complex[first-row="true"] { +.detail-row-complex[first-row="true"], +setting[first-row="true"] { border-top: none; } .detail-row, -.detail-row-complex { +.detail-row-complex, +setting { border-top: 1px solid #9C9CFF; -moz-box-align: center; -} - -.detail-row-value { - -moz-margin-start: 0; + min-height: 30px; } #detail-controls { @@ -884,6 +874,25 @@ /* background-color: foo; */ } +setting[first-row="true"] { + margin-top: 2em; +} + +.preferences-description { + font-size: 90.9%; + color: #808080; + margin-top: -2px; + -moz-margin-start: 2em; +} + +setting[type="string"] > .setting-input > textbox { + -moz-box-flex: 1; +} + +menulist { /* Fixes some styling inconsistencies */ + margin: 1px 5px 2px 5px; +} + /*** creator ***/ .creator > label { @@ -899,7 +908,6 @@ /*** rating ***/ .meta-rating { - -moz-margin-start: 0; -moz-margin-end: 0; padding-top: 2px; } @@ -1031,6 +1039,12 @@ display: none; } +setting[type="color"] colorpicker[type="button"] { +/* margin: 1px 5px 2px 5px; + padding: 3px; + height: 25px; */ +} + .button-link { background: transparent; border: none; -- 2.35.3