From b703de8869b6706931e7a88fae272ae6442c0ce8 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Tue, 14 Mar 2000 11:17:11 +0000 Subject: [PATCH] Moving scrollbars into separate file. Adding XBL for radios and tabs. git-svn-id: svn://10.0.0.236/trunk@62916 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/global/resources/skin/MANIFEST | 1 + .../xpfe/global/resources/skin/Makefile.in | 1 + .../xpfe/global/resources/skin/makefile.win | 1 + .../xpfe/global/resources/skin/scrollbars.css | 114 ++++++++ mozilla/xpfe/global/resources/skin/xul.css | 257 ++---------------- .../global/resources/skin/xulBindings.xml | 63 +++++ 6 files changed, 201 insertions(+), 236 deletions(-) create mode 100644 mozilla/xpfe/global/resources/skin/scrollbars.css diff --git a/mozilla/xpfe/global/resources/skin/MANIFEST b/mozilla/xpfe/global/resources/skin/MANIFEST index 5b98e1434fd..2babf647b66 100644 --- a/mozilla/xpfe/global/resources/skin/MANIFEST +++ b/mozilla/xpfe/global/resources/skin/MANIFEST @@ -1,6 +1,7 @@ tasksOverlay.css globalBindings.xml global.css +scrollbars.css commonDialog.css dialogOverlay.css lessCols.gif diff --git a/mozilla/xpfe/global/resources/skin/Makefile.in b/mozilla/xpfe/global/resources/skin/Makefile.in index cb374b9d581..3ce140555a3 100644 --- a/mozilla/xpfe/global/resources/skin/Makefile.in +++ b/mozilla/xpfe/global/resources/skin/Makefile.in @@ -32,6 +32,7 @@ EXPORT_RESOURCE_CONTENT = \ $(srcdir)/tasksOverlay.css \ $(srcdir)/globalBindings.xml \ $(srcdir)/global.css \ + $(srcdir)/scrollbars.css \ $(srcdir)/lessCols.gif \ $(srcdir)/lessCols_mo.gif \ $(srcdir)/lessCOls_dis.gif \ diff --git a/mozilla/xpfe/global/resources/skin/makefile.win b/mozilla/xpfe/global/resources/skin/makefile.win index 5c5327d954e..5011654156b 100644 --- a/mozilla/xpfe/global/resources/skin/makefile.win +++ b/mozilla/xpfe/global/resources/skin/makefile.win @@ -32,6 +32,7 @@ install:: $(MAKE_INSTALL) tasksOverlay.css $(DISTBROWSER) $(MAKE_INSTALL) globalBindings.xml $(DISTBROWSER) $(MAKE_INSTALL) global.css $(DISTBROWSER) + $(MAKE_INSTALL) scrollbars.css $(DISTBROWSER) $(MAKE_INSTALL) htmlBindings.xml $(DISTXUL) $(MAKE_INSTALL) xulBindings.xml $(DISTXUL) $(MAKE_INSTALL) xul.css $(DISTXUL) diff --git a/mozilla/xpfe/global/resources/skin/scrollbars.css b/mozilla/xpfe/global/resources/skin/scrollbars.css new file mode 100644 index 00000000000..a40f3f04456 --- /dev/null +++ b/mozilla/xpfe/global/resources/skin/scrollbars.css @@ -0,0 +1,114 @@ +@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* set default namespace to XUL */ + +/********* XP Scrollbar *********/ + +scrollbar { + behavior: url("resource:/chrome/xulBindings.xml#scrollbar"); +} + +slider { + user-focus: ignore; +} + +scrollbarbutton { + display: inline; + user-focus: ignore; +} + +scrollbar[value="hidden"] { + visibility: hidden; + user-focus: ignore; +} + +/********* XP Scrollbar *********/ + +thumb { + behavior: url(resource:/chrome/xulBindings.xml#thumb); + user-focus: ignore; + background-color: #CCCCCC; + border: 1px outset #CCCCCC; + list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif") +} + +thumb[disabled="true"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif"); +} + +thumb[align="vertical"] { + list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif") +} + +scrollbarbutton { + user-focus: ignore; + vertical-align: bottom; + cursor: default; + + border: 1px outset white; + background-color: #CCCCCC; + color:black; + + padding: 1px; +} + +scrollbarbutton:active { + user-focus: ignore; + border-style: inset; + + padding-left: 2px; + padding-right: 0px; + padding-top: 2px; + padding-bottom: 0px; +} + +scrollbarbutton[type="decrement"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-left.gif") +} + +scrollbarbutton[type="decrement"][disabled="true"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-left-disabled.gif") +} + +scrollbarbutton[type="increment"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-right.gif") +} + + +scrollbarbutton[type="increment"][disabled="true"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-right-disabled.gif") +} + + +scrollbar[align="vertical"] scrollbarbutton[type="decrement"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-up.gif") +} + +scrollbar[align="vertical"] scrollbarbutton[type="decrement"][disabled="true"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-up-disabled.gif") +} + +scrollbar[align="vertical"] scrollbarbutton[type="increment"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-down.gif") +} + +scrollbar[align="vertical"] scrollbarbutton[type="increment"][disabled="true"] { + user-focus: ignore; + list-style-image: url("chrome://global/skin/scroll-down-disabled.gif") +} + +slider[align="vertical"] thumb:active { + user-focus: ignore; + background-color: #CCCCCC; +} + +slider { + user-focus: ignore; + background-color: #999999; +} diff --git a/mozilla/xpfe/global/resources/skin/xul.css b/mozilla/xpfe/global/resources/skin/xul.css index bd0cb698cf8..751928791b1 100644 --- a/mozilla/xpfe/global/resources/skin/xul.css +++ b/mozilla/xpfe/global/resources/skin/xul.css @@ -6,6 +6,8 @@ CHANGES REVIEWED BY hyatt@netscape.com. **/ +@import url(chrome://global/skin/scrollbars.css); + @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* set default namespace to XUL */ * { @@ -36,7 +38,6 @@ template { **********************************/ window { - display: block; overflow: hidden; height: 100%; width: 100%; @@ -54,27 +55,14 @@ browser, editor, iframe { /******** Box *******/ -box { - display: block; -} - - -/** - * Used as a space between things in boxes - */ -spring { - display: block; -} /******* ToolBox & ToolBar *******/ toolbox { - display: block; user-focus: ignore; } toolbar, menubar { - display:block; user-focus: ignore; } @@ -92,22 +80,8 @@ toolbarseparator { /****** Progress Meter ********/ -progressmeter { - display: inline; -} - /****** TitledBox ******/ -titledbox -{ - display: block; -} - -title -{ - display: block; -} - /********* XP Menus ***********/ menubar[collapsed="true"] { @@ -122,8 +96,7 @@ menubar > menu { } menu,menuitem { - display: block; - behavior: url("resource:/chrome/xulBindings.xml#menus"); + behavior: url("resource:/chrome/xulBindings.xml#menus"); } menu[hidden="true"] { @@ -133,9 +106,6 @@ menu[hidden="true"] { menuitem[hidden="true"] { display:none; } -popupset { - display: block; -} menupopup { display: none; @@ -166,10 +136,6 @@ popup[menuactive="true"] { visibility: visible; } -menuseparator { - display: block; -} - menuseparator[hidden="true"] { display: none; } @@ -188,10 +154,6 @@ menubutton { /******** Titled buttons **********/ -titledbutton { - display: inline; -} - /******** Tree widget **********/ tree { @@ -250,217 +212,40 @@ treecolgroup { /********** Tab widget *********/ -tab { - display: inline; -} - -tab:active { - display: inline; -} - -tabbox { - display: block; -} - -tabcontrol { - display: block; +tab { + behavior: url(resource:/chrome/xulBindings.xml#tab); } :-moz-deck-hidden { visibility: hidden; } -/********* XP Scrollbar *********/ - -scrollbar { - behavior: url("resource:/chrome/xulBindings.xml#scrollbar"); -} - -thumb { - display: block; - user-focus: ignore; -} - -slider { - display: block; - user-focus: ignore; -} - -scrollbarbutton { - display: inline; - user-focus: ignore; -} - -scrollbar[value="hidden"] { - visibility: hidden; - user-focus: ignore; -} - -/********* XP Scrollbar *********/ - -thumb { - user-focus: ignore; - background-color: #CCCCCC; - border: 1px outset white; - list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -thumb:hover { - list-style-image: url(chrome://global/skin/scroll-thumb-horiz-hover.gif); -} -*/ - -thumb[disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif"); -} - -slider[align="vertical"] thumb { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -slider[align="vertical"] thumb:hover { - list-style-image: url(chrome://global/skin/scroll-thumb-vert-hover.gif); - -} -*/ - -slider[align="vertical"] thumb[disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-thumb-vert-disabled.gif"); -} - -thumb:active { - user-focus: ignore; - background-color: #CCCCCC; -} - -slider[align="vertical"] thumb:active { - user-focus: ignore; - background-color: #CCCCCC; -} - - -slider { - user-focus: ignore; - background-color: #999999; -} - -scrollbarbutton { - user-focus: ignore; - vertical-align: bottom; - cursor: default; - - border: 1px outset white; - background-color: #CCCCCC; - color:black; - - padding: 1px; -} - -scrollbarbutton:active { - user-focus: ignore; - border-style: inset; - - padding-left: 2px; - padding-right: 0px; - padding-top: 2px; - padding-bottom: 0px; -} - -scrollbarbutton[type="decrement"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-left.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -scrollbarbutton[type="decrement"]:hover { - list-style-image: url(chrome://global/skin/scroll-left-hover.gif) -} -*/ - -scrollbarbutton[type="decrement"][disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-left-disabled.gif") -} - -scrollbarbutton[type="increment"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-right.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -scrollbarbutton[type="increment"]:hover { - list-style-image: url(chrome://global/skin/scroll-right-hover.gif) -} -*/ - -scrollbarbutton[type="increment"][disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-right-disabled.gif") -} - - -scrollbar[align="vertical"] scrollbarbutton[type="decrement"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-up.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -scrollbar[align="vertical"] scrollbarbutton[type="decrement"]:hover { - list-style-image: url(chrome://global/skin/scroll-up-hover.gif) -} -*/ - -scrollbar[align="vertical"] scrollbarbutton[type="decrement"][disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-up-disabled.gif") -} - -scrollbar[align="vertical"] scrollbarbutton[type="increment"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-down.gif") -} - -/* -pinkerton - workaround. removed until bug 15722 can be fixed. -scrollbar[align="vertical"] scrollbarbutton[type="increment"]:hover { - list-style-image: url(chrome://global/skin/scroll-down-hover.gif) -} -*/ - -scrollbar[align="vertical"] scrollbarbutton[type="increment"][disabled="true"] { - user-focus: ignore; - list-style-image: url("chrome://global/skin/scroll-down-disabled.gif") -} - -splitter { - display: block; -} - -grippy { - display: block; -} - - /********** checkbox **********/ checkbox { behavior: url(resource:/chrome/xulBindings.xml#checkbox); } +radio { + behavior: url(resource:/chrome/xulBindings.xml#radio); +} + +button, button.left { + behavior: url(resource:/chrome/xulBindings.xml#buttonleft); +} + radiogroup { behavior: url(resource:/chrome/xulBindings.xml#radiogroup); } +button.top { + behavior: url(resource:/chrome/xulBindings.xml#buttontop); +} + +button.right { + behavior: url(resource:/chrome/xulBindings.xml#buttonright); +} + separator { behavior: url(resource:/chrome/xulBindings.xml#separator); } diff --git a/mozilla/xpfe/global/resources/skin/xulBindings.xml b/mozilla/xpfe/global/resources/skin/xulBindings.xml index cfd2fa92bd4..1aaeb0b9548 100644 --- a/mozilla/xpfe/global/resources/skin/xulBindings.xml +++ b/mozilla/xpfe/global/resources/skin/xulBindings.xml @@ -13,6 +13,19 @@ + + + + + + + + + + + + + @@ -84,12 +97,27 @@ + + + + + + + + + + + + + + + @@ -97,6 +125,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +