diff --git a/themes/classic/communicator/securityOverlay.css b/themes/classic/communicator/securityOverlay.css
index 8d32ded30f5..17a5a5a6d46 100644
--- a/themes/classic/communicator/securityOverlay.css
+++ b/themes/classic/communicator/securityOverlay.css
@@ -2,7 +2,7 @@
* XP Classic skin file (shared by all three platform variants)
**/
-#security-button
+#security-button
{
list-style-image:url("chrome://communicator/skin/unlock.gif");
}
diff --git a/themes/classic/communicator/win/button.css b/themes/classic/communicator/win/button.css
index 6bbd7949375..9c0fbe63283 100644
--- a/themes/classic/communicator/win/button.css
+++ b/themes/classic/communicator/win/button.css
@@ -2,86 +2,28 @@
* these are only used in the navigation toolbar in the navigator package.
**/
- /* Large vertically orientated toolbar buttons,
- e.g. back, print
- */
+ /* outer frame */
.button-toolbar-1, .button-toolbar-2
{
background-color : none;
- behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-top");
- min-width : 47px;
+ behavior : url("chrome://global/content/xulBindings.xml#buttontop");
+ min-width : 0px;
margin : 0px;
border : 1px solid transparent;
- user-focus : none;
- padding : 2px 3px 2px 3px;
- text-align : center;
+ user-focus : ignore;
}
-
- .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/skin/classicBindings.xml#toolbarbutton-left");
+ behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
min-width : 0px;
margin : 1px; /* 0px 1px 0px 1px; */
- border : 1px solid transparent;
+ border : none;
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"]
{
@@ -105,24 +47,69 @@
.button-toolbar-4
{
background-color : none;
- behavior : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left");
+ behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
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-4:hover
+ .button-toolbar-1:hover, .button-toolbar-2:hover, .button-toolbar-4:hover
{
- border-left : 1px solid threedhighlight;
- border-top : 1px solid threedhighlight;
- border-right : 1px solid threedshadow;
- border-bottom : 1px solid threedshadow;
+ border : 1px solid threeddarkshadow;
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
@@ -131,44 +118,85 @@
color : graytext;
}
-
- /* Personal Toolbar items */
- .bookmarkitem.button-toolbar, .bookmarkfolder.button-toolbar
+ .button-toolbar[disabled="true"],
+ .button-toolbar[disabled="true"]:hover,
+ .button-toolbar[disabled="true"]:hover:active
{
- border : none;
- margin : 0px;
- padding : 1px 0px 1px 0px;
+ color : graytext;
}
- .bookmarkitem.button-toolbar:hover, .bookmarkfolder.button-toolbar:hover
+/* internal frame */
+ .button-toolbar-1:hover > .button-internal-box,
+ .button-toolbar-2:hover > .button-internal-box,
+ .button-toolbar-4:hover > .button-internal-box
{
- color : #0000FF;
- text-decoration : underline;
- cursor : pointer;
- }
-
- .bookmarkitem.button-toolbar:hover:active, .bookmarkfolder.button-toolbar:hover:active
- {
- padding : 1px 0px 1px 0px;
- color : #FF0000;
- text-decoration : underline;
- border : none;
- }
-
- .bookmarkitem > .toolbarbutton-left-text
- {
- margin-left : 1px;
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
}
-/** Low profile rollover buttons, e.g. "search"
+ .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;
+ }
+
+ .button-toolbar-4:hover:active > .button-internal-box
+ {
+ 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;
+ }
+
+ .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
+ {
+ 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;
+ }
+
+/** "Green" buttons, e.g. "Search"
+ * class="button-toolbar-3"
**/
- .button-toolbar-3,
- .button-toolbar-3[disabled="true"],
- .button-toolbar-3[disabled="true"]:hover,
- .button-toolbar-3[disabled="true"]:hover:active
+ .button-toolbar-3
{
behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
- margin : 1px 1px 2px 4px !important;
+ margin : 1px 1px 1px 4px !important;
+ font-weight : bold;
border : 0px;
background-color : threedface;
min-width : 0px;
@@ -177,19 +205,16 @@
.button-toolbar-3:hover, .button-toolbar-3:hover:active
{
- margin : 0px 0px 1px 3px !important;
+ margin : 0px 0px 0px 3px !important;
border : 1px solid threeddarkshadow;
}
- .button-toolbar-3 > .button-internal-box,
- .button-toolbar-3 > .button-internal-box[disabled="true"],
- .button-toolbar-3:hover > .button-internal-box[disabled="true"],
- .button-toolbar-3:hover:active > .button-internal-box[disabled="true"]
+ .button-toolbar-3 > .button-internal-box
{
- border-left : 1px solid threedhighlight !important;
- border-top : 1px solid threedhighlight !important;
- border-right : 1px solid threedshadow !important;
- border-bottom : 1px solid threedshadow !important;
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
padding : 1px 4px 1px 4px;
}
diff --git a/themes/classic/communicator/win/menubutton.css b/themes/classic/communicator/win/menubutton.css
index 0f0529a5817..0ff2ee7b147 100644
--- a/themes/classic/communicator/win/menubutton.css
+++ b/themes/classic/communicator/win/menubutton.css
@@ -1,4 +1,192 @@
+.menubutton-dual.toolbar.top
+ {
+ behavior : url("chrome://global/content/menulistBindings.xml#menubutton-dual-ex");
+ border : 1px solid transparent;
+ }
+
+/* internal button */
+.menubutton-dual-ex-button.top
+ {
+ behavior : url("chrome://global/skin/buttonBindings.xml#simplebutton");
+ border : 1px solid transparent;
+ min-width : 47px;
+ margin : 0px;
+ padding : 2px 7px 2px 6px;
+ }
+
+/* dropmarker */
+.menubutton-dropmarker
+ {
+ list-style-image : url("chrome://global/skin/scroll-down.gif");
+ }
+
+.menubutton-dual.toolbar > .menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ padding : 1px 0px 1px 0px;
+ }
+
+/** disabled **/
+.menubutton-dual-ex-button.top[disabled="true"]
+ {
+ color : graytext;
+ }
+
+.menubutton-dual-toolbar[disabled="true"] > .menubutton-dual-dropmarker-box > .menubutton-dropmarker
+ {
+ list-style-image : url("chrome://global/skin/scroll-down-disabled.gif");
+ }
+
+
+
+/* ACTION: mouseover the button */
+
+ /* 1). button gets outset border */
+ .menubutton-dual-ex-button:hover
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ color : blue;
+ }
+
+ .menubutton-dual-toolbar[disabled="true"] > .menubutton-dual-ex-button:hover
+ {
+ border : 1px solid transparent;
+ color : graytext;
+ }
+
+ /* 2) menubutton gets black border */
+ .menubutton-dual.toolbar[buttonover="true"]
+ {
+ border : 1px solid threeddarkshadow;
+ }
+
+ .menubutton-dual.toolbar[buttonover="true"][disabled="true"]
+ {
+ border : 1px solid transparent;
+ }
+
+ /* 3) dropmarker gets outset border */
+ .menubutton-dual.toolbar[buttonover="true"] > .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[buttonover="true"][disabled="true"] > .menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ }
+
+/* ACTION: mousedown on the button */
+
+ /* 1). button gets inset border */
+ .menubutton-dual-ex-button:hover:active
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-right : 1px solid threedhighlight;
+ border-bottom : 1px solid threedhighlight;
+ padding : 3px 6px 1px 7px;
+ }
+
+ .menubutton-dual-ex-button[disabled="true"]:hover:active
+ {
+ border : 1px solid transparent;
+ padding : 2px 7px 2px 6px;
+ }
+
+ /* 2). dropmarker gets inset border */
+ .menubutton-dual.toolbar[buttondown="true"] > .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-right : 1px solid threedhighlight;
+ border-bottom : 1px solid threedhighlight;
+ padding : 2px 0px 0px 0px;
+ }
+
+ .menubutton-dual.toolbar[buttondown="true"][disabled="true"] > .menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ }
+
+/* ACTION: mouse over the menu */
+
+ /* 1). menubutton gets black border */
+ .menubutton-dual.toolbar:hover
+ {
+ border : 1px solid threeddarkshadow;
+ }
+
+ .menubutton-dual.toolbar[disabled="true"]:hover
+ {
+ border : 1px solid transparent;
+ }
+
+ /* 2). button gets outset border */
+ .menubutton-dual.toolbar:hover > .menubutton-dual-ex-button
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ }
+
+ .menubutton-dual.toolbar[disabled="true"]:hover > .menubutton-dual-ex-button
+ {
+ border : 1px solid transparent;
+ }
+
+ /* 3). dropmarker gets outset border */
+ .menubutton-dual.toolbar: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.toolbar[disabled="true"]:hover > .menubutton-dual-dropmarker-box
+ {
+ border : 1px solid transparent;
+ }
+
+/* ACTION: open the menu */
+
+ /* 1). menubutton gets black border */
+ .menubutton-dual.toolbar[open="true"]
+ {
+ border : 1px solid threeddarkshadow;
+ }
+
+ /* 2). button gets outset border */
+ .menubutton-dual.toolbar[open="true"] > .menubutton-dual-ex-button
+ {
+ border-left : 1px solid threedhighlight;
+ border-top : 1px solid threedhighlight;
+ border-right : 1px solid threedshadow;
+ border-bottom : 1px solid threedshadow;
+ }
+
+ /* 3). dropmarker gets inset border */
+ .menubutton-dual.toolbar[open="true"] > .menubutton-dual-dropmarker-box
+ {
+ border-left : 1px solid threedshadow;
+ border-top : 1px solid threedshadow;
+ border-right : 1px solid threedhighlight;
+ border-bottom : 1px solid threedhighlight;
+ padding : 2px 0px 0px 0px;
+ }
+
+
+
+/*
.menubutton-dual.toolbar.top
{
behavior : url("chrome://global/content/menulistBindings.xml#menubutton-dual-top");
@@ -97,6 +285,9 @@
list-style-image : url("chrome://global/skin/dropmarker-down-disabled.gif");
}
+
+*/
+
/** menubuttons on generic grey toolbars
* class="button-toolbar"
**/
@@ -172,4 +363,4 @@ menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-b
list-style-image : url("chrome://global/skin/scroll-up.gif");
}
-
+
\ No newline at end of file
diff --git a/themes/classic/editor/EditorToolbars.css b/themes/classic/editor/EditorToolbars.css
index ee6fe54d027..f316aaf465f 100644
--- a/themes/classic/editor/EditorToolbars.css
+++ b/themes/classic/editor/EditorToolbars.css
@@ -205,9 +205,10 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
/* Image URLs for all Editor toolbar buttons */
-#boldButton, #boldButton[toggled="true"]:hover, #boldButton[toggled="true"]:hover:active {
- list-style-image:url(chrome://editor/skin/images/bold.gif);
-}
+#boldButton
+ {
+ list-style-image : url(chrome://editor/skin/images/bold.gif);
+ }
#boldButton[disabled="true"],
#boldButton[disabled="true"]:hover,
@@ -226,9 +227,9 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif");
}
-#italicButton, #italicButton[toggled="true"]:hover, #italicButton[toggled="true"]:hover:active
+#italicButton
{
- list-style-image : url("chrome://editor/skin/images/italic.gif");
+ list-style-image : url("chrome://editor/skin/images/italic.gif");
}
#italicButton[disabled="true"],
@@ -248,7 +249,7 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
list-style-image : url("chrome://editor/skin/images/italic-hover-active.gif");
}
-#underlineButton, #underlineButton[toggled="true"]:hover, #underlineButton[toggled="true"]:hover:active
+#underlineButton
{
list-style-image : url("chrome://editor/skin/images/underline.gif");
}
@@ -272,7 +273,7 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
#newButton
{
- list-style-image : url("chrome://editor/skin/images/newfile.gif");
+ list-style-image : url("chrome://editor/skin/images/newfile.gif");
}
#newButton[disabled="true"],
@@ -622,9 +623,10 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
list-style-image : url("chrome://editor/skin/images/inc-font-size-hover-active.gif");
}
-#ulButton {
- list-style-image:url("chrome://editor/skin/images/bullets.gif");
-}
+#ulButton
+ {
+ list-style-image :url("chrome://editor/skin/images/bullets.gif");
+ }
#ulButton[disabled="true"],
#ulButton[disabled="true"]:hover,
@@ -643,9 +645,10 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
list-style-image : url("chrome://editor/skin/images/bullets-hover-active.gif");
}
-#olButton {
- list-style-image:url("chrome://editor/skin/images/numbers.gif");
-}
+#olButton
+ {
+ list-style-image : url("chrome://editor/skin/images/numbers.gif");
+ }
#olButton[disabled="true"],
#olButton[disabled="true"]:hover,
@@ -800,11 +803,10 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
list-style-image : url("chrome://editor/skin/images/right-hover-active.gif");
}
-#text-align-justify,
-#align-justify-button
-{
- list-style-image:url("chrome://editor/skin/images/justify.gif");
-}
+#text-align-justify, #align-justify-button
+ {
+ list-style-image : url("chrome://editor/skin/images/justify.gif");
+ }
#text-align-justify[disabled="true"],
#text-align-justify[disabled="true"]:hover,
diff --git a/themes/classic/global/win/box.css b/themes/classic/global/win/box.css
index 727b377c5f6..22b6817d68c 100644
--- a/themes/classic/global/win/box.css
+++ b/themes/classic/global/win/box.css
@@ -2,7 +2,7 @@
titledbox
{
border : 2px groove threedface;
- padding : 7px;
+ padding : 7px !important;
margin : 5px;
}
diff --git a/themes/classic/global/win/buttonBindings.xml b/themes/classic/global/win/buttonBindings.xml
index 1e9870e770d..acc4f4ceabf 100644
--- a/themes/classic/global/win/buttonBindings.xml
+++ b/themes/classic/global/win/buttonBindings.xml
@@ -56,4 +56,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/themes/classic/global/win/menulistBindings.xml b/themes/classic/global/win/menulistBindings.xml
index 87059833c5a..eba3f4b6d9f 100644
--- a/themes/classic/global/win/menulistBindings.xml
+++ b/themes/classic/global/win/menulistBindings.xml
@@ -14,7 +14,7 @@