Removed descendant CSS for titledbox, b=42331. Added support for proper images for type='radio' menuitems. r=ben
|
@ -82,8 +82,9 @@ titledbox {
|
|||
|
||||
.color-well {
|
||||
width:20px;
|
||||
height: 1.2em;
|
||||
height: 16px;
|
||||
border: 1px inset #CCCCCC;
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.color-well[default="true"] {
|
||||
|
@ -91,6 +92,10 @@ titledbox {
|
|||
background-color: inherit;
|
||||
}
|
||||
|
||||
.color-button {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#ColorPickerSwatch {
|
||||
border : 2px outset #CCCCCC;
|
||||
width: 25px;
|
||||
|
|
|
@ -46,6 +46,9 @@ menu-arrow.gif
|
|||
menu-check-disabled.gif
|
||||
menu-check-hover.gif
|
||||
menu-check.gif
|
||||
menu-radio-disabled.gif
|
||||
menu-radio-hover.gif
|
||||
menu-radio.gif
|
||||
menu.css
|
||||
menubutton.css
|
||||
menulist.css
|
||||
|
|
|
@ -80,6 +80,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \
|
|||
menu-check-disabled.gif \
|
||||
menu-check-hover.gif \
|
||||
menu-check.gif \
|
||||
menu-radio-disabled.gif \
|
||||
menu-radio-hover.gif \
|
||||
menu-radio.gif \
|
||||
menu.css \
|
||||
menubutton.css \
|
||||
menulist.css \
|
||||
|
|
|
@ -9,6 +9,7 @@ titledbox
|
|||
title
|
||||
{
|
||||
margin : 0px 6px 2px 6px;
|
||||
padding : 0px 3px 0px 3px;
|
||||
}
|
||||
|
||||
.titledbox-body
|
||||
|
@ -17,9 +18,6 @@ title
|
|||
padding : inherit;
|
||||
}
|
||||
|
||||
title > text {
|
||||
margin : 0px 3px 0px 3px;
|
||||
}
|
||||
|
||||
/** box formatting **/
|
||||
box[autostretch="never"]
|
||||
|
|
|
@ -76,6 +76,9 @@ install::
|
|||
$(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menulist.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
|
|
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
|
@ -159,6 +159,21 @@ menuitem[checked="true"][menuactive="true"]
|
|||
list-style-image : url("chrome://global/skin/menu-check-hover.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][menuactive="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-hover.gif");
|
||||
}
|
||||
|
||||
.menu-right[disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
skins/blue.jar:
|
||||
skins/modern.jar:
|
||||
manifest.rdf
|
||||
communicator/skin/box.css (communicator/box.css)
|
||||
communicator/skin/securityOverlay.css (communicator/securityOverlay.css)
|
||||
|
@ -76,6 +76,9 @@ skins/blue.jar:
|
|||
global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif)
|
||||
global/skin/menu-check-hover.gif (global/menu-check-hover.gif)
|
||||
global/skin/menu-check.gif (global/menu-check.gif)
|
||||
global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif)
|
||||
global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif)
|
||||
global/skin/menu-radio.gif (global/menu-radio.gif)
|
||||
global/skin/menu.css (global/menu.css)
|
||||
global/skin/menubutton.css (global/menubutton.css)
|
||||
global/skin/menulist.css (global/menulist.css)
|
||||
|
|
|
@ -82,9 +82,9 @@ titledbox {
|
|||
|
||||
.color-well {
|
||||
width:20px;
|
||||
height: 1em;
|
||||
height: 16px;
|
||||
border: 1px inset #CCCCCC;
|
||||
/* Background color is set at runtime */
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.color-well[default="true"] {
|
||||
|
@ -92,6 +92,10 @@ titledbox {
|
|||
background-color: inherit;
|
||||
}
|
||||
|
||||
.color-button {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#ColorPickerSwatch {
|
||||
border : 2px outset #CCCCCC;
|
||||
width: 25px;
|
||||
|
|
|
@ -67,6 +67,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \
|
|||
menu-check-disabled.gif \
|
||||
menu-check-hover.gif \
|
||||
menu-check.gif \
|
||||
menu-radio-disabled.gif \
|
||||
menu-radio-hover.gif \
|
||||
menu-radio.gif \
|
||||
moreCols.gif \
|
||||
moreCols_dis.gif \
|
||||
moreCols_mo.gif \
|
||||
|
|
|
@ -65,6 +65,9 @@ install::
|
|||
$(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) moreCols.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) moreCols_dis.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) moreCols_mo.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
|
|
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
|
@ -168,6 +168,16 @@ menuitem[checked="true"][disabled="true"]
|
|||
list-style-image : url("chrome://global/skin/menu-check-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-disabled.gif");
|
||||
}
|
||||
|
||||
.menu-right[disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
|
||||
|
|
|
@ -170,6 +170,21 @@ menuitem[checked="true"][disabled="true"]
|
|||
list-style-image : url("chrome://global/skin/menu-check-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][menuactive="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-hover.gif");
|
||||
}
|
||||
|
||||
.menu-right[disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
|
||||
|
|
|
@ -248,6 +248,9 @@ skins/classic.jar:
|
|||
global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif)
|
||||
global/skin/menu-check-hover.gif (global/menu-check-hover.gif)
|
||||
global/skin/menu-check.gif (global/menu-check.gif)
|
||||
global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif)
|
||||
global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif)
|
||||
global/skin/menu-radio.gif (global/menu-radio.gif)
|
||||
global/skin/moreCols.gif (global/moreCols.gif)
|
||||
global/skin/moreCols_dis.gif (global/moreCols_dis.gif)
|
||||
global/skin/moreCols_mo.gif (global/moreCols_mo.gif)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
titledbox {
|
||||
margin: 2px 5px; 4px; 5px;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 4px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.MinWidth5em {
|
||||
|
@ -82,8 +82,9 @@ titledbox {
|
|||
|
||||
.color-well {
|
||||
width:20px;
|
||||
height: 1.2em;
|
||||
height: 16px;
|
||||
border: 1px inset #CCCCCC;
|
||||
margin: 1px 0px 2px 4px;
|
||||
}
|
||||
|
||||
.color-well[default="true"] {
|
||||
|
@ -91,6 +92,10 @@ titledbox {
|
|||
background-color: inherit;
|
||||
}
|
||||
|
||||
.color-button {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#ColorPickerSwatch {
|
||||
border : 2px outset #CCCCCC;
|
||||
width: 25px;
|
||||
|
|
|
@ -46,6 +46,9 @@ menu-arrow.gif
|
|||
menu-check-disabled.gif
|
||||
menu-check-hover.gif
|
||||
menu-check.gif
|
||||
menu-radio-disabled.gif
|
||||
menu-radio-hover.gif
|
||||
menu-radio.gif
|
||||
menu.css
|
||||
menubutton.css
|
||||
menulist.css
|
||||
|
|
|
@ -80,6 +80,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \
|
|||
menu-check-disabled.gif \
|
||||
menu-check-hover.gif \
|
||||
menu-check.gif \
|
||||
menu-radio-disabled.gif \
|
||||
menu-radio-hover.gif \
|
||||
menu-radio.gif \
|
||||
menu.css \
|
||||
menubutton.css \
|
||||
menulist.css \
|
||||
|
|
|
@ -9,6 +9,7 @@ titledbox
|
|||
title
|
||||
{
|
||||
margin : 0px 6px 2px 6px;
|
||||
padding : 0px 3px 0px 3px;
|
||||
}
|
||||
|
||||
.titledbox-body
|
||||
|
@ -17,10 +18,6 @@ title
|
|||
padding : inherit;
|
||||
}
|
||||
|
||||
title > text {
|
||||
margin : 0px 3px 0px 3px;
|
||||
}
|
||||
|
||||
/** box formatting **/
|
||||
box[autostretch="never"]
|
||||
{
|
||||
|
|
|
@ -76,6 +76,9 @@ install::
|
|||
$(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menulist.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
|
|
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
После Ширина: | Высота: | Размер: 76 B |
|
@ -159,6 +159,21 @@ menuitem[checked="true"][menuactive="true"]
|
|||
list-style-image : url("chrome://global/skin/menu-check-hover.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][menuactive="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-radio-hover.gif");
|
||||
}
|
||||
|
||||
.menu-right[disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif");
|
||||
|
|
|
@ -79,6 +79,9 @@ skins/modern.jar:
|
|||
global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif)
|
||||
global/skin/menu-check-hover.gif (global/menu-check-hover.gif)
|
||||
global/skin/menu-check.gif (global/menu-check.gif)
|
||||
global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif)
|
||||
global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif)
|
||||
global/skin/menu-radio.gif (global/menu-radio.gif)
|
||||
global/skin/menu.css (global/menu.css)
|
||||
global/skin/menubutton.css (global/menubutton.css)
|
||||
global/skin/menulist.css (global/menulist.css)
|
||||
|
|