diff --git a/themes/classic/communicator/mac/button.css b/themes/classic/communicator/mac/button.css index e904af45be42..7b7ee3b72e77 100644 --- a/themes/classic/communicator/mac/button.css +++ b/themes/classic/communicator/mac/button.css @@ -3,30 +3,39 @@ **/ /* outer frame */ - .button-toolbar-1,.button-toolbar-2 + .button-toolbar-1, .button-toolbar-2 { behavior : url("chrome://global/content/xulBindings.xml#buttontop"); min-width : 0px; margin : 0px 1px 0px 1px; - border : 1px solid #DDDDDD; /* Should this be transparent ? */ + border : 1px solid transparent; + background-color : transparent; } - .button-toolbar,.button-toolbar-4 + .button-toolbar, .button-toolbar-4 { behavior : url("chrome://global/content/xulBindings.xml#buttonleft"); min-width : 0px; margin : 1px; - border : 1px solid #DDDDDD; /* Should this be transparent ? */ + border : 1px solid transparent; + background-color : transparent; } .button-toolbar-1:hover, .button-toolbar-1:hover:active, .button-toolbar:hover, .button-toolbar:hover:active, - .button-toolbar-2:hover, .button-toolbar-2:hover:active, - .button-toolbar-4:hover, .button-toolbar-4:hover:active, + .button-toolbar-2:hover, .button-toolbar-2:hover:active, + .button-toolbar-4:hover, .button-toolbar-4:hover:active { - border : 1px solid black; + border : 1px solid #000000; color : #0000FF; - } + } + + .button-toolbar:hover, .button-toolbar:hover:active + { + border : 1px solid #DDDDDD; + text-decoration : underline; + } + .button-toolbar-1 > .button-internal-box, .button-toolbar-2 > .button-internal-box @@ -50,7 +59,13 @@ text-align : center; border : 1px solid #DDDDDD; } - + + .button-toolbar:hover:active > .button-internal-box + { + padding : 1px 5px 1px 4px; + color : #FF0000; + } + .button-toolbar-1[disabled="true"], .button-toolbar-1[disabled="true"]:hover, .button-toolbar-1[disabled="true"]:hover:active, @@ -70,34 +85,40 @@ /* internal frame */ .button-toolbar-1:hover > .button-internal-box, - .button-toolbar:hover > .button-internal-box, .button-toolbar-2:hover > .button-internal-box, .button-toolbar-4:hover > .button-internal-box { - border-left : 1px solid white; - border-top : 1px solid white; + border-left : 1px solid #FFFFFF; + border-top : 1px solid #FFFFFF; border-right : 1px solid #9D9D9D; border-bottom : 1px solid #9D9D9D; } + .button-toolbar-1:hover > .button-internal-box, + .button-toolbar-2:hover > .button-internal-box + { + color : #000000; + } + .button-toolbar-1:hover:active > .button-internal-box, .button-toolbar-2:hover:active > .button-internal-box { padding : 3px 7px 1px 8px; - border-left : 1px solid #9D9D9D !important; - border-top : 1px solid #9D9D9D !important; - border-right : 1px solid white !important; - border-bottom : 1px solid white !important; + border-left : 1px solid #444444 !important; + border-top : 1px solid #444444 !important; + border-right : 1px solid #AAAAAA !important; + border-bottom : 1px solid #AAAAAA !important; + color : #FFFFFF; + background-color : #666666; } - .button-toolbar:hover:active > .button-internal-box, .button-toolbar-4:hover:active > .button-internal-box { padding : 1px 3px 0px 4px; border-left : 1px solid #9D9D9D !important; border-top : 1px solid #9D9D9D !important; - border-right : 1px solid white !important; - border-bottom : 1px solid white !important; + border-right : 1px solid #FFFFFF !important; + border-bottom : 1px solid #FFFFFF !important; } .button-toolbar-1 > .button-internal-box > .button-text-container, @@ -137,6 +158,7 @@ margin : 0px 0px 0px 3px; font-weight : bold; user-focus: : ignore; + background-color : transparent; /* behavior : url(chrome://global/content/xulBindings.xml#buttonleft); background-color : #99CCCC border-left : 1px solid #DDDDDD !important; @@ -167,7 +189,7 @@ button.expander { border : none; - padding : none; + padding : 0px; margin : 1px 5px 3px 1px; background-color : inherit; list-style-image : url("chrome://global/skin/twisty-closed.gif"); @@ -193,8 +215,8 @@ { border : none; background-color : inherit; - padding : none; - margin : none; + padding : 0px; + margin : 0px; } /* text frame */ diff --git a/themes/classic/communicator/mac/menubutton.css b/themes/classic/communicator/mac/menubutton.css index 4ca6267a7f64..83f7203e77a1 100644 --- a/themes/classic/communicator/mac/menubutton.css +++ b/themes/classic/communicator/mac/menubutton.css @@ -38,18 +38,18 @@ **/ .button-toolbar > .menubutton-internal-box { - border : none; + border : none; padding : 1px 3px 1px 3px; } .button-toolbar[open="true"] > .menubutton-internal-box, .button-toolbar:hover:active > .menubutton-internal-box { - border : none; + border : none; padding : 1px 3px 1px 3px; } - .button-toolbar[open="true"] + .button-toolbar[open="true"], .button-toolbar-4[open="true"] { border : 1px solid #000000; } @@ -61,9 +61,10 @@ border : 1px solid #DDDDDD; } -menubutton.button-toolbar:hover,menubutton.button-toolbar-4:hover +menubutton.button-toolbar:hover, menubutton.button-toolbar-4:hover { - border : 1px solid black; + border : 1px solid #000000; + text-decoration : none; } .menubutton-toolbar-single-internal-box @@ -74,8 +75,8 @@ menubutton.button-toolbar:hover,menubutton.button-toolbar-4:hover menubutton.button-toolbar:hover > .menubutton-toolbar-single-internal-box, menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box { - border-left : 1px solid white; - border-top : 1px solid white; + border-left : 1px solid #FFFFFF; + border-top : 1px solid #FFFFFF; border-right : 1px solid #9D9D9D; border-bottom : 1px solid #9D9D9D; } @@ -87,8 +88,8 @@ menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-b { border-left : 1px solid #9D9D9D; border-top : 1px solid #9D9D9D; - border-right : 1px solid white; - border-bottom : 1px solid white; + border-right : 1px solid #FFFFFF; + border-bottom : 1px solid #FFFFFF; padding : 2px 3px 0px 5px; } diff --git a/themes/classic/communicator/sidebar/mac/sidebar.css b/themes/classic/communicator/sidebar/mac/sidebar.css index a500c740c6b8..fd9c456af270 100644 --- a/themes/classic/communicator/sidebar/mac/sidebar.css +++ b/themes/classic/communicator/sidebar/mac/sidebar.css @@ -100,5 +100,5 @@ border-bottom : 1px solid #9D9D9D; /* border-top : 1px solid #FFFFFF; DO NOT UNCOMMENT!!! THERE IS A BUG WHERE, FOR SOME REASON, BORDER-TOP CAUSES CERTAIN APPS - (E.G. MAIL) TO CRASH!!! Related to Bug #45336*/ + (E.G. MAIL) TO CRASH!!! Related to Bug #45336, #45925 (7/21/00) */ } diff --git a/themes/classic/communicator/sidebar/unix/sidebar.css b/themes/classic/communicator/sidebar/unix/sidebar.css index befb2b96a0c5..14a3d8d28fd1 100644 --- a/themes/classic/communicator/sidebar/unix/sidebar.css +++ b/themes/classic/communicator/sidebar/unix/sidebar.css @@ -96,7 +96,9 @@ .iframe-panel { border-left : 1px solid threedhighlight; - border-top : 1px solid threedhighlight; border-right : 1px solid threedshadow; border-bottom : 1px solid threedshadow; - } \ No newline at end of file +/* border-top : 1px solid threedhighlight; DO NOT UNCOMMENT!!! THERE IS A BUG WHERE, + FOR SOME REASON, BORDER-TOP CAUSES CERTAIN APPS + (E.G. MAIL) TO CRASH!!! Related to Bugs #45336, #45925 (7/21/00) */ + } diff --git a/themes/classic/global/mac/button.css b/themes/classic/global/mac/button.css index fe1e2361b64d..3afcae513ea4 100644 --- a/themes/classic/global/mac/button.css +++ b/themes/classic/global/mac/button.css @@ -16,7 +16,7 @@ button-plain > .button-internal-box > .button-icon, button.plain > .button-internal-box > .button.icon:hover:active { - border : 0px ! important; + border : 0px !important; margin : 0px; padding : 0px; color : #000000; @@ -27,10 +27,11 @@ button, .exit-dialog { behavior : url(chrome://global/skin/buttonBindings.xml#exit-button); - border : 0px ! important; + border : 0px; user-focus : ignore; min-width : 60px; color : #000000; + background-color : transparent !important; /* Greatly increases responsiveness and 'feel' */ } button { diff --git a/themes/classic/global/mac/global.css b/themes/classic/global/mac/global.css index f7f3b71b23b7..a56ce3d08c0c 100644 --- a/themes/classic/global/mac/global.css +++ b/themes/classic/global/mac/global.css @@ -155,7 +155,6 @@ min-width : 100px; margin : 0px 4px 0px 4px; border : 1px inset #CCCCCC; - max-height : 1.5em; } progressmeter > .progressmeter-internal-box @@ -175,6 +174,11 @@ background-color : #999999; } + .progress-text + { + max-height : 1.5em; + } + /** XUL element **/ scrollbar { diff --git a/themes/classic/global/mac/menu.css b/themes/classic/global/mac/menu.css index 08a14d5ac8c4..09e5534c945b 100644 --- a/themes/classic/global/mac/menu.css +++ b/themes/classic/global/mac/menu.css @@ -43,11 +43,12 @@ menupopup > menuitem, popup > menuitem } /* Don't display grayed items in the contextual popup menus */ +/* BUGGY: DON'T UNCOMMENT UNTIL BUG #46005 IS RESOLVED (7/20/00) popup > menuitem[disabled="true"], popup > menu[disabled="true"] { display : none; } - +*/ menuseparator { diff --git a/themes/classic/global/mac/menubutton.css b/themes/classic/global/mac/menubutton.css index 73246ded7049..f7d48c02e7a9 100644 --- a/themes/classic/global/mac/menubutton.css +++ b/themes/classic/global/mac/menubutton.css @@ -39,13 +39,15 @@ .menubutton-dual[open="true"] > .classic-dropmarker-box { - border-left : 1px solid #9D9D9D; - border-top : 1px solid #9D9D9D; - border-right : 1px solid #FFFFFF; - border-bottom : 1px solid #FFFFFF; + border-left : 1px solid #444444; + border-top : 1px solid #444444; + border-right : 1px solid #AAAAAA; + border-bottom : 1px solid #AAAAAA; + background-color : #666666; } .classic-simplebutton, +.classic-simplebutton[disabled="true"], .classic-simplebutton[disabled="true"]:hover, .classic-simplebutton[disabled="true"]:hover:active, .menubutton-dual[disabled="true"]:hover > .classic-simplebutton, @@ -58,8 +60,14 @@ min-width : 0px; padding : 2px 8px 2px 7px; text-align : center; + color : #777777; } - + +.classic-simplebutton + { + color: #000000; + } + .classic-simplebutton:hover, .menubutton-dual:hover > .classic-simplebutton, @@ -73,12 +81,13 @@ .classic-simplebutton:hover:active { - border-left : 1px solid #9D9D9D !important; - border-top : 1px solid #9D9D9D !important; - border-right : 1px solid #FFFFFF !important; - border-bottom : 1px solid #FFFFFF !important; + border-left : 1px solid #444444 !important; + border-top : 1px solid #444444 !important; + border-right : 1px solid #AAAAAA !important; + border-bottom : 1px solid #AAAAAA !important; padding : 3px 7px 1px 8px; - color : #000000; + color : #FFFFFF; + background-color : #666666 !important; } .classic-dropmarker diff --git a/themes/classic/global/unix/classicBindings.xml b/themes/classic/global/unix/classicBindings.xml index 2fd3b9465772..dfbb48266974 100644 --- a/themes/classic/global/unix/classicBindings.xml +++ b/themes/classic/global/unix/classicBindings.xml @@ -57,7 +57,7 @@ - + diff --git a/themes/classic/global/unix/menu.css b/themes/classic/global/unix/menu.css index 37462d24af7a..8554aee154b8 100644 --- a/themes/classic/global/unix/menu.css +++ b/themes/classic/global/unix/menu.css @@ -50,10 +50,12 @@ menupopup > menuitem, popup > menuitem } /* Don't display grayed items in the contextual popup menus */ +/* BUGGY: DON'T UNCOMMENT UNTIL BUG #46005 IS RESOLVED (7/20/00) popup > menuitem[disabled="true"], popup > menu[disabled="true"] { display : none; } +*/ menuseparator { diff --git a/themes/classic/global/unix/scrollbars.css b/themes/classic/global/unix/scrollbars.css index 1f357ee55ec7..6d69d7336d4e 100644 --- a/themes/classic/global/unix/scrollbars.css +++ b/themes/classic/global/unix/scrollbars.css @@ -39,6 +39,12 @@ thumb border-bottom : 1px solid threedshadow; } +.thumb-spring + { + min-width : 4px; + min-height : 4px; + } + /** * Scrollbar button **/ diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml index 2fd3b9465772..dfbb48266974 100644 --- a/themes/classic/global/win/classicBindings.xml +++ b/themes/classic/global/win/classicBindings.xml @@ -57,7 +57,7 @@ - + diff --git a/themes/classic/global/win/menu.css b/themes/classic/global/win/menu.css index e78c990cb902..f3ebff806dc8 100644 --- a/themes/classic/global/win/menu.css +++ b/themes/classic/global/win/menu.css @@ -50,10 +50,12 @@ menupopup > menuitem, popup > menuitem } /* Don't display grayed items in the contextual popup menus */ +/* BUGGY: DON'T UNCOMMENT UNTIL BUG #46005 IS RESOLVED (7/20/00) popup > menuitem[disabled="true"], popup > menu[disabled="true"] { display : none; } +*/ menuseparator diff --git a/themes/classic/global/win/scrollbars.css b/themes/classic/global/win/scrollbars.css index dc087e9a0488..f036659eae39 100644 --- a/themes/classic/global/win/scrollbars.css +++ b/themes/classic/global/win/scrollbars.css @@ -39,6 +39,12 @@ thumb border-bottom : 1px solid threedshadow; } +.thumb-spring + { + min-width : 4px; + min-height : 4px; + } + /** * Scrollbar button **/ @@ -120,4 +126,4 @@ slider background-color : scrollbar; background-image : url("chrome://global/skin/scrollbar-slider-bg.gif"); } - \ No newline at end of file + diff --git a/themes/classic/messenger/addressbook/addressbook.css b/themes/classic/messenger/addressbook/addressbook.css index 84ea4440d320..37f6b37083ff 100644 --- a/themes/classic/messenger/addressbook/addressbook.css +++ b/themes/classic/messenger/addressbook/addressbook.css @@ -70,10 +70,14 @@ Rights Reserved. margin: 0px; } -html|a[class="CardViewText"] { - padding-left: 20px; +html|a { + padding-left: 0px; padding-right: 2px; - min-width: 30px; + border: none !important; +} + +html|p { + border: none !important; } diff --git a/themes/modern/messenger/addressbook/addressbook.css b/themes/modern/messenger/addressbook/addressbook.css index 1d6da2723b0e..9fedeef4806d 100644 --- a/themes/modern/messenger/addressbook/addressbook.css +++ b/themes/modern/messenger/addressbook/addressbook.css @@ -70,10 +70,14 @@ Rights Reserved. margin: 0px; } -html|a[class="CardViewText"] { - padding-left: 20px; +html|a { + padding-left: 0px; padding-right: 2px; - min-width: 30px; + border: none !important; +} + +html|p { + border: none !important; }