moved style rules for new widgets into separate files, added selected twisty images

This commit is contained in:
ben%netscape.com 2000-03-18 06:13:23 +00:00
Родитель 5d16c645ad
Коммит 5f49a3cf02
11 изменённых файлов: 341 добавлений и 292 удалений

Просмотреть файл

@ -1,6 +1,11 @@
tasksOverlay.css
globalBindings.xml
global.css
button.css
checkbox.css
menubutton.css
menulist.css
radio.css
scrollbars.css
commonDialog.css
dialogOverlay.css
@ -41,7 +46,9 @@ scroll-thumb-horiz.gif
scroll-thumb-horiz-hover.gif
scroll-thumb-horiz-disabled.gif
opentwisty.gif
opentwisty-selected.gif
closedtwisty.gif
closedtwisty-selected.gif
alert-icon.gif
error-icon.gif
message-icon.gif

Просмотреть файл

@ -32,6 +32,11 @@ EXPORT_RESOURCE_CONTENT = \
$(srcdir)/tasksOverlay.css \
$(srcdir)/globalBindings.xml \
$(srcdir)/global.css \
$(srcdir)/button.css \
$(srcdir)/checkbox.css \
$(srcdir)/menubutton.css \
$(srcdir)/menulist.css \
$(srcdir)/radio.css \
$(srcdir)/scrollbars.css \
$(srcdir)/lessCols.gif \
$(srcdir)/lessCols_mo.gif \
@ -65,7 +70,9 @@ EXPORT_RESOURCE_CONTENT = \
$(srcdir)/menu-check-hover.gif \
$(srcdir)/menu-check-disabled.gif \
$(srcdir)/opentwisty.gif \
$(srcdir)/opentwisty-selected.gif \
$(srcdir)/closedtwisty.gif \
$(srcdir)/closedtwisty-selected.gif \
$(srcdir)/alert-icon.gif \
$(srcdir)/error-icon.gif \
$(srcdir)/message-icon.gif \

Просмотреть файл

@ -0,0 +1,95 @@
/* NEW WIDGET LANDING: <button> */
button {
border: 1px solid #CCCCCC;
-moz-border-radius: 3px 2px 2px 3px;
margin: 1px 5px 2px 5px;
min-width: 5em;
}
button.small > .internal-box {
vertical-align: middle;
border: 1px outset #CCCCCC;
padding: 2px;
}
button > .internal-box {
vertical-align: middle;
border: 1px outset #CCCCCC;
padding: 2px 10px 2px 10px;
}
button:active {
border: 1px solid #000000;
}
/* button:active rules */
button.small:active > .internal-box {
border: 1px inset #CCCCCC;
padding: 3px 1px 1px 3px;
}
button:active > .internal-box {
border: 1px inset #CCCCCC;
padding: 3px 9px 1px 11px;
}
button:hover {
border: 1px solid #000000;
}
/* disabled rules */
button[disabled]:hover,
button[disabled]:active {
border: 1px solid #CCCCCC;
}
button[disabled] > .internal-box,
button[disabled]:hover > .internal-box,
button[disabled]:active > .internal-box {
border: 1px solid #999999;
color: #999999;
padding: 2px;
}
/* align text in standard buttons to center in the available space */
button > .internal-box > .text-container,
button.right > .internal-box > .text-container,
button.left > .internal-box > .text-container {
text-align: center;
}
button.top > .internal-box > .text-container,
button.bottom > .internal-box > .text-container {
vertical-align: middle;
}
/* special classes for buttons where the text is aligned to one side */
button.text-left {
text-align: left;
}
button.text-right {
text-align: right;
}
/* button text formatting rules */
button > .internal-box > .text-container > text,
button.left > .internal-box > .text-container > text,
button.right > .internal-box > .text-container > text {
padding: 0px 0px 0px 0px;
}
button.top > .internal-box > .text-container > text,
button.bottom > .internal-box > .text-container > text {
padding: 2px 0px 2px 0px;
}
button[default] {
behavior: url(resource:/chrome/xulBindings.xml#buttonright);
font-weight: bold;
list-style-image: url("chrome://global/skin/return.gif");
}
button[default] > .internal-box > image {
margin-left: 3px;
}

Просмотреть файл

@ -0,0 +1,36 @@
/* NEW WIDGET LANDING: <checkbox> */
checkbox {
}
checkbox[checked="true"] {
list-style-image: url(chrome://global/skin/check-check.gif);
}
checkbox > .internal-box > .checkmark-box {
border: 1px solid #CCCCCC;
}
checkbox > .internal-box > .checkmark-box > image {
border: 1px outset #CCCCCC;
width: 8px;
height: 8px;
}
checkbox > .internal-box > html {
margin-left: 5px;
/*border: 1px solid #CCCCCC;*/
}
/* mouseover rules */
checkbox:hover > .internal-box > .checkmark-box {
border: 1px solid #000000;
}
/* mousedown rules */
checkbox:hover:active > .internal-box > .checkmark-box > image {
border: 1px inset #CCCCCC;
}
/* focus rules
checkbox:focus > .internal-box > html {
border: 1px dotted #000000;
}*/

Двоичные данные
xpfe/global/resources/skin/closedtwisty-selected.gif Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 66 B

Просмотреть файл

@ -6,6 +6,14 @@
CHANGES REVIEWED BY hyatt@netscape.com.
**/
/* import the widget style sheets */
@import url(chrome://global/skin/button.css);
@import url(chrome://global/skin/checkbox.css);
@import url(chrome://global/skin/radio.css);
@import url(chrome://global/skin/menubutton.css);
@import url(chrome://global/skin/menulist.css);
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */
@ -1333,6 +1341,10 @@ treeitem > treerow > treecell > .twisty {
user-focus:ignore;
}
treeitem[selected="true"] > treerow > treecell > .twisty {
list-style-image: url("chrome://global/skin/closedtwisty-selected.gif");
}
.twisty:hover {
text-decoration: none;
}
@ -1353,6 +1365,10 @@ treeitem[container="true"][open="true"] > treerow > treecell > .twisty {
list-style-image: url("chrome://global/skin/opentwisty.gif");
}
treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .twisty {
list-style-image: url("chrome://global/skin/opentwisty-selected.gif");
}
/* tree header with sort direction indicators */
treecell.sortDirectionIndicator[sortDirection="ascending"] > .treeheader-sortdirection {
@ -1996,168 +2012,6 @@ toolbarseparator.line {
background-color: #99CCCC;
}
/* NEW WIDGET LANDING: <button> */
button {
border: 1px solid #CCCCCC;
-moz-border-radius: 3px 2px 2px 3px;
min-width: 5em;
margin: 1px 5px 2px 5px;
}
button > .internal-box {
vertical-align: middle;
border: 1px outset #CCCCCC;
padding: 2px 10px 2px 10px; /* bend over, bitch */
}
button:active {
border: 1px solid #000000;
}
/* button:active rules */
button:active > .internal-box {
border: 1px inset #CCCCCC;
padding: 3px 9px 1px 11px;
}
button:hover {
border: 1px solid #000000;
}
/* disabled rules */
button[disabled]:hover,
button[disabled]:active {
border: 1px solid #CCCCCC;
}
button[disabled] > .internal-box,
button[disabled]:hover > .internal-box,
button[disabled]:active > .internal-box {
border: 1px solid #999999;
color: #999999;
padding: 2px;
}
/* align text in standard buttons to center in the available space */
button > .internal-box > .text-container,
button.right > .internal-box > .text-container,
button.left > .internal-box > .text-container {
text-align: center;
}
button.top > .internal-box > .text-container,
button.bottom > .internal-box > .text-container {
vertical-align: middle;
}
/* special classes for buttons where the text is aligned to one side */
button.text-left {
text-align: left;
}
button.text-right {
text-align: right;
}
/* button text formatting rules */
button > .internal-box > .text-container > text,
button.left > .internal-box > .text-container > text,
button.right > .internal-box > .text-container > text {
padding: 0px 2px 0px 2px;
}
button.top > .internal-box > .text-container > text,
button.bottom > .internal-box > .text-container > text {
padding: 2px 0px 2px 0px;
}
button[default] {
behavior: url(resource:/chrome/xulBindings.xml#buttonright);
font-weight: bold;
list-style-image: url("chrome://global/skin/return.gif");
}
button[default] > .internal-box > image {
margin-left: 3px;
}
/* NEW WIDGET LANDING: <checkbox> */
checkbox {
}
checkbox[checked="true"] {
list-style-image: url(chrome://global/skin/check-check.gif);
}
checkbox > .internal-box > .checkmark-box {
border: 1px solid #CCCCCC;
}
checkbox > .internal-box > .checkmark-box > image {
border: 1px outset #CCCCCC;
width: 8px;
height: 8px;
}
checkbox > .internal-box > html {
margin-left: 5px;
/*border: 1px solid #CCCCCC;*/
}
/* mouseover rules */
checkbox:hover > .internal-box > .checkmark-box {
border: 1px solid #000000;
}
/* mousedown rules */
checkbox:hover:active > .internal-box > .checkmark-box > image {
border: 1px inset #CCCCCC;
}
/* focus rules
checkbox:focus > .internal-box > html {
border: 1px dotted #000000;
}*/
/* NEW WIDGET LANDING: <radio> */
radio {
margin: 0px 5px 0px 5px;
}
radio[checked="true"] > .internal-box > .checkmark-box > image {
list-style-image: url(chrome://global/skin/check-radio.gif);
}
radio > .internal-box > .checkmark-box {
border: 1px solid #CCCCCC;
-moz-border-radius: 8px;
}
radio > .internal-box > .checkmark-box > image {
border: 1px outset #CCCCCC;
width: 10px;
height: 10px;
-moz-border-radius: 8px;
}
radio > .internal-box > html {
margin-left: 5px;
/*border: 1px solid #CCCCCC;*/
}
/* mouseover rules */
radio:hover > .internal-box > .checkmark-box {
border: 1px solid #000000;
}
/* mousedown rules */
radio:hover:active > .internal-box > .checkmark-box > image {
border: 1px inset #CCCCCC;
}
/* focus rules
radio:focus > .internal-box > html {
border: 1px dotted #000000;
}*/
/* NEW WIDGET LANDING: <separator> */
separator, separator[orient="horizontal"] {
height: 1.5em;
@ -2213,136 +2067,6 @@ text.label {
padding: 5px 3px 5px 4px;
}
/* NEW WIDGET LANDING: <treecell> popup */
treecell#popupCell > menu#popupMenu {
list-style-image: url(chrome://global/skin/treecolpopup.gif);
}
treecell#popupCell {
padding-left: 2px;
padding-right: 2px;
}
/* NEW WIDGET LANDING: <menulist> popup */
menulist, menubutton {
padding: 0px;
border: 1px solid #CCCCCC;
-moz-border-radius: 3px 2px 2px 3px;
}
menulist > .menu-text {
padding-left: 4px;
padding-right: 4px;
border-top: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
margin-right: 0px;
}
menulist > .menu-icon {
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
}
menulist > .menu-dropmarker {
border-top: 1px outset #CCCCCC;
border-right: 1px outset #CCCCCC;
border-bottom: 1px outset #CCCCCC;
border-left: 1px outset #CCCCCC;
list-style-image: url("chrome://global/skin/scroll-down.gif");
padding: 0px 2px 0px 2px;
}
menulist[menuactive="true"] {
border: 1px solid #000000;
}
/* open rules */
menulist[open="true"] {
border: 1px solid #000000;
}
menulist[open="true"] > .menu-icon {
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
}
menulist[open="true"] > .menu-text {
border-top: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
}
menulist[open="true"] > .menu-dropmarker {
border-top: 1px inset #CCCCCC;
border-right: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
border-left: 1px solid #CCCCCC;
padding: 1px 2px -1px 2px;
}
menubutton > .menu-button {
border: 1px outset #CCCCCC;
padding: 2px;
}
menubutton > .menu-button:active {
border: 1px inset #CCCCCC;
padding: 3px 1px 1px 3px;
}
menubutton > .menu-dropmarker {
border: 1px outset #CCCCCC;
list-style-image: url("chrome://global/skin/scroll-down.gif");
padding: 0px 2px 0px 2px;
}
menubutton[open="true"] > .menu-dropmarker {
border: 1px inset #CCCCCC;
padding: 1px 1px -1px 3px;
}
menubutton menupopup, menulist menupopup {
border-left: 1px solid #000000;
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
}
menulist[editable="true"] {
padding: 0px;
}
menulist[editable="true"] > .menu-text {
border-left: none;
border-top: 1px inset #CCCCCC;
border-right: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
margin: 0px 2px 0px 0px;
}
menulist[editable="true"] > .menu-dropmarker {
border: 1px outset #CCCCCC;
}
menulist[editable="true"][open="true"] > .menu-dropmarker {
border: 1px inset #CCCCCC;
}
menulist[editable="true"] > .menu-icon {
list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
background-color: white;
padding: 1px;
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-right: none;
border-bottom: 1px inset #CCCCCC;
}
menulist menupopup > menuseparator {
border-bottom: 2px groove #CCCCCC;
}
progressmeter {
margin: 0px 4px 0px 4px;
}

Просмотреть файл

@ -32,6 +32,11 @@ install::
$(MAKE_INSTALL) tasksOverlay.css $(DISTBROWSER)
$(MAKE_INSTALL) globalBindings.xml $(DISTBROWSER)
$(MAKE_INSTALL) global.css $(DISTBROWSER)
$(MAKE_INSTALL) button.css $(DISTBROWSER)
$(MAKE_INSTALL) checkbox.css $(DISTBROWSER)
$(MAKE_INSTALL) menubutton.css $(DISTBROWSER)
$(MAKE_INSTALL) menulist.css $(DISTBROWSER)
$(MAKE_INSTALL) radio.css $(DISTBROWSER)
$(MAKE_INSTALL) scrollbars.css $(DISTBROWSER)
$(MAKE_INSTALL) htmlBindings.xml $(DISTXUL)
$(MAKE_INSTALL) xulBindings.xml $(DISTXUL)
@ -62,7 +67,9 @@ install::
$(MAKE_INSTALL) scroll-thumb-horiz-disabled.gif $(DISTBROWSER)
$(MAKE_INSTALL) opentwisty.gif $(DISTBROWSER)
$(MAKE_INSTALL) opentwisty-selected.gif $(DISTBROWSER)
$(MAKE_INSTALL) closedtwisty.gif $(DISTBROWSER)
$(MAKE_INSTALL) closedtwisty-selected.gif $(DISTBROWSER)
$(MAKE_INSTALL) menu-arrow.gif $(DISTBROWSER)
$(MAKE_INSTALL) menu-arrow-hover.gif $(DISTBROWSER)
$(MAKE_INSTALL) menu-arrow-disabled.gif $(DISTBROWSER)

Просмотреть файл

@ -0,0 +1,27 @@
/* NEW WIDGET LANDING <menubutton> */
menubutton:hover, menubutton[open="true"] {
border: 1px solid #000000;
}
menubutton > button, menubutton:hover > button {
border: 0px;
margin: 0px;
}
menubutton > .menu-dropmarker {
border: 1px outset #CCCCCC;
list-style-image: url("chrome://global/skin/scroll-down.gif");
padding: 0px 2px 0px 2px;
}
menubutton[open="true"] > .menu-dropmarker {
border: 1px inset #CCCCCC;
padding: 1px 1px -1px 3px;
}
menubutton menupopup, menulist menupopup {
border-left: 1px solid #000000;
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
}

Просмотреть файл

@ -0,0 +1,105 @@
/* NEW WIDGET LANDING: <menulist> popup */
menulist, menubutton {
padding: 0px;
border: 1px solid #CCCCCC;
-moz-border-radius: 3px 2px 2px 3px;
}
menulist > .menu-text {
padding-left: 4px;
padding-right: 4px;
border-top: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
margin-right: 0px;
}
menulist > .menu-icon {
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
}
menulist > .menu-dropmarker {
border-top: 1px outset #CCCCCC;
border-right: 1px outset #CCCCCC;
border-bottom: 1px outset #CCCCCC;
border-left: 1px outset #CCCCCC;
list-style-image: url("chrome://global/skin/scroll-down.gif");
padding: 0px 2px 0px 2px;
}
menulist[menuactive="true"] {
border: 1px solid #000000;
}
/* open rules */
menulist[open="true"] {
border: 1px solid #000000;
}
menulist[open="true"] > .menu-icon {
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
}
menulist[open="true"] > .menu-text {
border-top: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
}
menulist[open="true"] > .menu-dropmarker {
border-top: 1px inset #CCCCCC;
border-right: 1px inset #CCCCCC;
border-bottom: 1px solid #CCCCCC;
border-left: 1px solid #CCCCCC;
padding: 1px 2px -1px 2px;
}
menulist[editable="true"] {
padding: 0px;
}
menulist[editable="true"] > .menu-text {
border-left: none;
border-top: 1px inset #CCCCCC;
border-right: 1px inset #CCCCCC;
border-bottom: 1px inset #CCCCCC;
margin: 0px 2px 0px 0px;
}
menulist[editable="true"] > .menu-dropmarker {
border: 1px outset #CCCCCC;
}
menulist[editable="true"][open="true"] > .menu-dropmarker {
border: 1px inset #CCCCCC;
}
menulist[editable="true"] > .menu-icon {
list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
background-color: white;
padding: 1px;
border-left: 1px inset #CCCCCC;
border-top: 1px inset #CCCCCC;
border-right: none;
border-bottom: 1px inset #CCCCCC;
}
menulist menupopup > menuseparator {
border-bottom: 2px groove #CCCCCC;
}
menulist menupopup > menuitem {
padding: 0px;
}
menulist menupopup > menuitem > .menu-left {
width: 0px;
}
menulist.iconic menupopup > menuitem > .menu-left {
width: 13px;
}

Двоичные данные
xpfe/global/resources/skin/opentwisty-selected.gif Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 66 B

Просмотреть файл

@ -0,0 +1,41 @@
/* NEW WIDGET LANDING: <radio> */
radio {
margin: 0px 5px 0px 5px;
}
radio[checked="true"] > .internal-box > .checkmark-box > image {
list-style-image: url(chrome://global/skin/check-radio.gif);
}
radio > .internal-box > .checkmark-box {
border: 1px solid #CCCCCC;
-moz-border-radius: 8px;
}
radio > .internal-box > .checkmark-box > image {
border: 1px outset #CCCCCC;
width: 10px;
height: 10px;
-moz-border-radius: 8px;
}
radio > .internal-box > html {
margin-left: 5px;
/*border: 1px solid #CCCCCC;*/
}
/* mouseover rules */
radio:hover > .internal-box > .checkmark-box {
border: 1px solid #000000;
}
/* mousedown rules */
radio:hover:active > .internal-box > .checkmark-box > image {
border: 1px inset #CCCCCC;
}
/* focus rules
radio:focus > .internal-box > html {
border: 1px dotted #000000;
}*/