#43658: Mac Classic polish fixes to toolbar buttons. #45534: Prevents thumb in scrollbar from shrinking too small in linux and windows classic skin. #44430: Mac Classic skin toolbar polish fixes. #46005: Fixes rt. click crash. #45336: Fixes linux crashing in Mail. #40780: Progress-meter patch for mac classic skin. r=hangas

This commit is contained in:
nbhatla%netscape.com 2000-07-22 00:48:29 +00:00
parent 5b7c874d34
commit bde3bda0cb
16 changed files with 121 additions and 57 deletions

View File

@ -3,30 +3,39 @@
**/ **/
/* outer frame */ /* outer frame */
.button-toolbar-1,.button-toolbar-2 .button-toolbar-1, .button-toolbar-2
{ {
behavior : url("chrome://global/content/xulBindings.xml#buttontop"); behavior : url("chrome://global/content/xulBindings.xml#buttontop");
min-width : 0px; min-width : 0px;
margin : 0px 1px 0px 1px; 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"); behavior : url("chrome://global/content/xulBindings.xml#buttonleft");
min-width : 0px; min-width : 0px;
margin : 1px; 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-1:hover, .button-toolbar-1:hover:active,
.button-toolbar:hover, .button-toolbar:hover:active, .button-toolbar:hover, .button-toolbar:hover:active,
.button-toolbar-2:hover, .button-toolbar-2:hover:active, .button-toolbar-2:hover, .button-toolbar-2:hover:active,
.button-toolbar-4:hover, .button-toolbar-4:hover:active, .button-toolbar-4:hover, .button-toolbar-4:hover:active
{ {
border : 1px solid black; border : 1px solid #000000;
color : #0000FF; color : #0000FF;
} }
.button-toolbar:hover, .button-toolbar:hover:active
{
border : 1px solid #DDDDDD;
text-decoration : underline;
}
.button-toolbar-1 > .button-internal-box, .button-toolbar-1 > .button-internal-box,
.button-toolbar-2 > .button-internal-box .button-toolbar-2 > .button-internal-box
@ -50,7 +59,13 @@
text-align : center; text-align : center;
border : 1px solid #DDDDDD; 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"],
.button-toolbar-1[disabled="true"]:hover, .button-toolbar-1[disabled="true"]:hover,
.button-toolbar-1[disabled="true"]:hover:active, .button-toolbar-1[disabled="true"]:hover:active,
@ -70,34 +85,40 @@
/* internal frame */ /* internal frame */
.button-toolbar-1:hover > .button-internal-box, .button-toolbar-1:hover > .button-internal-box,
.button-toolbar:hover > .button-internal-box,
.button-toolbar-2:hover > .button-internal-box, .button-toolbar-2:hover > .button-internal-box,
.button-toolbar-4:hover > .button-internal-box .button-toolbar-4:hover > .button-internal-box
{ {
border-left : 1px solid white; border-left : 1px solid #FFFFFF;
border-top : 1px solid white; border-top : 1px solid #FFFFFF;
border-right : 1px solid #9D9D9D; border-right : 1px solid #9D9D9D;
border-bottom : 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-1:hover:active > .button-internal-box,
.button-toolbar-2:hover:active > .button-internal-box .button-toolbar-2:hover:active > .button-internal-box
{ {
padding : 3px 7px 1px 8px; padding : 3px 7px 1px 8px;
border-left : 1px solid #9D9D9D !important; border-left : 1px solid #444444 !important;
border-top : 1px solid #9D9D9D !important; border-top : 1px solid #444444 !important;
border-right : 1px solid white !important; border-right : 1px solid #AAAAAA !important;
border-bottom : 1px solid white !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 .button-toolbar-4:hover:active > .button-internal-box
{ {
padding : 1px 3px 0px 4px; padding : 1px 3px 0px 4px;
border-left : 1px solid #9D9D9D !important; border-left : 1px solid #9D9D9D !important;
border-top : 1px solid #9D9D9D !important; border-top : 1px solid #9D9D9D !important;
border-right : 1px solid white !important; border-right : 1px solid #FFFFFF !important;
border-bottom : 1px solid white !important; border-bottom : 1px solid #FFFFFF !important;
} }
.button-toolbar-1 > .button-internal-box > .button-text-container, .button-toolbar-1 > .button-internal-box > .button-text-container,
@ -137,6 +158,7 @@
margin : 0px 0px 0px 3px; margin : 0px 0px 0px 3px;
font-weight : bold; font-weight : bold;
user-focus: : ignore; user-focus: : ignore;
background-color : transparent;
/* behavior : url(chrome://global/content/xulBindings.xml#buttonleft); /* behavior : url(chrome://global/content/xulBindings.xml#buttonleft);
background-color : #99CCCC background-color : #99CCCC
border-left : 1px solid #DDDDDD !important; border-left : 1px solid #DDDDDD !important;
@ -167,7 +189,7 @@
button.expander button.expander
{ {
border : none; border : none;
padding : none; padding : 0px;
margin : 1px 5px 3px 1px; margin : 1px 5px 3px 1px;
background-color : inherit; background-color : inherit;
list-style-image : url("chrome://global/skin/twisty-closed.gif"); list-style-image : url("chrome://global/skin/twisty-closed.gif");
@ -193,8 +215,8 @@
{ {
border : none; border : none;
background-color : inherit; background-color : inherit;
padding : none; padding : 0px;
margin : none; margin : 0px;
} }
/* text frame */ /* text frame */

View File

@ -38,18 +38,18 @@
**/ **/
.button-toolbar > .menubutton-internal-box .button-toolbar > .menubutton-internal-box
{ {
border : none; border : none;
padding : 1px 3px 1px 3px; padding : 1px 3px 1px 3px;
} }
.button-toolbar[open="true"] > .menubutton-internal-box, .button-toolbar[open="true"] > .menubutton-internal-box,
.button-toolbar:hover:active > .menubutton-internal-box .button-toolbar:hover:active > .menubutton-internal-box
{ {
border : none; border : none;
padding : 1px 3px 1px 3px; padding : 1px 3px 1px 3px;
} }
.button-toolbar[open="true"] .button-toolbar[open="true"], .button-toolbar-4[open="true"]
{ {
border : 1px solid #000000; border : 1px solid #000000;
} }
@ -61,9 +61,10 @@
border : 1px solid #DDDDDD; 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 .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 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-left : 1px solid #FFFFFF;
border-top : 1px solid white; border-top : 1px solid #FFFFFF;
border-right : 1px solid #9D9D9D; border-right : 1px solid #9D9D9D;
border-bottom : 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-left : 1px solid #9D9D9D;
border-top : 1px solid #9D9D9D; border-top : 1px solid #9D9D9D;
border-right : 1px solid white; border-right : 1px solid #FFFFFF;
border-bottom : 1px solid white; border-bottom : 1px solid #FFFFFF;
padding : 2px 3px 0px 5px; padding : 2px 3px 0px 5px;
} }

View File

@ -100,5 +100,5 @@
border-bottom : 1px solid #9D9D9D; border-bottom : 1px solid #9D9D9D;
/* border-top : 1px solid #FFFFFF; DO NOT UNCOMMENT!!! THERE IS A BUG WHERE, /* border-top : 1px solid #FFFFFF; DO NOT UNCOMMENT!!! THERE IS A BUG WHERE,
FOR SOME REASON, BORDER-TOP CAUSES CERTAIN APPS 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) */
} }

View File

@ -96,7 +96,9 @@
.iframe-panel .iframe-panel
{ {
border-left : 1px solid threedhighlight; border-left : 1px solid threedhighlight;
border-top : 1px solid threedhighlight;
border-right : 1px solid threedshadow; border-right : 1px solid threedshadow;
border-bottom : 1px solid threedshadow; border-bottom : 1px solid threedshadow;
} /* 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) */
}

View File

@ -16,7 +16,7 @@
button-plain > .button-internal-box > .button-icon, button-plain > .button-internal-box > .button-icon,
button.plain > .button-internal-box > .button.icon:hover:active button.plain > .button-internal-box > .button.icon:hover:active
{ {
border : 0px ! important; border : 0px !important;
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;
color : #000000; color : #000000;
@ -27,10 +27,11 @@
button, .exit-dialog { button, .exit-dialog {
behavior : url(chrome://global/skin/buttonBindings.xml#exit-button); behavior : url(chrome://global/skin/buttonBindings.xml#exit-button);
border : 0px ! important; border : 0px;
user-focus : ignore; user-focus : ignore;
min-width : 60px; min-width : 60px;
color : #000000; color : #000000;
background-color : transparent !important; /* Greatly increases responsiveness and 'feel' */
} }
button { button {

View File

@ -155,7 +155,6 @@
min-width : 100px; min-width : 100px;
margin : 0px 4px 0px 4px; margin : 0px 4px 0px 4px;
border : 1px inset #CCCCCC; border : 1px inset #CCCCCC;
max-height : 1.5em;
} }
progressmeter > .progressmeter-internal-box progressmeter > .progressmeter-internal-box
@ -175,6 +174,11 @@
background-color : #999999; background-color : #999999;
} }
.progress-text
{
max-height : 1.5em;
}
/** XUL <scrollbar> element **/ /** XUL <scrollbar> element **/
scrollbar scrollbar
{ {

View File

@ -43,11 +43,12 @@ menupopup > menuitem, popup > menuitem
} }
/* Don't display grayed items in the contextual popup menus */ /* 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"] popup > menuitem[disabled="true"], popup > menu[disabled="true"]
{ {
display : none; display : none;
} }
*/
menuseparator menuseparator
{ {

View File

@ -39,13 +39,15 @@
.menubutton-dual[open="true"] > .classic-dropmarker-box .menubutton-dual[open="true"] > .classic-dropmarker-box
{ {
border-left : 1px solid #9D9D9D; border-left : 1px solid #444444;
border-top : 1px solid #9D9D9D; border-top : 1px solid #444444;
border-right : 1px solid #FFFFFF; border-right : 1px solid #AAAAAA;
border-bottom : 1px solid #FFFFFF; border-bottom : 1px solid #AAAAAA;
background-color : #666666;
} }
.classic-simplebutton, .classic-simplebutton,
.classic-simplebutton[disabled="true"],
.classic-simplebutton[disabled="true"]:hover, .classic-simplebutton[disabled="true"]:hover,
.classic-simplebutton[disabled="true"]:hover:active, .classic-simplebutton[disabled="true"]:hover:active,
.menubutton-dual[disabled="true"]:hover > .classic-simplebutton, .menubutton-dual[disabled="true"]:hover > .classic-simplebutton,
@ -58,8 +60,14 @@
min-width : 0px; min-width : 0px;
padding : 2px 8px 2px 7px; padding : 2px 8px 2px 7px;
text-align : center; text-align : center;
color : #777777;
} }
.classic-simplebutton
{
color: #000000;
}
.classic-simplebutton:hover, .classic-simplebutton:hover,
.menubutton-dual:hover > .classic-simplebutton, .menubutton-dual:hover > .classic-simplebutton,
@ -73,12 +81,13 @@
.classic-simplebutton:hover:active .classic-simplebutton:hover:active
{ {
border-left : 1px solid #9D9D9D !important; border-left : 1px solid #444444 !important;
border-top : 1px solid #9D9D9D !important; border-top : 1px solid #444444 !important;
border-right : 1px solid #FFFFFF !important; border-right : 1px solid #AAAAAA !important;
border-bottom : 1px solid #FFFFFF !important; border-bottom : 1px solid #AAAAAA !important;
padding : 3px 7px 1px 8px; padding : 3px 7px 1px 8px;
color : #000000; color : #FFFFFF;
background-color : #666666 !important;
} }
.classic-dropmarker .classic-dropmarker

View File

@ -57,7 +57,7 @@
<binding id="thumb" extends="xul:button"> <binding id="thumb" extends="xul:button">
<content> <content>
<xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1"> <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
<xul:spring flex="1"/> <xul:spring class="thumb-spring" flex="1"/>
</xul:box> </xul:box>
</content> </content>
</binding> </binding>

View File

@ -50,10 +50,12 @@ menupopup > menuitem, popup > menuitem
} }
/* Don't display grayed items in the contextual popup menus */ /* 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"] popup > menuitem[disabled="true"], popup > menu[disabled="true"]
{ {
display : none; display : none;
} }
*/
menuseparator menuseparator
{ {

View File

@ -39,6 +39,12 @@ thumb
border-bottom : 1px solid threedshadow; border-bottom : 1px solid threedshadow;
} }
.thumb-spring
{
min-width : 4px;
min-height : 4px;
}
/** /**
* Scrollbar button * Scrollbar button
**/ **/

View File

@ -57,7 +57,7 @@
<binding id="thumb" extends="xul:button"> <binding id="thumb" extends="xul:button">
<content> <content>
<xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1"> <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
<xul:spring flex="1"/> <xul:spring class="thumb-spring" flex="1"/>
</xul:box> </xul:box>
</content> </content>
</binding> </binding>

View File

@ -50,10 +50,12 @@ menupopup > menuitem, popup > menuitem
} }
/* Don't display grayed items in the contextual popup menus */ /* 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"] popup > menuitem[disabled="true"], popup > menu[disabled="true"]
{ {
display : none; display : none;
} }
*/
menuseparator menuseparator

View File

@ -39,6 +39,12 @@ thumb
border-bottom : 1px solid threedshadow; border-bottom : 1px solid threedshadow;
} }
.thumb-spring
{
min-width : 4px;
min-height : 4px;
}
/** /**
* Scrollbar button * Scrollbar button
**/ **/
@ -120,4 +126,4 @@ slider
background-color : scrollbar; background-color : scrollbar;
background-image : url("chrome://global/skin/scrollbar-slider-bg.gif"); background-image : url("chrome://global/skin/scrollbar-slider-bg.gif");
} }

View File

@ -70,10 +70,14 @@ Rights Reserved.
margin: 0px; margin: 0px;
} }
html|a[class="CardViewText"] { html|a {
padding-left: 20px; padding-left: 0px;
padding-right: 2px; padding-right: 2px;
min-width: 30px; border: none !important;
}
html|p {
border: none !important;
} }

View File

@ -70,10 +70,14 @@ Rights Reserved.
margin: 0px; margin: 0px;
} }
html|a[class="CardViewText"] { html|a {
padding-left: 20px; padding-left: 0px;
padding-right: 2px; padding-right: 2px;
min-width: 30px; border: none !important;
}
html|p {
border: none !important;
} }