This commit is contained in:
ben%netscape.com 2000-03-16 01:13:53 +00:00
Родитель 5998b290c6
Коммит 33ca366ab2
3 изменённых файлов: 381 добавлений и 153 удалений

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

@ -394,16 +394,16 @@ titledbutton#Throbber[busy="true"] {
}
/* icons titledbuttons */
titledbutton.message-icon {
.message-icon {
list-style-image: url("chrome://global/skin/message-icon.gif");
}
titledbutton.alert-icon {
.alert-icon {
list-style-image: url("chrome://global/skin/alert-icon.gif");
}
titledbutton.error-icon {
.error-icon {
list-style-image: url("chrome://global/skin/error-icon.gif");
}
titledbutton.question-icon {
.question-icon {
list-style-image: url("chrome://global/skin/question-icon.gif");
}
@ -986,80 +986,6 @@ menu[menuactive="true"] > .menu-right {
list-style-image: url("chrome://global/skin/menu-arrow-hover.gif");
}
menulist, menubutton {
padding: 1px 0px 1px 0px;
}
menulist > .menu-text,
menubutton > .menu-text {
padding-left: 4px;
padding-right: 4px;
border: 1px inset #CCCCCC;
}
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,
menulist > .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,
menulist[open="true"] > .menu-dropmarker {
border: 1px inset #CCCCCC;
padding: 1px 1px -1px 3px;
}
menubutton menupopup, menulist menupopup {
border: 1px outset #CCCCCC;
}
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;
}
/******** Rules for menus on the standard toolbars ***************/
menu.standard {
@ -1744,29 +1670,6 @@ html|input[type=radio][disabled] {
border: 1px solid #666666;
}
/********** checkbox **********/
checkbox {
list-style-image: url(chrome://global/skin/scroll-up.gif);
}
checkbox[checked="true"] {
list-style-image: url(chrome://global/skin/scroll-down.gif);
}
radio {
list-style-image: url(chrome://global/skin/scroll-up.gif);
}
radio[checked="true"] {
list-style-image: url(chrome://global/skin/scroll-down.gif);
}
radiogroup {
border: 1px solid black;
}
html|input[type=checkbox] {
padding: 0px 1px 1px 0px;
margin: 3px 5px 4px 3px;
@ -2082,6 +1985,162 @@ 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; /* bend over, bitch */
}
button:active {
border: 1px solid #000000;
}
/* button:active rules */
button:active > .internal-box {
border: 1px inset #CCCCCC;
padding: 3px 1px 1px 3px;
}
button:hover {
border: 1px solid #000000;
color: #003366;
}
/* 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 5px 0px 5px;
}
button.top > .internal-box > .text-container > .text,
button.bottom > .internal-box > .text-container > .text {
padding: 2px 0px 2px 0px;
}
/* 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;
@ -2103,17 +2162,170 @@ separator.groove,
separator.groove[orient="horizontal"] {
border-top: 2px groove #CCCCCC;
height: 0px;
margin-top: 0.75em;
margin-bottom: 0.75em;
margin-top: 0.4em;
margin-bottom: 0.4em;
}
separator[type="groove"][orient="vertical"] {
border-left: 2px groove #CCCCCC;
margin-left: 0.75em;
margin-right: 0.75em;
margin-left: 0.4em;
margin-right: 0.4em;
}
html {
margin-top: 0.4em;
margin-bottom: 0.4em;
padding: 5px 3px 5px 4px;
cursor: default;
}
html.header {
font-weight: bold;
}
.inset {
border: 1px inset #CCCCCC;
}
/* NEW WIDGET LANDING: <box> rules */
box[autostretch="never"], box[autostretch="never"][orient="horizontal"] {
vertical-align: middle;
}
/* NEW WIDGET LANDING: <text> rules */
text.label {
margin: 0px;
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;
}

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

@ -80,10 +80,6 @@ toolbarseparator {
/****** Progress Meter ********/
progressmeter {
behavior: url("resource:/chrome/xulBindings.xml#progressmeter");
}
/****** TitledBox ******/
/********* XP Menus ***********/
@ -234,14 +230,14 @@ 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, button.left {
behavior: url(resource:/chrome/xulBindings.xml#buttonleft);
}
button.top {
behavior: url(resource:/chrome/xulBindings.xml#buttontop);
}
@ -250,7 +246,15 @@ 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);
}
/* appending to end so we don't make hyatt cry */
progressmeter {
behavior: url(resource:/chrome/xulBindings.xml#progressmeter);
}

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

@ -49,40 +49,40 @@
<binding name="menus">
<content excludes="template,observes,menupopup">
<xul:titledbutton class="menu-left"/>
<xul:image class="menu-left"/>
<xul:titledbutton class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
<xul:titledbutton class="menu-accel" inherits="acceltext:value"/>
<xul:titledbutton class="menu-right"/>
<xul:text class="menu-accel" inherits="acceltext:value"/>
<xul:image class="menu-right"/>
</content>
</binding>
<binding name="menulist">
<content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/>
<xul:titledbutton class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
<xul:titledbutton class="menu-dropmarker"/>
<xul:text class="menu-text" flex="1" inherits="value,accesskey,crop" crop="right"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target"/>
</handlers>
</handlers>
</binding>
<binding name="menubutton">
<content excludes="template,observes,menupopup">
<xul:titledbutton class="menu-button" allowevents="true" inherits="buttonaction:oncommand,src,value,crop,accesskey"/>
<xul:titledbutton class="menu-dropmarker"/>
<xul:labelledimage class="menu-button" allowevents="true" inherits="buttonaction:oncommand,src,value,crop,accesskey"/>
<xul:image class="menu-dropmarker"/>
</content>
</binding>
<binding name="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:titledbutton class="menu-dropmarker"/>
<html:input type="text" flex="1" class="menu-text" allowevents="true" inherits="value,disabled"/>
<xul:image class="menu-dropmarker"/>
</content>
<handlers>
<handlers>
<handler type="command" capturer="true" value="this.selectedItem = event.target"/>
</handlers>
</handlers>
</binding>
<binding name="treecell-indented-folder">
@ -112,71 +112,84 @@
<binding name="checkbox">
<content>
<xul:box flex="1" class="internal-box" autostretch="never">
<xul:image inherits="src"/>
<xul:box class="internal-box" autostretch="never">
<xul:box class="checkmark-box" autostretch="never">
<xul:image inherits="src"/>
</xul:box>
<xul:html flex="1" inherits="value"/>
</xul:box>
</content>
<handlers>
<handlers>
<handler type="mouseup" value="this.checked = !this.checked;"/>
<handler type="keypress" key=" " value="this.checked = !this.checked;"/>
</handlers>
<handler type="keypress" key=" " value="this.checked = !this.checked;"/>
</handlers>
</binding>
<binding name="radio">
<content>
<xul:box flex="1" class="internal-box" autostretch="never">
<xul:image inherits="src"/>
<xul:box class="internal-box" autostretch="never">
<xul:box class="checkmark-box" autostretch="never">
<xul:image inherits="src"/>
</xul:box>
<xul:html flex="1" inherits="value"/>
</xul:box>
</content>
</content>
</binding>
<binding name="radiogroup">
<handlers>
<handlers>
<handler type="mouseup" value="try { this.selectedItem = event.target; } catch (e) {}"/>
<handler type="keypress" key=" " value="try { this.selectedItem = event.target; } catch (e) {}"/>
</handlers>
<handler type="keypress" key=" " value="try { this.selectedItem = event.target; } catch (e) {}"/>
</handlers>
</binding>
<binding name="buttonleft" excludes="observes,template">
<content>
<xul:box flex="1" class="internal-box" autostretch="never">
<xul:box class="internal-box" autostretch="never" flex="1">
<xul:image inherits="src"/>
<xul:text inherits="value,accesskey,crop"/>
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
</xul:box>
</xul:box>
</content>
</binding>
<binding name="buttontop" excludes="observes,template">
<content>
<xul:box flex="1" orient="vertical" autostretch="never" class="internal-box">
<xul:box orient="vertical" autostretch="never" class="internal-box" flex="1">
<xul:image inherits="src"/>
<xul:text inherits="value,accesskey,crop"/>
</xul:box>
</content>
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
</xul:box>
</xul:box>
</content>
</binding>
<binding name="buttonright" excludes="observes,template">
<content>
<xul:box flex="1" autostretch="never" class="internal-box">
<xul:text inherits="value,accesskey,crop"/>
<xul:box autostretch="never" class="internal-box" flex="1">
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
</xul:box>
<xul:image inherits="src"/>
</xul:box>
</content>
</content>
</binding>
<binding name="buttonbottom" excludes="observes,template">
<content>
<xul:box flex="1" orient="vertical" autostretch="never" class="internal-box">
<xul:text inherits="value,accesskey,crop"/>
<xul:box orient="vertical" autostretch="never" class="internal-box" flex="1">
<xul:box orient="vertical" class="text-container" autostretch="never" flex="1">
<xul:text inherits="value,accesskey,crop"/>
</xul:box>
<xul:image inherits="src"/>
</xul:box>
</content>
</xul:box>
</content>
</binding>
<binding name="separator" extends="xul:spring"/>
<!-- appending to the end so we don't make hyatt cry -->
<binding name="progressmeter" extends="xul:box">
<content excludes="observes,template">
<xul:box class="internal-box" flex="1">
@ -195,5 +208,4 @@
</content>
</binding>
</bindings>