From 49b3625282f4a296d5dc9ee6df0e7f7f39080004 Mon Sep 17 00:00:00 2001 From: "hewitt%netscape.com" Date: Wed, 19 Dec 2001 15:05:02 +0000 Subject: [PATCH] more xul simplification changes --- .../global/mac/scrollbar/slider-hrz.gif | Bin 65 -> 58 bytes .../global/mac/scrollbar/slider-vrt.gif | Bin 65 -> 58 bytes themes/classic/global/mac/scrollbars.css | 54 +++++++----------- .../resources/content/bindings/scrollbar.xml | 12 ++-- 4 files changed, 26 insertions(+), 40 deletions(-) diff --git a/themes/classic/global/mac/scrollbar/slider-hrz.gif b/themes/classic/global/mac/scrollbar/slider-hrz.gif index 3404b84bb543119d6a652a90e5a071a5731e3e3b..bbecb07bd880a69ac7b6b370a9fe95678e0d078f 100644 GIT binary patch delta 37 pcmZ>?;&k_Pv#?BLWDuChDI==G00clb0|PUAgu<17iBnh@tO0dR2F?Hg delta 44 tcmcC=?Vt4m+v#?AQn8+?Cs>1*T0t}1{49x5i3RnImPGMoN1^{re2Fm~d delta 42 scmcC=WOw&;v#?C$o5(IFqxh4B0R(hF1Rnz<0|PS~htnN7Wkv>T0GN0N5C8xG diff --git a/themes/classic/global/mac/scrollbars.css b/themes/classic/global/mac/scrollbars.css index 53b463c57fd0..3d59b5141f80 100644 --- a/themes/classic/global/mac/scrollbars.css +++ b/themes/classic/global/mac/scrollbars.css @@ -37,34 +37,26 @@ scrollbar { /* ::::: slider ::::: */ slider { - border-top: 1px solid #000000; - width: 14px; + height: 16px; background: url("chrome://global/skin/scrollbar/slider-hrz.gif") #AAAAAA; } slider[orient="vertical"] { - border-top: none; - border-right: 1px solid #000000; - border-bottom: none; - border-left: 1px solid #000000; - width: none; - height: 14px; + width: 16px; + height: none; background-image: url("chrome://global/skin/scrollbar/slider-vrt.gif"); } /* ::::: borders for thumb and buttons ::::: */ thumb { - border-top: 1px solid; - border-right: 2px solid; - border-bottom: 1px solid; - border-left: 2px solid; - -moz-border-top-colors: -moz-mac-accentregularhighlight; + border: 2px solid; + -moz-border-top-colors: #000000 -moz-mac-accentregularhighlight; -moz-border-right-colors: #000000 -moz-mac-accentlightshadow; - -moz-border-bottom-colors: -moz-mac-accentlightshadow; + -moz-border-bottom-colors: #000000 -moz-mac-accentlightshadow; -moz-border-left-colors: #000000 -moz-mac-accentregularhighlight; - background-color: -moz-mac-accentface; - list-style-image: url("chrome://global/skin/scrollbar/thumb-hrz.png"); + min-width: 10px; + background: url("chrome://global/skin/scrollbar/thumb-hrz.png") -moz-mac-accentface no-repeat 50% 50%; } thumb:active { @@ -73,23 +65,17 @@ thumb:active { -moz-border-bottom-colors: #000000 -moz-mac-accentlightshadow; -moz-border-left-colors: #000000 -moz-mac-accentregularhighlight; background-color: -moz-mac-accentlightshadow; - list-style-image: url("chrome://global/skin/scrollbar/thumb-hrz-act.png"); + background-image: url("chrome://global/skin/scrollbar/thumb-hrz-act.png"); } thumb[orient="vertical"] { - border-top: 2px solid; - border-right: 1px solid; - border-bottom: 2px solid; - border-left: 1px solid; - -moz-border-top-colors: #000000 -moz-mac-accentregularhighlight; - -moz-border-right-colors: -moz-mac-accentlightshadow; - -moz-border-bottom-colors: #000000 -moz-mac-accentlightshadow; - -moz-border-left-colors: -moz-mac-accentregularhighlight; - list-style-image: url("chrome://global/skin/scrollbar/thumb-vrt.gif"); + min-width: 0; + min-height: 10px; + background-image: url("chrome://global/skin/scrollbar/thumb-vrt.png"); } -thumb[orient="horizontal"]:active { - list-style-image: url("chrome://global/skin/scrollbar/thumb-vrt-act.gif"); +thumb[orient="vertical"]:active { + background-image: url("chrome://global/skin/scrollbar/thumb-vrt-act.png"); } /* ::::: thumb (horizontal) ::::: */ @@ -112,15 +98,15 @@ scrollbarbutton { -moz-border-right-colors: #000000 #BBBBBB; -moz-border-bottom-colors: #000000 #BBBBBB; -moz-border-left-colors: #000000 #FFFFFF; - background: -moz-Dialog no-repeat 50% 50%; + background: #DDDDDD no-repeat 50% 50%; } scrollbarbutton:hover:active { - -moz-border-top-colors: ThreeDDarkShadow -moz-Dialog; - -moz-border-right-colors: ThreeDDarkShadow -moz-Dialog; - -moz-border-bottom-colors: ThreeDDarkShadow -moz-Dialog; - -moz-border-left-colors: ThreeDDarkShadow -moz-Dialog; - background-color: ThreeDShadow; + -moz-border-top-colors: #000000 #444444; + -moz-border-right-colors: #000000 #AAAAAA; + -moz-border-bottom-colors: #000000 #AAAAAA; + -moz-border-left-colors: #000000 #444444; + background-color: #666666; } /* ..... increment .... */ diff --git a/xpfe/global/resources/content/bindings/scrollbar.xml b/xpfe/global/resources/content/bindings/scrollbar.xml index 30c2e215999f..97b669bf8593 100644 --- a/xpfe/global/resources/content/bindings/scrollbar.xml +++ b/xpfe/global/resources/content/bindings/scrollbar.xml @@ -35,20 +35,20 @@ if ( scrollbarStyle == "double" ) { downTop = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-down-top"); upBottom = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-up-bottom"); - downTop.removeAttribute("collapsed"); - upBottom.removeAttribute("collapsed"); + downTop.removeAttribute("hidden"); + upBottom.removeAttribute("hidden"); } else if ( scrollbarStyle == "doubletop" ) { downTop = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-down-top"); var downBottom = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-down-bottom"); - downTop.removeAttribute("collapsed"); - downBottom.setAttribute("collapsed","true"); + downTop.removeAttribute("hidden"); + downBottom.setAttribute("hidden","true"); } else if ( scrollbarStyle == "doublebottom" ) { var upTop = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-up-top"); upBottom = document.getAnonymousElementByAttribute(this, "sbattr", "scrollbar-up-bottom"); - upTop.setAttribute("collapsed","true"); - upBottom.removeAttribute("collapsed"); + upTop.setAttribute("hidden","true"); + upBottom.removeAttribute("hidden"); } if ( thumbStyle == "fixed" ) { var thumb = document.getAnonymousElementByAttribute(this, "sbattr","scrollbar-thumb");