Bug 605332 - Don't duplicate most of popup.css in popup-aero.css. r=enn a=dolske
authorDão Gottwald <dao@mozilla.com>
Wed, 20 Oct 2010 09:24:44 +0200
changeset 56165 7aa9763e9d4151e71275ebf0f8b81dc1bd7ff4f3
parent 56164 b69aa5ff29d384c4650a173ede050fe5d16135d1
child 56166 1ee0a08900854d7b27dc3789fec3e8a982c6fb64
push id16431
push userdgottwald@mozilla.com
push dateWed, 20 Oct 2010 07:25:21 +0000
treeherdermozilla-central@7aa9763e9d41 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenn, dolske
bugs605332
milestone2.0b8pre
first release with
nightly linux32
7aa9763e9d41 / 4.0b8pre / 20101020030623 / files
nightly linux64
7aa9763e9d41 / 4.0b8pre / 20101020031002 / files
nightly mac
7aa9763e9d41 / 4.0b8pre / 20101020030403 / files
nightly win32
7aa9763e9d41 / 4.0b8pre / 20101020042802 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 605332 - Don't duplicate most of popup.css in popup-aero.css. r=enn a=dolske
toolkit/themes/winstripe/global/jar.mn
toolkit/themes/winstripe/global/popup-aero.css
toolkit/themes/winstripe/global/popup.css
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -30,17 +30,17 @@ toolkit.jar:
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
 *       skin/classic/global/menu.css
         skin/classic/global/menulist.css
         skin/classic/global/netError.css
         skin/classic/global/numberbox.css
         skin/classic/global/notification.css
         skin/classic/global/passwordmgr.css
-        skin/classic/global/popup.css
+*       skin/classic/global/popup.css
         skin/classic/global/preferences.css
         skin/classic/global/printPageSetup.css
         skin/classic/global/printPreview.css
         skin/classic/global/progressmeter.css
         skin/classic/global/radio.css
         skin/classic/global/resizer.css
         skin/classic/global/richlistbox.css
 *       skin/classic/global/scale.css
@@ -202,17 +202,17 @@ toolkit.jar:
         skin/classic/aero/global/linkTree.css
         skin/classic/aero/global/listbox.css
 *       skin/classic/aero/global/menu.css                                (menu-aero.css)
 *       skin/classic/aero/global/menulist.css                            (menulist-aero.css)
         skin/classic/aero/global/netError.css
         skin/classic/aero/global/numberbox.css
         skin/classic/aero/global/notification.css
         skin/classic/aero/global/passwordmgr.css
-        skin/classic/aero/global/popup.css                               (popup-aero.css)
+*       skin/classic/aero/global/popup.css                               (popup-aero.css)
         skin/classic/aero/global/preferences.css
         skin/classic/aero/global/printPageSetup.css
         skin/classic/aero/global/printPreview.css
         skin/classic/aero/global/progressmeter.css
         skin/classic/aero/global/radio.css
         skin/classic/aero/global/resizer.css
         skin/classic/aero/global/richlistbox.css
 *       skin/classic/aero/global/scale.css
--- a/toolkit/themes/winstripe/global/popup-aero.css
+++ b/toolkit/themes/winstripe/global/popup-aero.css
@@ -1,151 +1,3 @@
-/* ***** 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 Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *
- * 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");
-
-/* ::::: menupopup ::::: */
-
-menupopup,
-panel {
-  border: 3px solid transparent;
-  -moz-border-top-colors   : ThreeDLightShadow ThreeDHighlight ThreeDFace;
-  -moz-border-left-colors  : ThreeDLightShadow ThreeDHighlight ThreeDFace;
-  -moz-border-right-colors : ThreeDDarkShadow  ThreeDShadow    ThreeDFace;
-  -moz-border-bottom-colors: ThreeDDarkShadow  ThreeDShadow    ThreeDFace;
-  padding: 0px;
-  min-width: 1px;
-  background: Menu;
-  color: MenuText;
-}
-
-menupopup {
-  -moz-appearance: menupopup;
-}
-
-menupopup > menu > menupopup {
- /* align submenus */
-  -moz-margin-start: -3px;
-  margin-top: -3px;
-}
-
-panel[type="arrow"] {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  -moz-transition: opacity 300ms;
-}
-
-.panel-arrowcontent {
-  border-radius: 6px;
-  background-color: rgba(179,230,255,.35);
-  background-image: -moz-linear-gradient(rgba(250,253,255,.9), rgba(250,253,255,.75) 20px, rgba(250,253,255,.70) 39px, rgba(250,253,255,0) 41px, rgba(250,253,255,0));
-  margin: 5px;
-  box-shadow: 0 0 0 1px rgba(255,255,255,.65) inset,
-              0 1px 0 rgba(255,255,255,.3) inset,
-              0 0 0 1px rgba(0,0,0,.75),
-              0 1px 3px 2px rgba(0,0,0,.65);
-}
-
-.panel-inner-arrowcontent {
-  background-color: rgba(250,250,250,.95);
-  background-clip: padding-box;
-  margin: 4px;
-  border: 2px solid;
-  -moz-border-radius: 2px;
-  -moz-border-top-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
-  -moz-border-left-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
-  -moz-border-bottom-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
-  -moz-border-right-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
-  padding: 6px;
-}
-
-.panel-arrow[side="top"] {
-  list-style-image: url("chrome://global/skin/arrow/panelarrow-up.png");
-  margin-bottom: -5px;
-}
-
-.panel-arrow[side="bottom"] {
-  list-style-image: url("chrome://global/skin/arrow/panelarrow-down.png");
-  margin-top: -5px;
-}
-
-.panel-arrow[side="left"] {
-  list-style-image: url("chrome://global/skin/arrow/panelarrow-horiz.png");
-  margin-right: -5px;
-}
-
-.panel-arrow[side="right"] {
-  list-style-image: url("chrome://global/skin/arrow/panelarrow-horiz.png");
-  -moz-transform: scaleX(-1);
-  margin-left: -5px;
-}
-
-/* ::::: tooltip ::::: */
-
-tooltip {
-  -moz-appearance: tooltip;
-  margin-top: 21px;
-  border: 1px solid InfoText;
-  padding: 2px 3px;
-  max-width: 40em;
-  background-color: InfoBackground;
-  color: InfoText;
-  font: message-box;
-}
-
-tooltip[titletip="true"] {
- /* See bug 32157 comment 128
-  * margin: -2px 0px 0px -3px;
-  */
-  max-width: none;
-}
-
-/* rules for popups associated with menulists */
-
-menulist > menupopup,
-.menulist-menupopup {
-  -moz-appearance: none;
-  border-width: 1px;
-  -moz-border-top-colors: -moz-FieldText;
-  -moz-border-right-colors: -moz-FieldText;
-  -moz-border-bottom-colors: -moz-FieldText;
-  -moz-border-left-colors: -moz-FieldText;
-  padding: 0px;
-  min-width: 0px;
-  background-color: -moz-Field;
-}
+%define WINSTRIPE_AERO
+%include popup.css
+%undef WINSTRIPE_AERO
--- a/toolkit/themes/winstripe/global/popup.css
+++ b/toolkit/themes/winstripe/global/popup.css
@@ -67,51 +67,92 @@ panel[type="arrow"] {
   -moz-appearance: none;
   background: transparent;
   border: none;
   -moz-transition: opacity 300ms;
 }
 
 .panel-arrowcontent {
   border-radius: 6px;
+%ifdef WINSTRIPE_AERO
+  background-color: rgba(179,230,255,.35);
+  background-image: -moz-linear-gradient(rgba(250,253,255,.9), rgba(250,253,255,.75) 20px, rgba(250,253,255,.70) 39px, rgba(250,253,255,0) 41px, rgba(250,253,255,0));
+  margin: 5px;
+  box-shadow: 0 0 0 1px rgba(255,255,255,.65) inset,
+              0 1px 0 rgba(255,255,255,.3) inset,
+              0 0 0 1px rgba(0,0,0,.75),
+              0 1px 3px 2px rgba(0,0,0,.65);
+%else
   background: -moz-linear-gradient(rgba(248,250,253,1), rgba(248,250,253,1) 20px, rgba(248,250,253,.97));
   padding: 6px;
   margin: 3px;
   box-shadow: 0 0 5px 1px rgba(184,205,232,1) inset,
               0 0 0 1px rgba(0,0,0,.25),
               0 1px 5px rgba(0,0,0,.5);
+%endif
 }
 
+%ifdef WINSTRIPE_AERO
+.panel-inner-arrowcontent {
+  background-color: rgba(250,250,250,.95);
+  background-clip: padding-box;
+  margin: 4px;
+  border: 2px solid;
+  -moz-border-radius: 2px;
+  -moz-border-top-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
+  -moz-border-left-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
+  -moz-border-bottom-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
+  -moz-border-right-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
+  padding: 6px;
+}
+%endif
+
 .panel-arrow[side="top"] {
   list-style-image: url("chrome://global/skin/arrow/panelarrow-up.png");
+%ifdef WINSTRIPE_AERO
+  margin-bottom: -5px;
+%else
   margin-left: 6px;
   margin-right: 6px;
   margin-bottom: -13px;
+%endif
 }
 
 .panel-arrow[side="bottom"] {
   list-style-image: url("chrome://global/skin/arrow/panelarrow-down.png");
+%ifdef WINSTRIPE_AERO
+  margin-top: -5px;
+%else
   margin-left: 6px;
   margin-right: 6px;
   margin-top: -12px;
+%endif
 }
 
 .panel-arrow[side="left"] {
   list-style-image: url("chrome://global/skin/arrow/panelarrow-horiz.png");
+%ifdef WINSTRIPE_AERO
+  margin-right: -5px;
+%else
   margin-top: 6px;
   margin-bottom: 6px;
   margin-right: -12px;
+%endif
 }
 
 .panel-arrow[side="right"] {
   list-style-image: url("chrome://global/skin/arrow/panelarrow-horiz.png");
   -moz-transform: scaleX(-1);
+%ifdef WINSTRIPE_AERO
+  margin-left: -5px;
+%else
   margin-top: 6px;
   margin-bottom: 6px;
   margin-left: -12px;
+%endif
 }
 
 /* ::::: tooltip ::::: */
 
 tooltip {
   -moz-appearance: tooltip;
   margin-top: 21px;
   border: 1px solid InfoText;