diff --git a/mozilla/toolkit/components/filepicker/skin/Filepicker.png b/mozilla/toolkit/components/filepicker/skin/Filepicker.png index d36cd761579..0fb22987695 100644 Binary files a/mozilla/toolkit/components/filepicker/skin/Filepicker.png and b/mozilla/toolkit/components/filepicker/skin/Filepicker.png differ diff --git a/mozilla/toolkit/skin/win/Preview.png b/mozilla/toolkit/skin/win/Preview.png index 06a368c2b09..9d41bc61f20 100644 Binary files a/mozilla/toolkit/skin/win/Preview.png and b/mozilla/toolkit/skin/win/Preview.png differ diff --git a/mozilla/toolkit/skin/win/browser.css b/mozilla/toolkit/skin/win/browser.css index aa76dd940f6..e8d10920c46 100644 --- a/mozilla/toolkit/skin/win/browser.css +++ b/mozilla/toolkit/skin/win/browser.css @@ -3,6 +3,7 @@ .tabbrowser-strip { border-bottom: 1px solid ThreeDShadow; + padding-bottom: 1px; } tabpanels { diff --git a/mozilla/toolkit/skin/win/global.css b/mozilla/toolkit/skin/win/global.css index 266f13d5b7b..0bd279ccd78 100644 --- a/mozilla/toolkit/skin/win/global.css +++ b/mozilla/toolkit/skin/win/global.css @@ -144,7 +144,6 @@ sidebarheader { height: 25px; background-color: -moz-Dialog; -moz-appearance: toolbox; - border-right: 1px solid ThreeDShadow; border-bottom: 1px solid ThreeDShadow; border-top: 1px solid ThreeDHighlight; } diff --git a/mozilla/toolkit/skin/win/icons/Landscape-small.png b/mozilla/toolkit/skin/win/icons/Landscape-small.png new file mode 100644 index 00000000000..f1ad7558e49 --- /dev/null +++ b/mozilla/toolkit/skin/win/icons/Landscape-small.png @@ -0,0 +1 @@ +‰PNG diff --git a/mozilla/toolkit/skin/win/icons/Landscape.png b/mozilla/toolkit/skin/win/icons/Landscape.png new file mode 100644 index 00000000000..f1ad7558e49 --- /dev/null +++ b/mozilla/toolkit/skin/win/icons/Landscape.png @@ -0,0 +1 @@ +‰PNG diff --git a/mozilla/toolkit/skin/win/icons/Portrait-small.png b/mozilla/toolkit/skin/win/icons/Portrait-small.png new file mode 100644 index 00000000000..f1ad7558e49 --- /dev/null +++ b/mozilla/toolkit/skin/win/icons/Portrait-small.png @@ -0,0 +1 @@ +‰PNG diff --git a/mozilla/toolkit/skin/win/icons/Portrait.png b/mozilla/toolkit/skin/win/icons/Portrait.png new file mode 100644 index 00000000000..f1ad7558e49 --- /dev/null +++ b/mozilla/toolkit/skin/win/icons/Portrait.png @@ -0,0 +1 @@ +‰PNG diff --git a/mozilla/toolkit/skin/win/jar.mn b/mozilla/toolkit/skin/win/jar.mn index 3983992f68a..9a538544535 100644 --- a/mozilla/toolkit/skin/win/jar.mn +++ b/mozilla/toolkit/skin/win/jar.mn @@ -13,6 +13,7 @@ classic.jar: + skin/classic/global/listbox.css + skin/classic/global/menulist.css + skin/classic/global/popup.css ++ skin/classic/communicator/printing.css + skin/classic/global/progressmeter.css + skin/classic/global/radio.css + skin/classic/global/scrollbars.css @@ -53,11 +54,15 @@ classic.jar: + skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) + skin/classic/global/icons/Error.png (icons/Error.png) + skin/classic/global/icons/folder-item.png (icons/folder-item.png) -+ skin/classic/global/icons/Loading.gif (icons/Loading.gif) ++ skin/classic/global/icons/Loading.gif (icons/Loading.gif) + skin/classic/global/icons/Message.png (icons/Message.png) + skin/classic/global/icons/Question.png (icons/Question.png) + skin/classic/global/icons/Warning.png (icons/Warning.png) + skin/classic/global/icons/close-button.gif (icons/close-button.gif) ++ skin/classic/global/icons/Landscape.png (icons/Landscape.png) ++ skin/classic/global/icons/Landscape-small.png (icons/Landscape-small.png) ++ skin/classic/global/icons/Portrait.png (icons/Portrait.png) ++ skin/classic/global/icons/Portrait-small.png (icons/Portrait-small.png) + skin/classic/global/menu/Menu-arrow-disabled.png (menu/Menu-arrow-disabled.png) + skin/classic/global/menu/Menu-arrow-hover.png (menu/Menu-arrow-hover.png) + skin/classic/global/menu/Menu-arrow.png (menu/Menu-arrow.png) diff --git a/mozilla/toolkit/skin/win/popup.css b/mozilla/toolkit/skin/win/popup.css index f3fac774184..47ac0a97c4a 100644 --- a/mozilla/toolkit/skin/win/popup.css +++ b/mozilla/toolkit/skin/win/popup.css @@ -31,8 +31,12 @@ menupopup, popup { - border: 1px solid ThreeDShadow; - padding: 2px; + border: 2px solid; + -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight; + -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight; + padding: 1px; min-width: 1px; background-color: Menu; } diff --git a/mozilla/toolkit/skin/win/printing.css b/mozilla/toolkit/skin/win/printing.css new file mode 100644 index 00000000000..d215caf58c4 --- /dev/null +++ b/mozilla/toolkit/skin/win/printing.css @@ -0,0 +1,108 @@ +/* ***** 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 the Mozilla Print Preview Toolbar. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corp. + * Portions created by the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Samir Gehani + * Bill Law + * + * 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 ***** */ + +/* ::::: print preview toolbar ::::: */ + +/* ..... page navigation ..... */ + +.home-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp-end.gif"); +} + +.end-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif"); +} + +.last-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); +} + +.next-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); +} + +/* ...... scale in/decrement ..... */ + +.up-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); +} + +.down-arrow { + list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); +} + +/* ..... orientation ..... */ +/* +.toolbar-portrait-page { + list-style-image: url("chrome://communicator/skin/icons/Portrait-small.png"); +} + +.toolbar-landscape-page { + list-style-image: url("chrome://communicator/skin/icons/Landscape-small.png"); +} +*/ +/* ::::: page setup dialog ::::: */ +/* +.portrait-page { + list-style-image: url("chrome://communicator/skin/icons/Portrait.png"); +} + +.landscape-page { + list-style-image: url("chrome://communicator/skin/icons/Landscape.png"); +} +*/ + +/* ..... orientation ..... */ + +.toolbar-portrait-page { + list-style-image: url("chrome://global/skin/icons/Portrait-small.png"); +} + +.toolbar-landscape-page { + list-style-image: url("chrome://global/skin/icons/Landscape-small.png"); +} + +/* ::::: page setup dialog ::::: */ + +.portrait-page { + list-style-image: url("chrome://global/skin/icons/Portrait.png"); +} + +.landscape-page { + list-style-image: url("chrome://global/skin/icons/Landscape.png"); +} diff --git a/mozilla/toolkit/skin/win/splitter.css b/mozilla/toolkit/skin/win/splitter.css index a9380b6d7ea..96a63f5c592 100644 --- a/mozilla/toolkit/skin/win/splitter.css +++ b/mozilla/toolkit/skin/win/splitter.css @@ -33,7 +33,11 @@ splitter { -moz-box-align: center; -moz-box-pack: center; cursor: e-resize; - min-width: 5px; + border-width: 0 2px; + border-style: solid; + -moz-border-left-colors: ThreeDShadow ThreeDHighlight; + -moz-border-right-colors: ThreeDDarkShadow ThreeDFace; + min-width: 6px; background-color: ThreeDFace; } @@ -41,10 +45,10 @@ splitter { splitter[orient="vertical"] { cursor: n-resize; - min-height: 8px; - border-width: 1px 0; - border-style: solid; - border-color: ThreeDShadow; + border-width: 2px 0; + -moz-border-top-colors: ThreeDShadow ThreeDHighlight; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDFace; + min-height: 6px; } /* ::::: splitter grippy ::::: */ diff --git a/mozilla/toolkit/skin/win/toolbar.css b/mozilla/toolkit/skin/win/toolbar.css index 744d05f12f9..c5f0e83896b 100644 --- a/mozilla/toolkit/skin/win/toolbar.css +++ b/mozilla/toolkit/skin/win/toolbar.css @@ -32,6 +32,9 @@ toolbox { -moz-appearance: toolbox; background-color: -moz-Dialog; + border-left: 1px solid ThreeDShadow; + border-top: 1px solid ThreeDShadow; + border-right: 1px solid ThreeDHighlight; } /* ::::: toolbar & menubar ::::: */ @@ -49,7 +52,8 @@ menubar { /* ::::: toolbar decorations ::::: */ toolbarseparator { - margin : 2px 0.2em 0 0.2em; + margin : 2px 0.2em; + border-right : 1px solid ThreeDHighlight; border-left : 1px solid ThreeDShadow; width : 2px; } diff --git a/mozilla/toolkit/skin/win/toolbarbutton.css b/mozilla/toolkit/skin/win/toolbarbutton.css index f1d727f13c2..1b4e798174d 100644 --- a/mozilla/toolkit/skin/win/toolbarbutton.css +++ b/mozilla/toolkit/skin/win/toolbarbutton.css @@ -34,7 +34,7 @@ toolbarbutton { -moz-box-align: center; -moz-box-pack: center; margin: 0; - border: 1px outset transparent; + border: 1px solid transparent; padding: 3px; background-color: transparent; color: -moz-DialogText; @@ -51,12 +51,12 @@ toolbarbutton { toolbarbutton:hover, toolbarbutton[buttonover="true"] { - border-color: ThreeDFace; + border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight; } toolbarbutton:hover:active, toolbarbutton[open="true"] { - border-style: inset; + border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; padding: 4px 2px 2px 4px; } @@ -72,8 +72,7 @@ toolbarbutton[disabled="true"][open="true"] { /* ..... checked state ..... */ toolbarbutton[checked="true"] { - border-style: inset !important; - border-color: ThreeDFace !important; + border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important; padding: 4px 2px 2px 4px !important; background-image: url("chrome://global/skin/toolbar/Lighten.png"); color: ButtonText !important; @@ -113,11 +112,6 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active { -moz-box-orient: vertical; } -.toolbarbutton-menubutton-button, -.toolbarbutton-menubutton-dropmarker { - border: 1px outset transparent; -} - /* .......... dropmarker .......... */ .toolbarbutton-menubutton-dropmarker { @@ -127,7 +121,6 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active { } .toolbarbutton-menubutton-dropmarker[disabled="true"] { - border: 1px solid transparent !important; padding: 0 0 1px 0 !important; list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") !important; }