Bug 395454 - "[Mac] Have one file, scrollbars.css" [p=mozcbarrett@gmail.com (Colin Barrett [cbarrett]) r=Enn r=Neil sr=roc a1.9=damons]

This commit is contained in:
reed@reedloden.com 2008-03-14 08:24:50 -07:00
parent 4a2ac6e90c
commit 170c0984dc
6 changed files with 13 additions and 31 deletions

View File

@ -46,8 +46,7 @@
<?xml-stylesheet href="chrome://global/skin/menubutton.css"?>
<?xml-stylesheet href="chrome://global/skin/menulist.css"?>
<?xml-stylesheet href="chrome://global/skin/radio.css"?>
<?xml-stylesheet href="chrome://global/skin/nativescrollbars.css"?>
<?xml-stylesheet href="chrome://global/skin/xulscrollbars.css"?>
<?xml-stylesheet href="chrome://global/skin/scrollbars.css"?>
<?xml-stylesheet href="chrome://global/skin/splitter.css"?>
<?xml-stylesheet href="chrome://global/skin/tabcontrol.css"?>
<?xml-stylesheet href="chrome://global/skin/tasksOverlay.css"?>

View File

@ -80,20 +80,12 @@ nsLayoutStylesheetCache::ScrollbarsSheet()
if (!gStyleCache->mScrollbarsSheet) {
nsCOMPtr<nsIURI> sheetURI;
NS_NewURI(getter_AddRefs(sheetURI),
#ifdef XP_MACOSX
NS_LITERAL_CSTRING("chrome://global/skin/nativescrollbars.css"));
#else
NS_LITERAL_CSTRING("chrome://global/skin/xulscrollbars.css"));
#endif
NS_LITERAL_CSTRING("chrome://global/skin/scrollbars.css"));
// Scrollbars don't need access to unsafe rules
if (sheetURI)
LoadSheet(sheetURI, gStyleCache->mScrollbarsSheet, PR_FALSE);
#ifdef XP_MACOSX
NS_ASSERTION(gStyleCache->mScrollbarsSheet, "Could not load nativescrollbars.css.");
#else
NS_ASSERTION(gStyleCache->mScrollbarsSheet, "Could not load xulscrollbars.css.");
#endif
NS_ASSERTION(gStyleCache->mScrollbarsSheet, "Could not load scrollbars.css.");
}
return gStyleCache->mScrollbarsSheet;

View File

@ -37,10 +37,7 @@ classic.jar:
+ skin/classic/global/progressmeter.css
+ skin/classic/global/radio.css
+ skin/classic/global/richlistbox.css
# chrome://global/skin/nativescrollbars.css is used on Mac
+ skin/classic/global/nativescrollbars.css
# chrome://global/skin/xulscrollbars.css is used on non-Mac platforms
+ skin/classic/global/xulscrollbars.css (../../winstripe/global/xulscrollbars.css)
+ skin/classic/global/scrollbars.css (nativescrollbars.css)
*+ skin/classic/global/scale.css
+ skin/classic/global/scrollbox.css
+ skin/classic/global/spinbuttons.css

View File

@ -60,21 +60,21 @@ html|select[multiple] > scrollbar {
/* ..... track ..... */
slider {
-moz-appearance: scrollbartrack-vertical;
-moz-appearance: scrollbartrack-horizontal;
}
slider[orient="horizontal"] {
-moz-appearance: scrollbartrack-horizontal;
slider[orient="vertical"] {
-moz-appearance: scrollbartrack-vertical;
}
/* ..... thumb ..... */
thumb {
-moz-appearance: scrollbarthumb-vertical;
-moz-appearance: scrollbarthumb-horizontal;
}
thumb[orient="horizontal"] {
-moz-appearance: scrollbarthumb-horizontal;
thumb[orient="vertical"] {
-moz-appearance: scrollbarthumb-vertical;
}
/* ..... increment ..... */

View File

@ -2,7 +2,7 @@ classic.jar:
+ skin/classic/global/popup.css
+ skin/classic/global/menu.css
+ skin/classic/global/toolbar.css
+ skin/classic/global/xulscrollbars.css
+ skin/classic/global/scrollbars.css (xulscrollbars.css)
+ skin/classic/global/menu/Menu-arrow.png (menu/Menu-arrow.png)
+ skin/classic/global/menu/menu-check.gif (menu/menu-check.gif)
+ skin/classic/global/arrow/arrow-up.gif (arrow/arrow-up.gif)

View File

@ -32,10 +32,7 @@ classic.jar:
skin/classic/global/progressmeter.css
skin/classic/global/radio.css
skin/classic/global/richlistbox.css
# chrome://global/skin/nativescrollbars.css is used on Mac
skin/classic/global/nativescrollbars.css (../../pinstripe/global/nativescrollbars.css)
# chrome://global/skin/xulscrollbars.css is used on non-Mac platforms
skin/classic/global/xulscrollbars.css
skin/classic/global/scrollbars.css (xulscrollbars.css)
skin/classic/global/scrollbox.css
skin/classic/global/spinbuttons.css
skin/classic/global/splitter.css
@ -154,10 +151,7 @@ classic.jar:
skin/classic/aero/global/progressmeter.css
skin/classic/aero/global/radio.css
skin/classic/aero/global/richlistbox.css
# chrome://global/skin/nativescrollbars.css is used on Mac
skin/classic/aero/global/nativescrollbars.css (../../pinstripe/global/nativescrollbars.css)
# chrome://global/skin/xulscrollbars.css is used on non-Mac platforms
skin/classic/aero/global/xulscrollbars.css
skin/classic/aero/global/scrollbars.css (xulscrollbars.css)
skin/classic/aero/global/scrollbox.css
skin/classic/aero/global/spinbuttons.css
skin/classic/aero/global/splitter.css