From 530bbdff5cfdd00d558dbd67694f7c2611095d6c Mon Sep 17 00:00:00 2001
From: "mconnor%myrealbox.com" <mconnor%myrealbox.com>
Date: Tue, 6 Jul 2004 15:00:10 +0000
Subject: [PATCH] fix checkin of new gnomestripe files and missed browser file

---
 browser/themes/winstripe/browser/browser.css  |   8 --
 toolkit/themes/gnomestripe/global/button.css  | 108 ++++++++++++------
 .../gnomestripe/global/toolbarbutton.css      |  69 ++++++-----
 3 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index b04d522bcdb2..4d6e4ab39536 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -53,7 +53,6 @@ toolbarbutton.bookmark-item {
   min-width: 0;
   max-width: 13em;
   padding: 2px 3px;
-  color: -moz-DialogText !important;
 }
 
 toolbarbutton.bookmark-item:hover:active,
@@ -169,13 +168,6 @@ menuitem.bookmark-item {
   padding: 0px !important;
 }
 
-toolbarbutton:not([disabled="true"]):hover,
-menubutton:not([disabled="true"]):hover,
-toolbarbutton:not([disabled="true"]):hover:active,
-menubutton:not([disabled="true"]):hover:active {
-  color: ButtonText !important;
-}
-
 .toolbarbutton-menubutton-stack,
 .toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-stack:hover,
diff --git a/toolkit/themes/gnomestripe/global/button.css b/toolkit/themes/gnomestripe/global/button.css
index 33af1bf07e69..0b82a744c923 100644
--- a/toolkit/themes/gnomestripe/global/button.css
+++ b/toolkit/themes/gnomestripe/global/button.css
@@ -19,7 +19,6 @@
  *
  * Contributor(s):
  *   Joe Hewitt (hewitt@netscape.com)
- *   Kevin Gerich (webmail@kmgerich.com)
  */
 
 /* ===== button.css =====================================================
@@ -32,12 +31,20 @@
 
 button {
   -moz-appearance: button;
-  -moz-user-focus: ignore;
-  margin: 6px;
+  margin: 1px 5px 2px 5px;
   min-width: 6.3em;
-  -moz-appearance: button;
- padding: 0px 4px;
-  color: #000000;
+  border: 3px solid;
+  -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
+  -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;
+  -moz-border-bottom-colors: transparent ThreeDDarkShadow ThreeDShadow;
+  -moz-border-left-colors: transparent ThreeDHighlight ThreeDLightShadow;
+  background-color: ThreeDFace;
+  color: ButtonText;
+}
+
+.button-box {
+  border: 1px solid transparent;
+  padding: 1px 4px 2px 3px;
 }
 
 .button-text {
@@ -45,8 +52,26 @@ button {
   text-align: center;
 }
 
-button[type="default"] {
-	font: menu;
+/* .......... focused state .......... */
+
+button:focus {
+  -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight transparent;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
+  -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight transparent;
+}
+
+button:focus > .button-box {
+  border: 1px dotted ThreeDDarkShadow;
+}
+
+/* .......... default state .......... */
+
+button[default="true"] {
+  -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight ThreeDLightShadow;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
+  -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight ThreeDLightShadow;
 }
 
 /* .......... hover state .......... */
@@ -55,26 +80,37 @@ button:hover {
   color: -moz-gtk2-hovertext;
 }
 
-button:hover:active[disabled="true"] {
-  color: GrayText;
-}
-
 /* .......... active/open/checked state .......... */
 
-button[buttondown="true"],
+button:hover:active,
 button[open="true"],
 button[checked="true"] {
-color: ButtonText;
+  -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  color: ButtonText;
+}
+
+button:hover:active > .button-box,
+button[open="true"] > .button-box,
+button[checked="true"] > .button-box {
+  padding: 2px 3px 1px 4px;
 }
 
 /* .......... disabled state .......... */
 
-button[disabled="true"] {
-  color: #777777 !important;
-  -moz-border-top-colors: #cccccc #eeeeee #fdfdfd;
-  -moz-border-right-colors: #cccccc #d9d9d9;
-  -moz-border-bottom-colors: #cccccc #eeeeee #fdfdfd;
-  -moz-border-left-colors: #cccccc #d9d9d9;
+button[disabled="true"],
+button[disabled="true"]:hover:active {
+  -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
+  -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
+  -moz-border-bottom-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
+  -moz-border-left-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
+  color: GrayText;
+}
+
+button[disabled="true"] > .button-box {
+  padding: 1px 4px 2px 3px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
@@ -89,39 +125,39 @@ button[type="menu-button"] {
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
   margin: 1px;
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+  min-width:11px;
+  min-height:11px;
 }
   
 .button-menu-dropmarker[disabled="true"],
 .button-menubutton-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
+  background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
 }
 
 .button-menubutton-dropmarker[open="true"] {
-  /* margin: 2px 0px 0px 2px; */
+  margin: 2px 0px 0px 2px;
 }
 
 /* ::::: plain buttons ::::: */
 
 button.plain {
+  border: 0px !important;
   margin: 0px !important;
   padding: 0px !important;
 }
 
-/* ::::: close button ::::: */
-
-.close-button {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+button[type="disclosure"] {
+  border: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
+  -moz-appearance: none;
+  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+  min-width: 0px !important;
+  background-color: transparent;
 }
 
-.close-button > .toolbarbutton-icon {
-  margin: 0;
+button[type="disclosure"][open="true"] {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.png"); 
 }
 
-.close-button > .toolbarbutton-text {
-  display: none;
-}
-
-.dialog-button {
-	font: menu;
-}
diff --git a/toolkit/themes/gnomestripe/global/toolbarbutton.css b/toolkit/themes/gnomestripe/global/toolbarbutton.css
index 3f25df31f315..7073ed577a8e 100644
--- a/toolkit/themes/gnomestripe/global/toolbarbutton.css
+++ b/toolkit/themes/gnomestripe/global/toolbarbutton.css
@@ -19,7 +19,6 @@
  *
  * Contributor(s):
  *   Joe Hewitt (hewitt@netscape.com)
- *   Kevin Gerich (webmail@kmgerich.com)
  */
 
 /* ===== toolbarbutton.css =====================================================
@@ -31,67 +30,72 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
+  -moz-appearance: toolbarbutton;
   -moz-box-align: center;
   -moz-box-pack: center;
-  margin: 0px 2px 0px 2px;
-  padding: 3px 1px 3px 1px;
-  border-right: 1px solid transparent;
-  border-left: 1px solid transparent;
+  margin: 0;
+  border: 1px solid transparent;
+  padding: 3px;
   background-color: transparent;
+  color: -moz-DialogText;
 }
 
 .toolbarbutton-icon {
-	padding: 1px 0px 1px 0px;
+  margin-right: 2px;
 }
 
 .toolbarbutton-text {
-  margin: 0px;
-  padding: 0px;
+  margin: 0 !important;
   text-align: center;
-  vertical-align: middle;
-  
 }
 
-toolbarbutton:hover:active[buttonstyle="text"],
-toolbarbutton[open="true"][buttonstyle="text"] {
+toolbarbutton:hover,
+toolbarbutton[buttonover="true"] {
+  border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
   color: -moz-gtk2-hovertext;
 }
 
-
+toolbarbutton:hover:active,
+toolbarbutton[open="true"] {
+  border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+  padding: 4px 2px 2px 4px;
+  color: ButtonText;
+}
 
 toolbarbutton[disabled="true"],
 toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active
+toolbarbutton[disabled="true"]:hover:active,
 toolbarbutton[disabled="true"][open="true"] {
-  color: GrayText !important;
+  border-color: transparent;
+  padding: 3px;
+  color: GrayText;
 }
 
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
-    background-color: #DDDDDD;
-    background-image: none;
-    border-right: 1px solid #b9b9b9;
-    border-left: 1px solid #b9b9b9;
-    color: ButtonText !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;
 }
-    
+
 /* ::::: toolbarbutton menu ::::: */
 
 .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
   -moz-image-region: auto; /* cut off inheritance */
-  padding-left: 2px;
 }
 
 .toolbarbutton-menu-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
 }
 
 /* ::::: toolbarbutton menu-button ::::: */
 
 toolbarbutton[type="menu-button"] {
   -moz-box-align: stretch;
+  -moz-box-orient: horizontal !important;
 }
 
 toolbarbutton[type="menu-button"],
@@ -101,26 +105,29 @@ toolbarbutton[type="menu-button"][open="true"],
 toolbarbutton[type="menu-button"][disabled="true"],
 toolbarbutton[type="menu-button"][disabled="true"]:hover,
 toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
-  background-color: transparent;
-  color: ButtonText;
+  border-style: none;
+  padding: 0 !important;
 }
 
 .toolbarbutton-menubutton-button {
   -moz-box-align: center;
   -moz-box-pack: center;
-
+  -moz-box-orient: vertical;
 }
 
-
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
   -moz-box-align: center;
-  -moz-box-pack: center;
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  padding: 3px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") !important;
+}
+
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
 }