From 90eb7d62578dbd159e9bc79ef10523a3617d04d5 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Wed, 24 May 2000 13:45:43 +0000 Subject: [PATCH] classic skin work (not part of build) --- themes/classic/global/win/checkbox.css | 109 ++++++++++-------- themes/classic/global/win/classicBindings.xml | 17 ++- themes/classic/global/win/makefile.win | 1 + themes/classic/global/win/menulist.css | 19 ++- .../classic/global/win/menulistBindings.xml | 6 +- themes/classic/global/win/tree.css | 109 ++++++++++-------- themes/classic/global/win/treeBindings.xml | 18 +++ 7 files changed, 174 insertions(+), 105 deletions(-) create mode 100644 themes/classic/global/win/treeBindings.xml diff --git a/themes/classic/global/win/checkbox.css b/themes/classic/global/win/checkbox.css index 4ce6b3ebf88..f7146b9b707 100644 --- a/themes/classic/global/win/checkbox.css +++ b/themes/classic/global/win/checkbox.css @@ -1,74 +1,83 @@ /* stylesheet for XUL element */ /* default checkbox for dialogs */ - -/* outer checkbox frame */ +/* outer frame */ checkbox { - margin: 3px 5px 3px 5px; + behavior : url("chrome://global/skin/classicBindings.xml#checkbox"); + margin : 3px 5px 3px 5px; } -/* checkmark outer frame */ - checkbox > .internal-box > .checkmark-box + .checkbox-checkmark-box-1 { - border-left: 1px solid threedshadow; - border-top: 1px solid threedshadow; - border-right: 1px solid threedhighlight; - border-bottom: 1px solid threedhighlight; - background-color: window; - margin-top: 2px; - margin-right: 4px; + border-top : 1px solid threedshadow; + border-left : 1px solid threedshadow; + border-right : 1px solid threedhighlight; + border-bottom : 1px solid threedhighlight; + background-color : #FFFFFF; + margin : 2px 2px 0px 0px; + width : 13px; + height : 13px; } -/* checkmark inner frame */ - checkbox > .internal-box > .checkmark-box > .checkbox-check + .checkbox-checkmark-box-1[disabled="true"] { - border-left: 1px solid threeddarkshadow; - border-top: 1px solid threeddarkshadow; - border-right: 1px solid threedface; - border-bottom: 1px solid threedface; - width: 11px; - height: 11px; - list-style-image: none; + background-color : threedface; } - - checkbox[checked="true"] > .internal-box > .checkmark-box > .checkbox-check + + .checkbox-checkmark-box-2 { - padding: 1px; - list-style-image: url(chrome://global/skin/check-check.gif); - } - - checkbox[checked="true"][disabled="true"] > .internal-box > .checkmark-box > .checkbox-check - { - padding: 1px; - list-style-image: url(chrome://global/skin/check-check-disabled.gif); + border-left : 1px solid threeddarkshadow; + border-top : 1px solid threeddarkshadow; + border-right : 1px solid threedface; + border-bottom : 1px solid threedface; + padding : 1px; + width : 11px; + height : 11px; } - checkbox:hover:active > .internal-box > .checkmark-box, - checkbox[disabled="true"] > .internal-box > .checkmark-box + /* ensure that no list-style-image is inherited in from the Outside */ + .checkbox-check { - background-color: threedface; - } - - checkbox > .internal-box > .checkbox-icon - { - list-style-image: inherit; - } - -/* checkmark label/icon frame */ - checkbox[value] > .internal-box > html - { - margin: 0px 0px 0px 4px; - padding: 1px; + list-style-image : none; } - checkbox[disabled="true"][value] > .internal-box > html + .checkbox-check[checked="true"] { - color: graytext; + list-style-image : url(chrome://global/skin/check-check.gif); } - - checkbox:focus > .internal-box > html + + .checkbox-check[checked="true"][disabled="true"] { + list-style-image : url(chrome://global/skin/check-check-disabled.gif); + } + + checkbox:hover:active > .checkbox-internal-box > .checkbox-checkmark-box-1 + { + background-color : threedface; + } + +/* text/icon frames */ + .checkbox-text + { + margin : 0px 0px 0px 2px; + padding : 1px; + } + + .checkbox-icon + { + list-style-image : inherit; + } + + .checkbox-text[disabled="true"] + { + color : graytext; + } + + checkbox:focus > .checkbox-internal-box > .checkbox-text + { border : 1px dotted threeddarkshadow; padding : 0px; } + + \ No newline at end of file diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml index 42ca1f6f644..0840f5a88e5 100644 --- a/themes/classic/global/win/classicBindings.xml +++ b/themes/classic/global/win/classicBindings.xml @@ -36,7 +36,22 @@ - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/classic/global/win/makefile.win b/themes/classic/global/win/makefile.win index d5610dac717..1308d20caca 100644 --- a/themes/classic/global/win/makefile.win +++ b/themes/classic/global/win/makefile.win @@ -53,3 +53,4 @@ install:: $(MAKE_INSTALL) buttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) classicBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menulistBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) treeBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin diff --git a/themes/classic/global/win/menulist.css b/themes/classic/global/win/menulist.css index 2e5a107bab4..6213e70c4a4 100644 --- a/themes/classic/global/win/menulist.css +++ b/themes/classic/global/win/menulist.css @@ -28,10 +28,23 @@ border-bottom : 1px solid threedface; } + .menulist-display-box + { + border : 1px solid window; + margin : 1px; + } + + menulist:focus > .menulist-internal-box > .menulist-display-box + { + border : 1px dotted #F5DB95; + background-color : highlight; + color : highlighttext; + } + /* text display frame */ .menulist-text { - padding : 2px 4px 2px 4px; + padding : 0px 2px 0px 2px; margin: : 0px; } @@ -65,12 +78,12 @@ padding : 2px; } - .menulist-dropmarker-box-1[open="true"] + menulist:hover:active > .menulist-internal-box > .menulist-dropmarker-box-1[open="true"] { border : 1px solid threedshadow; } - .menulist-dropmarker-box-2[open="true"] + menulist:hover:active > .menulist-internal-box > .menulist-dropmarker-box-1 > .menulist-dropmarker-box-2[open="true"] { border : 1px solid threedface; padding : 3px 0px 1px 2px; diff --git a/themes/classic/global/win/menulistBindings.xml b/themes/classic/global/win/menulistBindings.xml index f6a72ee90d1..acbd7c993d6 100644 --- a/themes/classic/global/win/menulistBindings.xml +++ b/themes/classic/global/win/menulistBindings.xml @@ -12,8 +12,10 @@ - - + + + + diff --git a/themes/classic/global/win/tree.css b/themes/classic/global/win/tree.css index a596c19def2..fc2ef42c14f 100644 --- a/themes/classic/global/win/tree.css +++ b/themes/classic/global/win/tree.css @@ -5,67 +5,78 @@ * basic tree widget for use in main windows where no decoration * is required. **/ -tree { - background-color: window; - border: none; - border-spacing: 0px; - font: list; -} - -/** class="inset" ************************************************* - * this is the tree class used by dialogs to create treeviews with - * inset borders, and default dialog spacing. - **/ -tree.inset { - border-left: 1px solid threedshadow; - border-top: 1px solid threedshadow; - border-right: 1px solid threedhighlight; - border-bottom: 1px soild threedhighlight; - margin: 1px 5px 2px 5px; -} +tree + { + background-color : window; + border-spacing : 0px; + font : list; + border-left : 1px solid threedshadow; + border-top : 1px solid threedshadow; + border-right : 1px solid threedhighlight; + border-bottom : 1px soild threedhighlight; + } + +tree.inset + { + margin : 1px 5px 2px 5px; + } treeitem[selected="true"] > treerow { color: highlighttext; background-color: highlight; } -treecell { - white-space: nowrap; - vertical-align: middle; - padding: 1px 0px 1px 2px; -} +treecell + { + white-space : nowrap; + vertical-align : middle; + padding : 1px 0px 1px 2px; + } -.treecell-header { - background-color: threedface; - color: windowtext; - vertical-align: middle; - padding: 0px 0px 0px 5px; -} +.treecell-header, +.treecell-inset-header + { + behavior : url("chrome://global/skin/treeBindings.xml#treecell-header"); + border-left : 1px solid threedface !important; + border-top : 1px solid threedface !important; + border-right : 1px solid threeddarkshadow !important; + border-bottom : 1px solid threeddarkshadow !important; + background-color : threedface; + padding : 0px; + } -.treecell-inset-header { - border-left: 1px solid threedhighlight; - border-top: 1px solid threedhighlight; - border-right: 1px solid threedshadow; - border-bottom: 1px solid threedshadow; - background-color: threedface; - padding: 2px 5px 2px 4px; -} - -tree.inset > treehead > treerow > treecell.sortable:hover:active { - border-left: 1px solid threedshadow; - border-top: 1px solid threedshadow; - border-right: 1px solid threedhighlight; - border-bottom: 1px solid threedhighlight; -} +.treecell-header-box + { + border-left : 1px solid threedhighlight; + border-top : 1px solid threedhighlight; + border-right : 1px solid threedshadow; + border-bottom : 1px solid threedshadow; + padding : 2px 5px 2px 4px; + } + +.sortable.treecell-header:hover:active, +.sortable.treecell-inset-header:hover:active + { + border : 1px solid threedshadow; + } +.sortable.treecell-header:hover:active > .treecell-header-box, +.sortable.treecell-inset-header:hover:active > .treecell-header-box + { + border : 1px solid threedface; + padding : 3px 4px 1px 5px; + } + + /** class="propertylist" ****************************************** * class for cells in grid-formatted property lists. **/ -treecell.propertylist { - padding-left: 5px; - border-right: 1px solid threedface; - border-bottom: 1px solid threedface; -} +treecell.propertylist + { + padding-left : 5px; + border-right : 1px solid threedface; + border-bottom : 1px solid threedface; + } .tree-cell-primary-icon { list-style-image: inherit; diff --git a/themes/classic/global/win/treeBindings.xml b/themes/classic/global/win/treeBindings.xml new file mode 100644 index 00000000000..b7b73e3acbc --- /dev/null +++ b/themes/classic/global/win/treeBindings.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file