#46423 -> new modern tabs and other minor updates. also checking in new image files for mac classic tabs in editor. r=ben.

This commit is contained in:
nbhatla%netscape.com 2000-09-14 10:35:21 +00:00
Родитель 49f01aa048
Коммит 7c6af2b03b
18 изменённых файлов: 238 добавлений и 30 удалений

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

@ -101,3 +101,15 @@ tab-unselect-left.gif
tab-unselect-middle.gif
tab-unselect-right.gif
tab-border-top-left-cap.gif
tab-sm-bot-sel-left.gif
tab-sm-bot-sel-mid.gif
tab-sm-bot-sel-right.gif
tab-sm-bot-unsel-acti-left.gif
tab-sm-bot-unsel-acti-mid.gif
tab-sm-bot-unsel-acti-right.gif
tab-sm-bot-unsel-left.gif
tab-sm-bot-unsel-mid.gif
tab-sm-bot-unsel-right.gif
tab-border-bot-left-cap.gif
tab-border-bot-right-cap.gif
tab-border-bot.gif

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

@ -150,7 +150,7 @@
<binding id="tab" extends="chrome://global/content/tabBindings.xml#tab">
<content>
<xul:spring class="tab-image-left" inherits="selected"/>
<xul:box flex="1" class="tab-image-middle" orient="horizontal" align="center" inherits="selected">
<xul:box flex="1" class="tab-image-middle" orient="horizontal" align="center" inherits="selected" autostretch="never">
<xul:image class="tab-left"/>
<xul:text flex="1" inherits="value,crop,accesskey" crop="right" class="tab-text"/>
</xul:box>

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

@ -4,9 +4,11 @@
* as Macintosh tabs generally are. An example of using bottom tab images can be
* found in EditorToolbar.css in classic/editor/.
*******************************/
/*** TAB: TOP <tab> ***/
tab {
-moz-binding : url(chrome://global/skin/classicBindings.xml#tab);
-moz-binding : url(chrome://global/skin/classicBindings.xml#tab);
color : #000000;
padding : 0px;
max-height : 24px;
@ -51,7 +53,7 @@ tab:hover:active > .tab-image-right {
/* when a tab is selected this is how it should look */
tab:hover:active[selected="true"] {
tab:hover:active[selected="true"], tab:hover:active[selected="1"]{
color : #000000;
}
@ -90,10 +92,91 @@ tab:hover:active[selected="true"] > .tab-image-right {
}
tabbox {
-moz-binding : url(chrome://global/skin/classicBindings.xml#tabbox);
-moz-binding : url(chrome://global/skin/classicBindings.xml#tabbox);
padding : 0px;
}
/*** TAB: BOTTOM <tab class="tab-bottom"> ***/
/* Found in editor.xul & editorOverlay.xul
* SMALL TABS FOR NOW */
.tab-bottom > .tab-image-middle > .tab-text {
font : 10px geneva;
font-weight : bold;
}
.tab-bottom > .tab-image-left {
background : url(chrome://global/skin/tab-sm-bot-unsel-left.gif) no-repeat;
width : 11px;
height : 19px;
}
.tab-bottom > .tab-image-middle {
background : url(chrome://global/skin/tab-sm-bot-unsel-mid.gif) repeat-x;
}
.tab-bottom > .tab-image-middle > .tab-left {
padding : 4px 0px;
}
.tab-bottom > .tab-image-right {
background : url(chrome://global/skin/tab-sm-bot-unsel-right.gif) no-repeat;
width : 11px;
height : 19px;
}
.tab-bottom > .tab-image-middle > .tab-text {
padding : 4px 0px 5px 0px;
}
.tab-bottom:hover:active > .tab-image-left {
background : url(chrome://global/skin/tab-sm-bot-unsel-acti-left.gif) no-repeat;
}
.tab-bottom:hover:active > .tab-image-middle {
background : url(chrome://global/skin/tab-sm-bot-unsel-acti-mid.gif) repeat-x;
}
.tab-bottom:hover:active > .tab-image-right {
background : url(chrome://global/skin/tab-sm-bot-unsel-acti-right.gif) no-repeat;
}
/* when a tab is selected this is how it should look */
.tab-bottom[selected="1"] > .tab-image-left,
.tab-bottom:hover:active[selected="1"] > .tab-image-left {
background : url(chrome://global/skin/tab-sm-bot-sel-left.gif) no-repeat;
}
.tab-bottom[selected="1"] > .tab-image-middle,
.tab-bottom:hover:active[selected="1"] > .tab-image-middle {
background : url(chrome://global/skin/tab-sm-bot-sel-mid.gif) repeat-x;
}
.tab-bottom[selected="1"] > .tab-image-right,
.tab-bottom:hover:active[selected="1"] > .tab-image-right {
background : url(chrome://global/skin/tab-sm-bot-sel-right.gif) no-repeat;
}
.tabbox-bottom > .tab-border-top-left {
background : url(chrome://global/skin/tab-border-top.gif) repeat-x top;
width : 2px;
}
.tabbox-bottom > .tab-border-top-left-cap {
background : url(chrome://global/skin/tab-border-bot-left-cap.gif) no-repeat top;
width : 2px;
}
.tabbox-bottom > .tab-border-top-right {
background : url(chrome://global/skin/tab-border-bot.gif) repeat-x top;
}
.tabbox-bottom > .tab-border-top-right-cap {
background : url(chrome://global/skin/tab-border-bot-right-cap.gif) no-repeat top;
width : 2px;
}
/* top tabs */
tabcontrol[align="vertical"] tabbox[align="horizontal"] tab {
padding: 0px;

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

@ -239,3 +239,27 @@ scroll-down-clicked.gif
scroll-left-clicked.gif
scroll-right-clicked.gif
scroll-thumb-vert-top.gif
tab-bot-border-leftcap.gif
tab-bot-border-rightcap.gif
tab-bot-border.gif
tab-bot-clicked-left.gif
tab-bot-clicked-middle.gif
tab-bot-clicked-right.gif
tab-bot-select-left.gif
tab-bot-select-middle.gif
tab-bot-select-right.gif
tab-bot-unselect-left.gif
tab-bot-unselect-middle.gif
tab-bot-unselect-right.gif
tab-clicked-left.gif
tab-clicked-middle.gif
tab-clicked-right.gif
tab-select-left.gif
tab-select-middle.gif
tab-select-right.gif
tab-top-border-leftcap.gif
tab-top-border-rightcap.gif
tab-top-border.gif
tab-unselect-left.gif
tab-unselect-middle.gif
tab-unselect-right.gif

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

@ -279,6 +279,30 @@ EXPORT_RESOURCE_SAMPLES_3 = \
simple-arrow-right.gif \
simple-arrow-up-disabled.gif \
simple-arrow-up.gif \
tab-bot-border-leftcap.gif \
tab-bot-border-rightcap.gif \
tab-bot-border.gif \
tab-bot-clicked-left.gif \
tab-bot-clicked-middle.gif \
tab-bot-clicked-right.gif \
tab-bot-select-left.gif \
tab-bot-select-middle.gif \
tab-bot-select-right.gif \
tab-bot-unselect-left.gif \
tab-bot-unselect-middle.gif \
tab-bot-unselect-right.gif \
tab-clicked-left.gif \
tab-clicked-middle.gif \
tab-clicked-right.gif \
tab-select-left.gif \
tab-select-middle.gif \
tab-select-right.gif \
tab-top-border-leftcap.gif \
tab-top-border-rightcap.gif \
tab-top-border.gif \
tab-unselect-left.gif \
tab-unselect-middle.gif \
tab-unselect-right.gif \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@ -1,7 +1,7 @@
titledbox
{
border : 2px groove #4D6584;
border : 2px groove #D7E8FD;
padding : 7px;
margin : 5px;
}

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

@ -12,6 +12,7 @@
button.plain > .button-internal-box > .button-icon,
button.plain > .button-internal-box > .button.icon:hover:active
{
-moz-binding : url(chrome://global/content/xulBindings.xml#buttonleft);
border : 0px !important;
margin : 0px;
padding : 0px;
@ -65,8 +66,8 @@ button.plain-extended {}
text-align : center;
vertical-align : middle;
padding : 0px;
font-size : 11px;
font-family : charcoal, arial;
font-size : 12px;
font-family : charcoal, ms sans serif;
font-weight : normal;
margin-right : 2px;
}
@ -82,7 +83,7 @@ button.plain-extended {}
}
.button-bottom-spring {
height : 2px;
height : 1px;
}
button:hover:active {
@ -123,14 +124,6 @@ button.plain-extended {}
margin: 2px 5px 3px 5px;
}
.button-text-box[default="true"] {
//font-weight: bold; TURN ON LATER, AFTER FIXING FONT ISSUE
}
button[default="true"] > .button-image-middle > .button-top-spring {
height: 3px;
}
.button-image-left[default="true"] {
background : url(chrome://global/skin/button-def-left.gif) no-repeat;
width: 11px;
@ -166,7 +159,7 @@ button.plain-extended {}
.button-image-middle[default="true"][disabled="true"],
button[default="true"][disabled="true"]:hover:active > .button-image-middle {
background : url(chrome://global/skin/button-def-disabled-middle.gif) repeat-x;
background : url(chrome://global/skin/button-def-disabled-mid.gif) repeat-x;
}
.button-image-right[default="true"][disabled="true"],

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

@ -72,19 +72,17 @@
separator.groove,
separator.groove[orient="horizontal"]
{
border-top: 1px solid #172254;
border-bottom: 1px solid #5A518A;
border-top : 1px solid #7A8490;
border-bottom : 1px solid #FEFEFE;
max-height: 2px;
margin-top: 2px;
margin-bottom: 2px;
margin : 2px 3px;
}
separator.groove[orient="vertical"]
{
border-left: 1px solid #172254;
border-right: 1px solid #5A518A;
margin-left: 0.4em;
margin-right: 0.4em;
border-left: 1px solid #7A8490;
border-right: 1px solid #FEFEFE;
margin : 3px 2px;
}
/* groove separators (0 padding, for dividing effects) */

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

@ -110,7 +110,7 @@
<xul:spring class="button-image-left" inherits="default,disabled"/>
<xul:box flex="1" class="button-image-middle" inherits="default,disabled" orient="vertical" align="center">
<xul:spring flex="1" class="button-top-spring"/>
<xul:box flex="1">
<xul:box flex="1" autostretch="never">
<xul:image class="button-icon" inherits="src"/>
<xul:box class="button-text-box" flex="1" inherits="default">
<xul:text inherits="disabled,value,crop,accesskey"/>
@ -183,6 +183,32 @@
</content>
</binding>
<binding id="tab" extends="chrome://global/content/tabBindings.xml#tab">
<content>
<xul:spring class="tab-image-left" inherits="selected"/>
<xul:box flex="1" class="tab-image-middle" orient="horizontal" align="center" inherits="selected" autostretch="never">
<xul:image class="tab-left"/>
<xul:text flex="1" inherits="value,crop,accesskey" crop="right" class="tab-text"/>
</xul:box>
<xul:spring class="tab-image-right" inherits="selected"/>
</content>
</binding>
<binding id="tabbox" extends="chrome://global/content/tabBindings.xml#tabbox">
<content>
<xul:spring class="tab-border-top-left-cap"/>
<xul:spring class="tab-border-top-left"/>
<xul:box inherits="align">
<children/>
</xul:box>
<xul:spring class="tab-border-top-right" flex="1"/>
<xul:spring class="tab-border-top-right-cap"/>
</content>
</binding>
<!-- BUGGY TEXTFIELD: DO NOT USE -->
<binding id="textfield" extends="chrome://global/content/xulBindings.xml#textfield">
<content excludes="observes,template">
<xul:box class="textfield-left" orient="vertical">

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

@ -249,7 +249,7 @@ install::
$(MAKE_INSTALL) textfield-right-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) textfield-right-top.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-def-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-def-middle.gif.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-def-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-def-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-clicked-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-def-clicked-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
@ -265,3 +265,27 @@ install::
$(MAKE_INSTALL) scroll-track-horz-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) scroll-track-vert-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) scroll-up-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-border-leftcap.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-border-rightcap.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-border.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-clicked-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-clicked-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-clicked-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-select-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-select-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-select-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-unselect-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-unselect-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-bot-unselect-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-clicked-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-clicked-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-clicked-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-select-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-select-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-select-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-top-border-leftcap.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-top-border-rightcap.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-top-border.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-unselect-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-unselect-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) tab-unselect-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin

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

@ -54,8 +54,8 @@ menupopup > menuitem, popup > menuitem
menuseparator
{
border-top : 1px solid #FEFEFE;
border-bottom : 1px solid #012655;
border-top : 1px solid #7A8490;
border-bottom : 1px solid #FEFEFE;
margin : 2px 3px;
}

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

До

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

После

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

Двоичные данные
themes/modern/global/menulist-clicked-middle.gif

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

До

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

После

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

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

До

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

После

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

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

До

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

После

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

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

До

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

После

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

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

До

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

После

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

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

@ -278,6 +278,30 @@ skins/modern.jar:
global/skin/scroll-track-horz-middle.gif (global/scroll-track-horz-middle.gif)
global/skin/scroll-track-vert-middle.gif (global/scroll-track-vert-middle.gif)
global/skin/scroll-up-clicked.gif (global/scroll-up-clicked.gif)
global/skin/tab-bot-border-leftcap.gif (global/tab-bot-border-leftcap.gif)
global/skin/tab-bot-border-rightcap.gif (global/tab-bot-border-rightcap.gif)
global/skin/tab-bot-border.gif (global/tab-bot-border.gif)
global/skin/tab-bot-clicked-left.gif (global/tab-bot-clicked-left.gif)
global/skin/tab-bot-clicked-middle.gif (global/tab-bot-clicked-middle.gif)
global/skin/tab-bot-clicked-right.gif (global/tab-bot-clicked-right.gif)
global/skin/tab-bot-select-left.gif (global/tab-bot-select-left.gif)
global/skin/tab-bot-select-middle.gif (global/tab-bot-select-middle.gif)
global/skin/tab-bot-select-right.gif (global/tab-bot-select-right.gif)
global/skin/tab-bot-unselect-left.gif (global/tab-bot-unselect-left.gif)
global/skin/tab-bot-unselect-middle.gif (global/tab-bot-unselect-middle.gif)
global/skin/tab-bot-unselect-right.gif (global/tab-bot-unselect-right.gif)
global/skin/tab-clicked-left.gif (global/tab-clicked-left.gif)
global/skin/tab-clicked-middle.gif (global/tab-clicked-middle.gif)
global/skin/tab-clicked-right.gif (global/tab-clicked-right.gif)
global/skin/tab-select-left.gif (global/tab-select-left.gif)
global/skin/tab-select-middle.gif (global/tab-select-middle.gif)
global/skin/tab-select-right.gif (global/tab-select-right.gif)
global/skin/tab-top-border-leftcap.gif (global/tab-top-border-leftcap.gif)
global/skin/tab-top-border-rightcap.gif (global/tab-top-border-rightcap.gif)
global/skin/tab-top-border.gif (global/tab-top-border.gif)
global/skin/tab-unselect-left.gif (global/tab-unselect-left.gif)
global/skin/tab-unselect-middle.gif (global/tab-unselect-middle.gif)
global/skin/tab-unselect-right.gif (global/tab-unselect-right.gif)
messenger/skin/AccountManager.css (messenger/AccountManager.css)
messenger/skin/addtoab.gif (messenger/addtoab.gif)
messenger/skin/attach.gif (messenger/attach.gif)