From dfd3079265357d6685b1b83caa343c5529cdf834 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Sun, 29 Jul 2007 22:42:17 +0000 Subject: [PATCH] Move Modern's alert.css to where toolkit can find it b=390058 r=CTho git-svn-id: svn://10.0.0.236/trunk@231156 18797224-902f-48f8-a5cc-f745e15eee43 --- .../classic/communicator/alerts/alert.css | 96 ------------------- mozilla/themes/classic/jar.mn | 1 - .../{communicator => global}/alerts/alert.css | 0 mozilla/themes/modern/jar.mn | 2 +- 4 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 mozilla/themes/classic/communicator/alerts/alert.css rename mozilla/themes/modern/{communicator => global}/alerts/alert.css (100%) diff --git a/mozilla/themes/classic/communicator/alerts/alert.css b/mozilla/themes/classic/communicator/alerts/alert.css deleted file mode 100644 index 498b9fe8b15..00000000000 --- a/mozilla/themes/classic/communicator/alerts/alert.css +++ /dev/null @@ -1,96 +0,0 @@ -/* ***** 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Scott MacGregor - * - * Alternatively, the contents of this file may be used under the terms of - * either of 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 ***** */ - -/* ===== alert.css ===================================================== - == Styles specific to the alerts dialog. - ======================================================================= */ - -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -.alertBox { - border-right: 2px solid #7B969C; - border-bottom: 2px solid #7B969C; - border-top: 2px solid #7B969C; - border-left: 2px solid #7B969C; - background-color: -moz-Dialog; - min-height: 50px; -} - -.alertBox[orient="horizontal"] > .alertImageBox { - -moz-margin-start: 4px; - -moz-margin-end: 6px; - min-height: 46px; -} - -.alertBox[orient="vertical"] > .alertImageBox { - margin-top: 6px; - margin-bottom: 4px; - min-width: 46px; -} - -.alertTitle { - font-weight: bold; -} - -.alertText { - -moz-margin-end: 6px; -} - -.alertText[clickable="true"] { - cursor: pointer; - color: #1455D6; - text-decoration: underline; -} - -.alertText[clickable="true"]:hover:active { - color: #424F63; -} - -.alertBox[orient="horizontal"] > .alertTextBox -{ - -moz-padding-start: 10px; - padding-top: 5px; -} - -.alertBox[orient="vertical"] > .alertTextBox { - -moz-padding-start: 5px; - -moz-padding-end: 5px; - margin-bottom: 8px; - -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */ -} diff --git a/mozilla/themes/classic/jar.mn b/mozilla/themes/classic/jar.mn index 9a10dfab5f1..b97495354ec 100644 --- a/mozilla/themes/classic/jar.mn +++ b/mozilla/themes/classic/jar.mn @@ -112,7 +112,6 @@ classic.jar: skin/classic/communicator/taskbar/composer.gif (communicator/taskbar/composer.gif) skin/classic/communicator/taskbar/composer-16.gif (communicator/taskbar/composer-16.gif) skin/classic/communicator/taskbar/addressbook-hov.gif (communicator/taskbar/addressbook-hov.gif) - skin/classic/communicator/alerts/alert.css (communicator/alerts/alert.css) #ifdef XP_MACOSX skin/classic/communicator/toolbar.css (communicator/mac/toolbar.css) #elif XP_OS2 diff --git a/mozilla/themes/modern/communicator/alerts/alert.css b/mozilla/themes/modern/global/alerts/alert.css similarity index 100% rename from mozilla/themes/modern/communicator/alerts/alert.css rename to mozilla/themes/modern/global/alerts/alert.css diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn index 91bc0522711..8cb33cb410c 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -80,7 +80,6 @@ modern.jar: skin/modern/communicator/search/internetresults.css (communicator/search/internetresults.css) skin/modern/communicator/search/search-editor.css (communicator/search/search-editor.css) skin/modern/communicator/search/search.css (communicator/search/search.css) - skin/modern/communicator/alerts/alert.css (communicator/alerts/alert.css) skin/modern/communicator/sidebar/sidebarBindings.xml (communicator/sidebar/sidebarBindings.xml) skin/modern/communicator/sidebar/sbar-top.gif (communicator/sidebar/sbar-top.gif) skin/modern/communicator/sidebar/sbar-top-tabopen.gif (communicator/sidebar/sbar-top-tabopen.gif) @@ -192,6 +191,7 @@ modern.jar: # referenced as chrome://global/skin/xulscrollbars.css on non-Mac platforms skin/modern/global/xulscrollbars.css (global/scrollbars.css) skin/modern/global/scrollbars-mini.css (global/scrollbars-mini.css) + skin/modern/global/alerts/alert.css (global/alerts/alert.css) skin/modern/global/arrow/arrow-dn-dis.gif (global/arrow/arrow-dn-dis.gif) skin/modern/global/arrow/arrow-dn.gif (global/arrow/arrow-dn.gif) skin/modern/global/arrow/arrow-lft-dis.gif (global/arrow/arrow-lft-dis.gif)