global.css tidy up, some nicer menu arrow graphics, other tweaks.

This commit is contained in:
ben%netscape.com 2000-04-30 02:40:55 +00:00
Родитель dcc969b722
Коммит c728a40fe8
19 изменённых файлов: 696 добавлений и 2074 удалений

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

@ -1,4 +1,7 @@
tasksOverlay.css
box.css
toolbar.css
menu.css
global.css
formatting.css
textfield.css
@ -67,6 +70,7 @@ taskbar-mail.gif
taskbar-navigator.gif
taskbar-tab-minimized.gif
taskbar-tab.gif
taskbar-tab-trans.gif
taskbar-popup-arrow.gif
taskbar-tab-hover.gif
print.gif

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

@ -1,3 +1,4 @@
xul.css
xulBindings.xml
menulistBindings.xml
htmlBindings.xml

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

@ -29,17 +29,23 @@ include $(DEPTH)/config/autoconf.mk
DIRS = unix
EXPORT_RESOURCE_CONTENT = \
$(srcdir)/tasksOverlay.css \
$(srcdir)/global.css \
$(srcdir)/formatting.css \
$(srcdir)/textfield.css \
$(srcdir)/box.css \
$(srcdir)/button.css \
$(srcdir)/checkbox.css \
$(srcdir)/commonDialog.css \
$(srcdir)/dialogOverlay.css \
$(srcdir)/formatting.css \
$(srcdir)/global.css \
$(srcdir)/menu.css \
$(srcdir)/menubutton.css \
$(srcdir)/menulist.css \
$(srcdir)/radio.css \
$(srcdir)/tree.css \
$(srcdir)/scrollbars.css \
$(srcdir)/tasksOverlay.css \
$(srcdir)/textfield.css \
$(srcdir)/toolbar.css \
$(srcdir)/tree.css \
$(srcdir)/wizardOverlay.css \
$(srcdir)/lessCols.gif \
$(srcdir)/lessCols_mo.gif \
$(srcdir)/lessCOls_dis.gif \
@ -65,7 +71,6 @@ EXPORT_RESOURCE_CONTENT = \
$(srcdir)/scroll-thumb-vert-hover.gif \
$(srcdir)/scroll-thumb-vert-disabled.gif \
$(srcdir)/menu-arrow.gif \
$(srcdir)/dialogOverlay.css \
$(srcdir)/menu-arrow-hover.gif \
$(srcdir)/menu-arrow-disabled.gif \
$(srcdir)/menu-check.gif \
@ -93,6 +98,7 @@ EXPORT_RESOURCE_CONTENT = \
$(srcdir)/taskbar-navigator.gif \
$(srcdir)/taskbar-tab-minimized.gif \
$(srcdir)/taskbar-tab.gif \
$(srcdir)/taskbar-tab-trans.gif \
$(srcdir)/taskbar-tab-hover.gif \
$(srcdir)/taskbar-popup-arrow.gif \
$(srcdir)/button28-bg-active.gif \
@ -124,8 +130,6 @@ EXPORT_RESOURCE_CONTENT = \
$(srcdir)/animthrob.gif \
$(srcdir)/animthrob_single.gif \
$(srcdir)/progressmeter-busy.gif \
$(srcdir)/commonDialog.css \
$(srcdir)/wizardOverlay.css \
$(srcdir)/seltab-leftedge.gif \
$(srcdir)/seltab-rightedge.gif \
$(srcdir)/tab-leftedge.gif \
@ -141,6 +145,7 @@ EXPORT_RESOURCE_CONTENT = \
EXPORT_CHROME = $(srcdir)/xul.css \
$(srcdir)/htmlBindings.xml \
$(srcdir)/xulBindings.xml \
$(srcdir)/menulistBindings.xml \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@ -0,0 +1,59 @@
titledbox
{
border : 2px groove #CCCCCC;
padding : 7px;
margin : 5px;
}
title
{
margin-left : 6px;
padding-right : 40px;
}
/* This just SUCKS, but seems to be necessitated by titledbox design... */
title > *
{
margin-left : 5px;
margin-right : 5px;
}
:titledbox-content
{
display : block;
padding : inherit;
}
/** box formatting **/
box[autostretch="never"]
{
vertical-align : middle;
}
box[autostretch="never"][valign="top"]
{
vertical-align : top;
}
box[autostretch="never"][valign="bottom"]
{
vertical-align : bottom;
}
box[autostretch="never"][halign="center"]
{
text-align : center;
}
box[autostretch="never"][halign="right"]
{
text-align : right;
}
row
{
vertical-align : middle;
}

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

@ -15,14 +15,14 @@
button[disabled="true"],
button[disabled="true"]:hover,
button[disabled="true"]:active
button[disabled="true"]:hover:active
{
border : 1px solid #999999;
color : #999999;
}
/* internal frame */
button > .internal-box
button > .button-internal-box
{
vertical-align : middle;
text-align : center;
@ -30,15 +30,15 @@
padding : 2px;
}
button:active > .internal-box
button:hover:active > .button-internal-box
{
border : 1px inset #CCCCCC;
padding : 3px 1px 1px 3px;
}
button[disabled="true"] > .internal-box,
button[disabled="true"]:hover > .internal-box,
button[disabled="true"]:active > .internal-box
button[disabled="true"] > .button-internal-box,
button[disabled="true"]:hover > .button-internal-box,
button[disabled="true"]:hover:active > .button-internal-box
{
border : 1px outset #CCCCCC;
-moz-border-radius : 0px;
@ -46,19 +46,19 @@
}
/* text wrapping frame (hack because <text> does not support alignment) */
button > .internal-box > .text-container
.button-text-container
{
text-align : center;
vertical-align : middle;
}
/* text frame */
button > .internal-box > .text-container > text
.button-text
{
padding : 0px 2px 0px 2px;
}
button[orient="vertical"] > .internal-box > .text-container > text
button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text
{
padding : 2px 2px 0px 2px;
}
@ -91,13 +91,13 @@
**/
/* internal frame */
button.dialog > .internal-box,
button.dialog:hover > .internal-box
.button-dialog > .button-internal-box,
.button-dialog:hover > .button-internal-box
{
padding : 2px 10px 2px 10px;
}
button.dialog:hover:active > .internal-box
.button-dialog:hover:hover:active > .button-internal-box
{
padding : 3px 9px 1px 11px;
}
@ -106,252 +106,47 @@
* editor's formatting toolbar or toolbars wanting a button similar to a command
* button but without an initial outset frame.
**/
button.borderless
.button-borderless
{
border : 1px solid #CCCCCC;
}
button.borderless:hover
.button-borderless:hover
{
border : 1px solid #000000;
}
button.borderless > .internal-box
.button-borderless > .button-internal-box
{
border : 1px solid #CCCCCC;
}
button.borderless:hover > .internal-box
.button-borderless:hover > .button-internal-box
{
border : 1px outset #CCCCCC;
}
button.borderless:active > .internal-box
.button-borderless:hover:active > .button-internal-box
{
border : 1px inset #CCCCCC;
}
/** Styles for the largest type of toolbar buttons. In the Seamonkey implementation,
* these are only used in the navigation toolbar in the navigator package.
**/
/* outer frame */
button.large-toolbar
/** plain (raw) buttons, class="plain" **/
button.plain, button.plain:hover, button.plain:hover:active,
button.plain > .button-internal-box,
button.plain > .button-internal-box:hover:active,
button.plain > .button-internal-box > .button-text-container,
button.plain > .button-internal-box > .button-text-container:hover:active,
button.plain > .button-internal-box > .button-text-container > .button-text,
button.plain > .button-internal-box > .button-text-container > .button.text:hover:active,
button-plain > .button-internal-box > .button-icon,
button.plain > .button-internal-box > .button.icon:hover:active
{
background-repeat : no-repeat;
background-position : 50% 0px;
background-color : transparent;
background-image : url("chrome://global/skin/button32-bg.gif");
color : #CCFFFF;
min-width : 36px;
min-height : 36px;
margin : 6px 6px 1px 1px;
font-size : smaller;
border : none;
border : 0px ! important;
margin : 0px;
padding : 0px;
}
button.large-toolbar:hover
{
background-image : url("chrome://global/skin/button32-bg-hover.gif");
border : none;
}
button.large-toolbar:active
{
margin : 7px 5px 0px 2px;
border : none;
}
button.large-toolbar[disabled="true"],
button.large-toolbar[disabled="true"]:hover,
button.large-toolbar[disabled="true"]:active
{
background-image : url("chrome://global/skin/button32-bg-disabled.gif");
margin : 6px 6px 1px 1px;
border : none;
}
/* internal frame */
button.large-toolbar[disabled="true"] > .internal-box,
button.large-toolbar[disabled="true"]:hover > .internal-box,
button.large-toolbar[disabled="true"]:active > .internal-box
{
border : none;
}
button.large-toolbar > .internal-box,
button.large-toolbar:hover > .internal-box,
button.large-toolbar:active > .internal-box
{
border : none;
vertical-align : middle;
}
button.large-toolbar > .internal-box > .text-container
{
display : none;
text-align : center;
}
/** Styles for the standard 'large' toolbar button, these buttons are used for
* toolbar buttons that are the most commonly used elements on a toolbar, e.g.
* 'GetMsg' in Mailnews or 'Send' in Mail/Compose.
**/
button.key-toolbar
{
background-repeat : no-repeat;
background-position : 50% 0px;
background-color : transparent;
background-image : url("chrome://global/skin/button28-bg.gif");
color : #CCFFFF;
min-width : 28px;
min-height : 28px;
margin : 4px 7px 1px 1px;
padding : 3px 0px 0px 1px;
font-size : smaller;
border : none;
}
button.key-toolbar:hover
{
background-image : url("chrome://global/skin/button28-bg-hover.gif");
border : none;
}
button.key-toolbar:active
{
margin : 5px 6px 0px 2px;
border : none;
}
button.key-toolbar[disabled="true"],
button.key-toolbar[disabled="true"]:hover,
button.key-toolbar[disabled="true"]:active
{
background-image : url("chrome://global/skin/button28-bg-disabled.gif");
margin : 3px 7px 1px 1px;
border : none;
}
/* internal frame */
button.key-toolbar[disabled="true"] > .internal-box,
button.key-toolbar[disabled="true"]:hover > .internal-box,
button.key-toolbar[disabled="true"]:active > .internal-box
{
border : none;
vertical-align : middle;
}
button.key-toolbar > .internal-box,
button.key-toolbar:hover > .internal-box,
button.key-toolbar:active > .internal-box
{
border : none;
}
/* text wrapper frame */
button.key-toolbar > .internal-box > .text-container
{
padding-top : 3px;
text-align : center;
}
/** Styles for the less important toolbar buttons. These buttons are used for
* toolbar members of less immediate use than those of the 'key-toolbar' class.
**/
button.toolbar
{
background-repeat : no-repeat;
background-position : 50% 0px;
background-color : transparent;
background-image : none;
color : #CCFFFF;
min-width : 28px;
min-height : 28px;
margin : 4px 7px 1px 1px;
padding : 3px 0px 0px 1px;
font-size : smaller;
border : none;
}
button.toolbar:hover
{
background-image : url("chrome://global/skin/otherbutton28-bg-hover.gif");
border : none;
}
button.toolbar:active
{
margin : 5px 6px 0px 2px;
border : none;
}
button.toolbar[disabled="true"],
button.toolbar[disabled="true"]:hover,
button.toolbar[disabled="true"]:active
{
margin : 3px 7px 1px 1px;
border : none;
background-image : none;
}
/* internal frame */
button.toolbar[disabled="true"] > .internal-box,
button.toolbar[disabled="true"]:hover > .internal-box,
button.toolbar[disabled="true"]:active > .internal-box
{
border : none;
}
button.toolbar > .internal-box,
button.toolbar:hover > .internal-box,
button.toolbar:active > .internal-box
{
border : none;
vertical-align : middle;
}
/* text wrapper frame */
button.toolbar > .internal-box > .text-container
{
padding-top : 3px;
text-align : center;
}
/** Expanding Region Button **/
/* outer frame */
button.expander
{
border : none;
padding : none;
margin : 1px 5px 3px 1px;
background-color : inherit;
list-style-image : url("chrome://global/skin/closedtwisty.gif");
}
button[open="true"].expander
{
list-style-image : url("chrome://global/skin/opentwisty.gif");
}
/* internal frame */
button.expander > .internal-box
{
border : none;
background-color : inherit;
padding : none;
margin : none;
}
/* text frame */
button.expander > .internal-box > .text-container > text
{
color : #0000FF;
text-decoration : underline;
}
button.expander:hover > .internal-box > .text-container > text
{
color : #FF0000;
}

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

@ -8,12 +8,13 @@
margin : 0px 5px 6px 5px;
}
.box-smallheader > .decorated
.box-smallheader > .toolbar-primary
{
padding : 0px 0px 3px 0px;
min-height : 0px;
}
.box-smallheader > .decorated > .box-smallheader-left
.box-smallheader > .toolbar-primary > .box-smallheader-left
{
font-size : larger;
font-weight : bold;
@ -21,13 +22,13 @@
padding-left : 6px;
}
.box-smallheader > .decorated > .box-smallheader-right
.box-smallheader > .toolbar-primary > .box-smallheader-right
{
color : #FFFFFF;
padding-right : 6px;
}
.box-smallheader > .decorated
.box-smallheader > .toolbar-primary
{
border : 1px solid #000000;
vertical-align : middle;

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

@ -39,3 +39,88 @@
{
border-bottom : 2px groove #CCCCCC;
}
.outset
{
border : 1px outset #CCCCCC;
}
/** separator rules **/
/* standard separators */
separator, separator[orient="horizontal"]
{
height: 1.5em;
}
separator[orient="vertical"]
{
width: 1.5em;
}
/* thinner separators (50% size) */
separator.thin, separator.thin[orient="horizontal"]
{
height: 0.5em;
}
separator.thin[orient="vertical"]
{
width: 0.5em;
}
/* groove separators (50% size) */
separator.groove,
separator.groove[orient="horizontal"]
{
border-top: 2px groove #CCCCCC;
height: 0px;
margin-top: 0.4em;
margin-bottom: 0.4em;
}
separator.groove[orient="vertical"]
{
border-left: 2px groove #CCCCCC;
margin-left: 0.4em;
margin-right: 0.4em;
}
/* groove separators (0 padding, for dividing effects) */
separator.groove-thin
{
border-top: 2px groove #CCCCCC;
height: 0px;
}
separator[orient="vertical"].groove-thin
{
border-left: 2px groove #CCCCCC;
}
/** text formatting rules **/
/* label (with margins) */
text.label
{
margin : 1px 5px 2px 5px;
}
text[disabled="true"]
{
color : #999999;
}
html
{
margin : 1px 5px 4px 5px;
cursor : default;
}
.header
{
font-weight : bold;
}
.indent
{
margin-left : 20px;
}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

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

@ -30,10 +30,13 @@ DISTXUL=$(DIST)\bin\chrome
install::
$(MAKE_INSTALL) tasksOverlay.css $(DISTBROWSER)
$(MAKE_INSTALL) menu.css $(DISTBROWSER)
$(MAKE_INSTALL) toolbar.css $(DISTBROWSER)
$(MAKE_INSTALL) global.css $(DISTBROWSER)
$(MAKE_INSTALL) button.css $(DISTBROWSER)
$(MAKE_INSTALL) textfield.css $(DISTBROWSER)
$(MAKE_INSTALL) formatting.css $(DISTBROWSER)
$(MAKE_INSTALL) box.css $(DISTBROWSER)
$(MAKE_INSTALL) checkbox.css $(DISTBROWSER)
$(MAKE_INSTALL) menubutton.css $(DISTBROWSER)
$(MAKE_INSTALL) menulist.css $(DISTBROWSER)
@ -42,6 +45,7 @@ install::
$(MAKE_INSTALL) scrollbars.css $(DISTBROWSER)
$(MAKE_INSTALL) htmlBindings.xml $(DISTXUL)
$(MAKE_INSTALL) xulBindings.xml $(DISTXUL)
$(MAKE_INSTALL) menulistBindings.xml $(DISTXUL)
$(MAKE_INSTALL) xul.css $(DISTXUL)
$(MAKE_INSTALL) lessCols.gif $(DISTBROWSER)
$(MAKE_INSTALL) lessCols_mo.gif $(DISTBROWSER)
@ -96,6 +100,7 @@ install::
$(MAKE_INSTALL) taskbar-tab.gif $(DISTBROWSER)
$(MAKE_INSTALL) taskbar-popup-arrow.gif $(DISTBROWSER)
$(MAKE_INSTALL) taskbar-tab-hover.gif $(DISTBROWSER)
$(MAKE_INSTALL) taskbar-tab-trans.gif $(DISTBROWSER)
$(MAKE_INSTALL) stop.gif $(DISTBROWSER)
$(MAKE_INSTALL) print.gif $(DISTBROWSER)
$(MAKE_INSTALL) progressmeter-busy.gif $(DISTBROWSER)

Двоичные данные
xpfe/global/resources/skin/menu-arrow.gif

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

До

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

После

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

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

@ -0,0 +1,84 @@
/**
* Atomic sub-parts of standard menus
**/
.menu-right
{
margin : 0px 0px 0px 6px;
width : 8px;
text-align : center;
list-style-image : url("chrome://global/skin/menu-arrow.gif");
}
.menu-iconic-left
{
color : inherit;
margin : 0px 2px 0px 0px;
width : 13px;
text-align : center;
list-style-image : inherit;
}
.menubar-left
{
color : inherit;
margin : 0px 2px 0px 0px;
}
.menu-iconic-text, .menu-iconic-accel, .menu-text, .menu-accel
{
color : inherit;
margin : 0px 2px 0px 0px;
}
.menu-text
{
padding-left : 15px;
}
.menu-accel
{
margin-left : 4px;
padding-right : 14px;
}
.menu-iconic-accel
{
margin-left : 4px;
}
.menubar-text
{
color : inherit;
margin-right : 2px;
}
menuitem[checked="true"]
{
list-style-image : url("chrome://global/skin/menu-check.gif");
}
menuitem[checked="true"][disabled="true"]
{
list-style-image : url("chrome://global/skin/menu-check-disabled.gif");
}
menuitem[checked="true"][menuactive="true"]
{
list-style-image : url("chrome://global/skin/menu-check-hover.gif");
}
.menu-right[disabled="true"]
{
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
}
.menu-right[menuactive="true"][disabled="true"]
{
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
}
.menu-right[menuactive="true"]
{
list-style-image : url("chrome://global/skin/menu-arrow-hover.gif");
}

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

@ -1,11 +1,9 @@
/* outermost frame */
menubutton
{
border : 1px solid #000000;
margin : 3px 5px 3px 5px;
padding : 0px;
-moz-border-radius : 3px 2px 2px 3px;
}
@ -15,42 +13,66 @@
color : #999999;
}
menubutton > .menubutton-internal-box
{
border : 1px outset #CCCCCC;
padding : 1px 2px 1px 2px;
vertical-align : middle;
}
menubutton:active > .menubutton-internal-box,
menubutton[open="true"] > .menubutton-internal-box
{
/*border : 1px inset #CCCCCC;*/
padding : 2px 1px 0px 3px;
}
.menubutton-single-icon
{
margin-right : 3px;
}
/** "Dual Functionality" menubutton
* Has a popup spawning button and a command invoking button, e.g. back/forward
* class="menubutton-dual"
**/
/* inner button */
menubutton > .menu-button,
menubutton:hover > .menu-button,
menubutton:active > .menu-button
menubutton.menubutton-dual > .menubutton-dual-button,
menubutton.menubutton-dual:hover > .menubutton-dual-button,
menubutton.menubutton-dual:active > .menubutton-dual-button
{
border : none;
margin : 0px;
-moz-border-radius : 0px;
}
menubutton[open="true"] > .menu-button > .internal-box
menubutton.menubutton-dual[open="true"] > .menubutton-dual-button > .button-internal-box
{
border : 1px inset #CCCCCC;
padding : 3px 1px 1px 3px;
}
/* inner dropmarker */
menubutton > .menu-dropmarker
menubutton.menubutton-dual > .menubutton-dropmarker
{
border : 1px outset #CCCCCC;
list-style-image : url("chrome://global/skin/scroll-down.gif");
padding : 0px 2px 0px 2px;
}
menubutton[disabled="true"] > .menu-dropmarker
menubutton.menubutton-dual[disabled="true"] > .menubutton-dropmarker
{
list-style-image : url("chrome://global/skin/scroll-down-disabled.gif");
}
menubutton[open="true"] > .menu-dropmarker
menubutton.menubutton-dual[open="true"] > .menubutton-dropmarker
{
border : 1px inset #CCCCCC;
padding : 1px 1px -1px 3px;
}
menubutton > menupopup
menubutton.menubutton-dual > menupopup
{
min-width : 0px;
border-top : 0px;
@ -59,7 +81,7 @@
border-bottom : 1px solid #000000;
}
menubutton > menupopup > .internal-box
menubutton > menupopup > .menupopup-internal-box
{
border-top : 0px;
border-right : 1px inset #CCCCCC;
@ -72,7 +94,25 @@
padding : 0px 0px 0px 3px;
}
menubutton > menupopup > menuitem > .menu-left
/** Icon only menubutton.menubutton-duals
* class="menubutton.menubutton-dual-icon"
**/
.menubutton.menubutton-dual-icon
{
display : none;
border : 1px solid #000000;
background-color : #CCCCCC;
}
.menubutton.menubutton-dual-icon > .menubutton.menubutton-dual-icon-internal-box
{
border : 1px outset #CCCCCC;
padding : 1px;
}
.menubutton.menubutton-dual-icon:hover:active > .menubutton.menubutton-dual-icon-internal-box,
.menubutton.menubutton-dual-icon[open="true"] > .menubutton.menubutton-dual-icon-internal-box
{
border : 1px inset #CCCCCC;
padding : 2px 0px 0px 2px;
}

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

@ -29,7 +29,7 @@
}
/* icon display frame */
.menulist-icon
menulist > .menu-icon
{
border-left : 1px outset #CCCCCC;
border-top : 1px outset #CCCCCC;
@ -37,7 +37,7 @@
padding : 2px 0px 2px 0px;
}
menulist[open="true"] > .menulist-icon
menulist[open="true"] > .menu-icon
{
border-left : 1px inset #CCCCCC;
border-top : 1px inset #CCCCCC;
@ -46,7 +46,7 @@
}
/* text display frame */
menulist > .menulist-text
menulist > .menu-text
{
padding : 2px 4px 2px 4px;
border-top : 1px outset #CCCCCC;
@ -54,7 +54,7 @@
margin-right : 0px;
}
menulist[open="true"] > .menulist-text
menulist[open="true"] > .menu-text
{
border-top : 1px inset #CCCCCC;
border-bottom : 1px solid #CCCCCC;
@ -62,7 +62,7 @@
}
/* drop marker display frame */
menulist > .menulist-dropmarker
menulist > .menu-dropmarker
{
border-top : 1px outset #CCCCCC;
border-right : 1px outset #CCCCCC;
@ -72,12 +72,12 @@
padding : 2px;
}
menulist[disabled="true"] > .menulist-dropmarker
menulist[disabled="true"] > .menu-dropmarker
{
list-style-image : url("chrome://global/skin/scroll-down-disabled.gif");
}
menulist[open="true"] > .menulist-dropmarker
menulist[open="true"] > .menu-dropmarker
{
border-top : 1px inset #CCCCCC;
border-right : 1px inset #CCCCCC;
@ -96,7 +96,7 @@
}
/* icon display frame */
.menulist-editable-icon
menulist[editable="true"] > .menu-icon
{
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
background-color : white;
@ -108,7 +108,7 @@
}
/* text display frame */
.menulist-editable-text
menulist[editable="true"] > .menu-text
{
border-left : none;
border-top : 1px inset #CCCCCC;
@ -118,12 +118,12 @@
}
/* drop marker display frame */
.menu-editable-dropmarker
menulist[editable="true"] > .menu-dropmarker
{
border : 1px outset #CCCCCC;
}
menulist[editable="true"][open="true"] > .menu-editable-dropmarker
menulist[editable="true"][open="true"] > .menu-dropmarker
{
border : 1px inset #CCCCCC;
}
@ -139,6 +139,14 @@
padding : 0px;
}
menulist > menupopup > .internal-box
{
border-left : 1px inset #CCCCCC;
border-right : 1px inset #CCCCCC;
border-bottom : 1px inset #CCCCCC;
border-top : 0px;
}
menulist > menupopup > menuseparator
{
border-bottom : 2px groove #CCCCCC;
@ -152,12 +160,17 @@
max-width: auto;
}
.menu-left[selected="true"]
menulist > menupopup > menuitem > .menu-left
{
width : 13px;
}
menulist > menupopup > menuitem[selected="true"] > .menu-left
{
list-style-image : url(chrome://global/skin/menu-check.gif);
}
.menu-left[menuactive="true"][selected="true"]
menulist > menupopup > menuitem[menuactive="true"][selected="true"] > .menu-left
{
list-style-image : url(chrome://global/skin/menu-check-hover.gif);
}

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

@ -0,0 +1,100 @@
<?xml version="1.0"?>
<bindings id="menulistBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!--
BINDING : menulist
XUL REPRESENTATION : <menulist>
-->
<binding id="menulist">
<content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/>
<xul:text class="menu-text" flex="1" inherits="value,accesskey,crop" crop="right"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target; this.data = this.selectedItem.data;"/>
</handlers>
<interface>
<property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/>
</interface>
</binding>
<!--
BINDING : menulist-editable
XUL REPRESENTATION : <menulist editable="true">
-->
<binding id="menulist-editable">
<content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/>
<html:input type="text" flex="1" class="menu-text" allowevents="true" inherits="value,disabled"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target"/>
</handlers>
</binding>
<!--
BINDING : menubutton-single
XUL REPRESENTATION : <menubutton>
-->
<binding id="menubutton-single-right">
<content excludes="template,observes,menupopup">
<xul:box class="menubutton-internal-box" autostretch="never">
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey"/>
<xul:image class="menubutton-single-icon"/>
</xul:box>
</content>
</binding>
<binding id="menubutton-single-left">
<content excludes="template,observes,menupopup">
<xul:box class="menubutton-internal-box" autostretch="never">
<xul:image class="menubutton-single-icon"/>
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey"/>
</xul:box>
</content>
</binding>
<!--
BINDING : menubutton-icon
XUL REPRESENTATION : <menubutton class="menubutton-icon">
-->
<binding id="menubutton-icon">
<content excludes="template,observes,menupopup">
<xul:box class="menubutton-icon-internal-box" autostretch="never">
<xul:image class="menubutton-icon-icon" inherits="src"/>
</xul:box>
</content>
</binding>
<!--
BINDING : menubutton-dual
XUL REPRESENTATION : <menubutton class="menubutton-dual">
-->
<binding id="menubutton-dual">
<content excludes="template,observes,menupopup">
<xul:box class="menubutton-internal-box">
<xul:button class="menubutton-dual-button" allowevents="true" inherits="buttonaction:oncommand,src,value,crop,accesskey"/>
<xul:image class="menubutton-dropmarker"/>
</xul:box>
</content>
</binding>
<!--
BINDING : menubutton-item
XUL REPRESENTATION : menuitem
-->
<binding id="menubutton-item">
<content autostretch="never" excludes="template,observes,menupopup">
<xul:text class="menubutton-text" flex="1" inherits="value,accesskey,crop" crop="right"/>
</content>
</binding>
</bindings>

Двоичные данные
xpfe/global/resources/skin/taskbar-tab.gif

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

До

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

После

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

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

@ -35,29 +35,28 @@
}
/* internal frame */
textfield > box
.textfield-internal-box
{
margin : 0px;
padding : 1px 2px 1px 2px;
cursor : text;
border : 1px solid black;
border : 1px solid #000000;
background-color : inherit;
color : inherit;
}
textfield[disabled="true"] > box
textfield[disabled="true"] > .textfield-internal-box
{
border : 1px solid #999999;
}
textfield[multiline="true"] > box
.textarea-internal-box
{
padding : 0px 0px 0px 2px;
}
/* internal text widget */
textfield > box > html|input,
textfield > box > html|textarea
.textfield-input, .textfield-textarea
{
border : none !important;
margin : 0px;
@ -65,9 +64,18 @@
background-color : inherit;
}
textfield[disabled="true"] > box > html|input,
textfield[disabled="true"] > box > html|textarea
.textfield-input, .textfield-textarea
{
color : #999999;
cursor : default ! important;
}
/** plain atomic textfields, class="plain" **/
textfield.plain,
textfield.plain > .textfield-internal-box,
textfield.plain > .textarea-internal-box
{
padding : 0px !important;
margin : 0px !important;
border : none !important;
}

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

@ -0,0 +1,28 @@
toolbox
{
background-color : #999999;
}
toolbar
{
background-color : #CCCCCC;
border : 1px outset #CCCCCC;
}
toolbargrippy
{
background-color : #CCCCCC;
border : 1px solid #CCCCCC;
}
toolbar[collapsed="true"] > toolbargrippy
{
width : 30px;
}
toolbarseparator
{
width : 2em;
}

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

@ -53,6 +53,10 @@ template {
display: none;
}
data {
display: none;
}
/**********************************
* Window
**********************************/
@ -101,47 +105,60 @@ box.toolbar-holder[collapsed="true"] {
visibility: collapse;
}
/****** Progress Meter ********/
/********* XP Menus ***********/
menubar > menu
{
behavior : url("resource:/chrome/xulBindings.xml#menu-menubar");
}
menubar > menu {
behavior: url("resource:/chrome/xulBindings.xml#menu-menubar");
}
menubar > menu.menu-iconic
{
behavior : url("resource:/chrome/xulBindings.xml#menu-menubar-iconic");
}
menubar > menu.menu-iconic {
behavior: url("resource:/chrome/xulBindings.xml#menu-menubar-iconic");
}
menu
{
behavior : url("resource:/chrome/xulBindings.xml#menu");
}
menu {
behavior: url("resource:/chrome/xulBindings.xml#menu");
}
menu.menu-iconic
{
behavior : url("resource:/chrome/xulBindings.xml#menu-iconic");
}
menu.menu-iconic {
behavior: url("resource:/chrome/xulBindings.xml#menu-iconic");
}
menuitem
{
behavior : url("resource:/chrome/xulBindings.xml#menuitem");
}
menuitem {
behavior: url("resource:/chrome/xulBindings.xml#menuitem");
}
menuitem.menuitem-iconic
{
behavior : url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menuitem.menuitem-iconic {
behavior: url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menuitem[type="checkbox"],
menuitem[type="radio"]
{
behavior : url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menuitem[type="checkbox"],menuitem[type="radio"] {
behavior: url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menulist > menupopup > menuitem
{
behavior : url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menulist > menupopup > menuitem {
behavior: url("resource:/chrome/xulBindings.xml#menuitem-iconic");
}
menuitem.menuitem-non-iconic
{
behavior : url("resource:/chrome/menulistBindings.xml#menubutton-item");
}
menupopup {
menupopup
{
/*behavior: url("resource:/chrome/xulBindings.xml#popups");*/
display: none;
}
display : none;
}
popup {
/*behavior: url("resource:/chrome/xulBindings.xml#popups");*/
@ -169,18 +186,6 @@ popup[menuactive="true"] {
visibility: visible;
}
menulist {
behavior: url("resource:/chrome/xulBindings.xml#menulist");
}
menulist[editable="true"] {
behavior: url("resource:/chrome/xulBindings.xml#menulist-editable");
}
menubutton {
behavior: url("resource:/chrome/xulBindings.xml#menubutton");
}
/******** Titled buttons **********/
/******** Tree widget **********/
@ -217,11 +222,7 @@ treecell {
}
.treecell-indent {
behavior: url("resource:/chrome/xulBindings.xml#treecell-indented-leaf");
}
treeitem[container="true"] > treerow > .treecell-indent {
behavior: url("resource:/chrome/xulBindings.xml#treecell-indented-folder");
behavior: url("resource:/chrome/xulBindings.xml#treecell-indent");
}
.treecell-iconic {
@ -288,10 +289,18 @@ button, button.left {
behavior: url(resource:/chrome/xulBindings.xml#buttonleft);
}
button.top {
behavior: url(resource:/chrome/xulBindings.xml#buttontop);
}
button.right {
behavior: url(resource:/chrome/xulBindings.xml#buttonright);
}
button.bottom {
behavior: url(resource:/chrome/xulBindings.xml#buttonbottom);
}
separator {
behavior: url(resource:/chrome/xulBindings.xml#separator);
}
@ -329,8 +338,41 @@ colorpicker {
behavior: url(resource:/chrome/xulBindings.xml#colorpicker);
}
data {
display: none;
behaviour: url(resource:/chrome/xulBindings.xml#data);
}
/** Buttons with Menus:
* - menulist
* - menulist[editable="true"] (combobox)
* - menubutton
**/
menulist
{
behavior : url("resource:/chrome/menulistBindings.xml#menulist");
}
menulist[editable="true"]
{
behavior : url("resource:/chrome/menulistBindings.xml#menulist-editable");
}
menubutton
{
behavior : url("resource:/chrome/menulistBindings.xml#menubutton-single-left");
}
menubutton.right
{
behavior : url("resource:/chrome/menulistBindings.xml#menubutton-single-right");
}
menubutton.menubutton-dual
{
behavior : url("resource:/chrome/menulistBindings.xml#menubutton-dual");
}
menubutton.menubutton-icon
{
behavior : url("resource:/chrome/menulistBindings.xml#menubutton-icon");
}

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

@ -40,6 +40,7 @@
</content>
</binding>
<binding id="menu-menubar">
<content excludes="template,observes,menupopup">
<xul:text class="menubar-text" inherits="value,accesskey,crop" crop="right"/>
@ -57,7 +58,7 @@
<content autostretch="never" excludes="template,observes,menupopup">
<xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
<xul:text class="menu-accel" inherits="acceltext:value"/>
<xul:box orient="vertical" autostretch="never" class="menu-right" inherits="menuactive,disabled">
<xul:box autostretch="never" class="menu-right" inherits="menuactive,disabled">
<xul:image/>
</xul:box>
</content>
@ -109,41 +110,7 @@
</interface>
</binding>
<binding id="menulist">
<content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/>
<xul:text class="menu-text" flex="1" inherits="value,accesskey,crop" crop="right"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target; this.data = this.selectedItem.data;"/>
</handlers>
<interface>
<property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/>
</interface>
</binding>
<binding id="menubutton">
<content excludes="template,observes,menupopup">
<xul:button class="menu-button" allowevents="true" inherits="buttonaction:oncommand,src,value,crop,accesskey"/>
<xul:image class="menu-dropmarker"/>
</content>
</binding>
<binding id="menulist-editable">
<content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/>
<html:input type="text" flex="1" class="menu-text" allowevents="true" inherits="value,disabled"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target"/>
</handlers>
</binding>
<binding id="treecell-indented-folder">
<binding id="treecell-indent">
<content autostretch="never">
<xul:treeindentation/>
<xul:image class="tree-cell-twisty" twisty="true" allowevents="true"/>
@ -330,10 +297,21 @@
<!-- XUL <button>s -->
<binding id="buttonleft" extends="resource:/chrome/xulBindings.xml#basetext">
<content excludes="observes,template">
<xul:box class="internal-box" inherits="orient" autostretch="never" flex="1">
<xul:image inherits="src"/>
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
<xul:box class="button-internal-box" autostretch="never" flex="1">
<xul:image class="button-icon" inherits="src"/>
<xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
<xul:text class="button-text" inherits="value,accesskey,crop"/>
</xul:box>
</xul:box>
</content>
</binding>
<binding id="buttontop" extends="resource:/chrome/xulBindings.xml#basetext">
<content excludes="observes,template">
<xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
<xul:image class="button-icon" inherits="src"/>
<xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
<xul:text class="button-text" inherits="value,accesskey,crop"/>
</xul:box>
</xul:box>
</content>
@ -341,11 +319,22 @@
<binding id="buttonright" extends="resource:/chrome/xulBindings.xml#basetext">
<content excludes="observes,template">
<xul:box autostretch="never" inherits="orient" class="internal-box" flex="1">
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
<xul:box class="button-internal-box" inherits="orient" autostretch="never" flex="1">
<xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
<xul:text class="button-text" inherits="value,accesskey,crop"/>
</xul:box>
<xul:image inherits="src"/>
<xul:image class="button-icon" inherits="src"/>
</xul:box>
</content>
</binding>
<binding id="buttonbottom" extends="resource:/chrome/xulBindings.xml#basetext">
<content excludes="observes,template">
<xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
<xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
<xul:text class="button-text" inherits="value,accesskey,crop"/>
</xul:box>
<xul:image class="button-icon" inherits="src"/>
</xul:box>
</content>
</binding>
@ -355,9 +344,9 @@
<!-- appending to the end so we don't make hyatt cry -->
<binding id="progressmeter" extends="xul:box">
<content excludes="observes,template">
<xul:box class="internal-box" flex="1">
<xul:stack flex="1">
<xul:progressbar inherits="value">
<xul:box class="progressmeter-internal-box" flex="1">
<xul:stack class="progressmeter-stack" flex="1">
<xul:progressbar class="progressmeter-progressbar" inherits="value">
<xul:box class="progress-bar"/>
<xul:box class="progress-remainder"/>
</xul:progressbar>
@ -379,8 +368,8 @@
<binding id="textfield" extends="xul:box">
<content excludes="observes,template">
<xul:box flex="1">
<html:input flex="1" inherits="value,type,maxlength,disabled,size,readonly"/>
<xul:box class="textfield-internal-box" flex="1">
<html:input class="textfield-input" flex="1" inherits="value,type,maxlength,disabled,size,readonly"/>
</xul:box>
</content>
<interface>
@ -405,8 +394,8 @@
<binding id="textarea" extends="resource:/chrome/xulBindings.xml#textfield">
<content excludes="observes,template">
<xul:box flex="1">
<html:textarea flex="1" inherits="value,disabled,rows,cols,readonly"/>
<xul:box class="textarea-internal-box" flex="1">
<html:textarea class="textfield-textarea" flex="1" inherits="value,disabled,rows,cols,readonly"/>
</xul:box>
</content>
</binding>
@ -598,7 +587,5 @@
</content>
</binding>
<binding id="data" extends="xul:spring"/>
</bindings>