diff --git a/themes/classic/communicator/sidebar/win/sidebar.css b/themes/classic/communicator/sidebar/win/sidebar.css
index 32bff40895cb..917827702f0a 100644
--- a/themes/classic/communicator/sidebar/win/sidebar.css
+++ b/themes/classic/communicator/sidebar/win/sidebar.css
@@ -69,6 +69,7 @@
{
behavior : url("chrome://communicator/skin/sidebar/sidebarBindings.xml#panelheader");
background-color : threedface;
+ cursor : pointer;
}
.panelheader-grippy-box
diff --git a/themes/classic/communicator/win/button.css b/themes/classic/communicator/win/button.css
index 9c0fbe632833..01f3c3d9fbad 100644
--- a/themes/classic/communicator/win/button.css
+++ b/themes/classic/communicator/win/button.css
@@ -2,28 +2,86 @@
* these are only used in the navigation toolbar in the navigator package.
**/
- /* outer frame */
+ /* Large vertically orientated toolbar buttons,
+ e.g. back, print
+ */
.button-toolbar-1, .button-toolbar-2
{
background-color : none;
- behavior : url("chrome://global/content/xulBindings.xml#buttontop");
- min-width : 0px;
+ behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-top");
+ min-width : 47px;
margin : 0px;
border : 1px solid transparent;
- user-focus : ignore;
+ user-focus : none;
+ padding : 2px 3px 2px 3px;
+ text-align : center;
}
+
+ .button-toolbar-1:hover, .button-toolbar-2:hover
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ color : #0000FF;
+ }
+
+ .button-toolbar-1:hover:active, .button-toolbar-2:hover:active
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-bottom : 1px solid threedhighlight;
+ border-right : 1px solid threedhighlight;
+ padding : 3px 2px 1px 4px;
+ }
+
+ .button-toolbar-1[disabled="true"],
+ .button-toolbar-1[disabled="true"]:hover,
+ .button-toolbar-1[disabled="true"]:hover:active,
+ .button-toolbar-2[disabled="true"],
+ .button-toolbar-2[disabled="true"]:hover,
+ .button-toolbar-2[disabled="true"]:hover:active
+ {
+ border : 1px solid transparent;
+ color : graytext;
+ padding : 2px 3px 2px 3px;
+ }
+/* Smaller, horizontally orientated (icon left)
+ toolbar buttons, e.g. bold
+ */
.button-toolbar
{
background-color : none;
- behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
+ behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left");
min-width : 0px;
margin : 1px; /* 0px 1px 0px 1px; */
- border : none;
+ border : 1px solid transparent;
user-focus : ignore;
max-width : 14em;
+ vertical-align : middle;
+ padding : 1px 4px 1px 3px;
}
+ .button-toolbar:hover:active
+ {
+ padding : 2px 3px 0px 4px;
+ }
+
+ .button-toolbar[disabled="true"],
+ .button-toolbar[disabled="true"]:hover,
+ .button-toolbar[disabled="true"]:hover:active
+ {
+ color : graytext;
+ border : 1px solid transparent;
+ padding : 1px 4px 1px 3px;
+ }
+
+ .toolbarbutton-left-text
+ {
+ padding-left : 4px;
+ }
+
/* drag and drop feedback */
.button-toolbar[dragover-left="true"]
{
@@ -47,69 +105,24 @@
.button-toolbar-4
{
background-color : none;
- behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
+ behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left");
min-width : 0px;
margin : 0px;
border : 1px solid transparent;
user-focus : ignore;
- }
-
- .button-toolbar-4 > .button-internal-box
- {
padding : 0px;
- border : 1px solid transparent;
vertical-align : middle;
- text-align : center;
}
- .button-toolbar-1:hover, .button-toolbar-2:hover, .button-toolbar-4:hover
+ .button-toolbar-4:hover
{
- border : 1px solid threeddarkshadow;
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
color : #0000FF;
}
-
- .bookmarkitem.button-toolbar:hover
- {
- color : #0000FF;
- text-decoration : underline;
- cursor : pointer;
- }
-
- .button-toolbar:hover:active
- {
- color : #FF0000;
- text-decoration : underline;
- border : none;
- }
- .button-toolbar-1 > .button-internal-box,
- .button-toolbar-2 > .button-internal-box
- {
- padding : 2px 7px 2px 6px;
- vertical-align : middle;
- text-align : center;
- border : 1px solid transparent;
- }
-
- .button-toolbar > .button-internal-box > .button-text-container
- {
- padding-left : 4px;
- }
-
- .button-toolbar > .button-internal-box,
- .button-toolbar:hover:active > .button-internal-box
- {
- padding : 0px 4px 0px 3px;
- vertical-align : middle;
- text-align : center;
- }
-
- .button-toolbar-1[disabled="true"],
- .button-toolbar-1[disabled="true"]:hover,
- .button-toolbar-1[disabled="true"]:hover:active,
- .button-toolbar-2[disabled="true"],
- .button-toolbar-2[disabled="true"]:hover,
- .button-toolbar-2[disabled="true"]:hover:active,
.button-toolbar-4[disabled="true"],
.button-toolbar-4[disabled="true"]:hover,
.button-toolbar-4[disabled="true"]:hover:active
@@ -118,75 +131,33 @@
color : graytext;
}
- .button-toolbar[disabled="true"],
- .button-toolbar[disabled="true"]:hover,
- .button-toolbar[disabled="true"]:hover:active
+
+ /* Personal Toolbar items */
+ .bookmarkitem.button-toolbar
{
- color : graytext;
+ border : none;
+ margin : 0px;
+ padding : 1px 0px 1px 0px;
}
-/* internal frame */
- .button-toolbar-1:hover > .button-internal-box,
- .button-toolbar-2:hover > .button-internal-box,
- .button-toolbar-4:hover > .button-internal-box
+ .bookmarkitem.button-toolbar:hover
{
- border-left : 1px solid threedhighlight;
- border-top : 1px solid threedhighlight;
- border-right : 1px solid threedshadow;
- border-bottom : 1px solid threedshadow;
- }
-
- .button-toolbar-1:hover:active > .button-internal-box,
- .button-toolbar-2:hover:active > .button-internal-box
- {
- padding : 3px 6px 1px 7px;
- border-left : 1px solid threedshadow !important;
- border-top : 1px solid threedshadow !important;
- border-right : 1px solid threedhighlight !important;
- border-bottom : 1px solid threedhighlight !important;
+ color : #0000FF;
+ text-decoration : underline;
+ cursor : pointer;
}
- .button-toolbar-4:hover:active > .button-internal-box
+ .bookmarkitem.button-toolbar:hover:active
{
- padding : 0px;
- border-left : 1px solid threedshadow !important;
- border-top : 1px solid threedshadow !important;
- border-right : 1px solid threedhighlight !important;
- border-bottom : 1px solid threedhighlight !important;
+ padding : 1px 0px 1px 0px;
+ color : #FF0000;
+ text-decoration : underline;
+ border : none;
}
-
- .button-toolbar-1 > .button-internal-box > .button-text-container,
- .button-toolbar > .button-internal-box > .button-text-container,
- .button-toolbar-2 > .button-internal-box > .button-text-container,
- .button-toolbar-4 > .button-internal-box > .button-text-container
+
+ .bookmarkitem > .toolbarbutton-left-text
{
- text-align : center;
- }
-
- .button-toolbar-1[disabled="true"] > .button-internal-box,
- .button-toolbar-1[disabled="true"]:hover > .button-internal-box,
- .button-toolbar-1[disabled="true"]:hover:active > .button-internal-box,
- .button-toolbar-2[disabled="true"] > .button-internal-box,
- .button-toolbar-2[disabled="true"]:hover > .button-internal-box,
- .button-toolbar-2[disabled="true"]:hover:active > .button-internal-box
- {
- padding : 2px 7px 2px 6px !important;
- border : 1px solid transparent !important;
- }
-
- .button-toolbar-4[disabled="true"] > .button-internal-box,
- .button-toolbar-4[disabled="true"]:hover > .button-internal-box,
- .button-toolbar-4[disabled="true"]:hover:active > .button-internal-box
- {
- padding : 0px !important;
- border : 1px solid transparent !important;
- }
-
- .button-toolbar[disabled="true"] > .button-internal-box,
- .button-toolbar[disabled="true"]:hover > .button-internal-box,
- .button-toolbar[disabled="true"]:hover:active > .button-internal-box,
- {
- padding : 2px 8px 2px 7px !important;
+ margin-left : 1px;
}
/** "Green" buttons, e.g. "Search"
diff --git a/themes/classic/communicator/win/menubutton.css b/themes/classic/communicator/win/menubutton.css
index 0c26ac9290bf..e4bd56fe1f28 100644
--- a/themes/classic/communicator/win/menubutton.css
+++ b/themes/classic/communicator/win/menubutton.css
@@ -1,3 +1,102 @@
+
+.menubutton-dual.toolbar.top
+ {
+ behavior : url("chrome://global/content/menulistBindings.xml#menubutton-dual-top");
+ }
+
+.menubutton-dual.toolbar.top > .menubutton-internal-box > .menubutton-dual-button
+ {
+ behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-top");
+ background-color : none;
+ min-width : 47px;
+ margin : 0px;
+ border : 1px solid transparent;
+ user-focus : none;
+ padding : 2px 3px 2px 3px;
+ text-align : center;
+ }
+
+.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-button,
+.menubutton-dual-button:hover
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ color : #0000FF;
+ }
+
+.menubutton-dual-button:hover:active
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-bottom : 1px solid threedhighlight;
+ border-right : 1px solid threedhighlight;
+ padding : 3px 2px 1px 4px;
+ }
+
+.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-button[disabled="true"],
+.menubutton-dual.toolbar:hover[disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
+.menubutton-dual.toolbar:hover:active[disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
+.menubutton-dual.toolbar[open="true"][disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
+.menubutton-dual-button:hover[disabled="true"] + .menubutton-dual-dropmarker-box,
+.menubutton-dual-button:hover:active[disabled="true"] + .menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ color : graytext;
+ }
+
+.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ }
+
+.menubutton-dual.toolbar:hover:active > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
+.menubutton-dual.toolbar[open="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-bottom : 1px solid threedhighlight;
+ border-right : 1px solid threedhighlight;
+ padding : 1px 0px 0px 2px;
+ }
+
+.menubutton-dual-button:hover + .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ }
+
+.menubutton-dual-button:hover:active + .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-bottom : 1px solid threedhighlight;
+ border-right : 1px solid threedhighlight;
+ padding : 1px 0px 0px 2px;
+ }
+
+.menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ padding : 0px 1px 0px 1px;
+ }
+
+.menubutton-dropmarker
+ {
+ list-style-image : url("chrome://global/skin/dropmarker-down-on.gif");
+ }
+
+.menubutton-dropmarker[disabled="true"]
+ {
+ list-style-image : url("chrome://global/skin/dropmarker-down-disabled.gif");
+ }
+
/** menubuttons on generic grey toolbars
* class="button-toolbar"
**/
diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml
index c39347ce34c1..c9f5219eb0fb 100644
--- a/themes/classic/global/win/classicBindings.xml
+++ b/themes/classic/global/win/classicBindings.xml
@@ -139,6 +139,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/themes/classic/global/win/global.css b/themes/classic/global/win/global.css
index 386eb1d35f98..9347067a6566 100644
--- a/themes/classic/global/win/global.css
+++ b/themes/classic/global/win/global.css
@@ -125,6 +125,7 @@
border-left : 1px solid threedshadow;
border-right : 1px solid threedhighlight;
border-bottom : 1px solid threedhighlight;
+ min-height : 16px;
}
statusbarpanel
diff --git a/themes/classic/global/win/menu.css b/themes/classic/global/win/menu.css
index 6f4b8180163f..74eae2de845e 100644
--- a/themes/classic/global/win/menu.css
+++ b/themes/classic/global/win/menu.css
@@ -71,8 +71,8 @@ menuseparator
menubar > menu
{
- padding : 2px 3px 2px 3px;
- margin : 2px 0px 2px 0px;
+ padding : 2px 1px 2px 3px;
+ margin : 0px;
border : 1px solid transparent;
}
diff --git a/themes/classic/global/win/menubutton.css b/themes/classic/global/win/menubutton.css
index 7a1b27068602..37ff5356ca12 100644
--- a/themes/classic/global/win/menubutton.css
+++ b/themes/classic/global/win/menubutton.css
@@ -1,3 +1,4 @@
+/*
.menubutton-dual,
.menubutton-dual[disabled="true"]:hover,
.menubutton-dual[disabled="true"]:hover:active,
@@ -115,3 +116,4 @@
{
margin : 0px;
}
+*/
\ No newline at end of file