Fix regression in appearance of Name field in Add Bookmark and Bookmark Properties dialogs on the Mac.

bug=342182
r=mconnor
This commit is contained in:
myk%mozilla.org 2006-06-26 17:57:12 +00:00
parent 88bbc6c0d5
commit e5efa42650
2 changed files with 87 additions and 72 deletions

View File

@ -1,3 +1,6 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
.folder-icon > .menulist-label-box > .menulist-icon,
.folder-icon > .menu-iconic-left > .menu-iconic-icon {
width: 16px;
@ -53,51 +56,53 @@ dialog {
list-style-image: url("chrome://browser/skin/bookmarks/expander-open-active.png") !important;
}
/* Hide the drop marker if no microsummaries are available. */
/* Make the microsummary picker look like a regular textbox instead of
* an editable menulist when no microsummaries are available.
*/
menulist#name[droppable="false"] {
-moz-appearance: none;
margin: 0px;
border: none;
padding: 0px;
height: auto !important;
}
menulist#name[droppable="false"] > .menulist-editable-box {
/* These rules are duplicates of the rules for the textbox element
* in textbox.css and should track changes in that file.
*/
-moz-appearance: textfield;
cursor: text;
margin: 4px 4px;
border: 3px solid;
-moz-border-top-colors: transparent #888888 #000000;
-moz-border-right-colors: transparent #FFFFFF #000000;
-moz-border-bottom-colors: transparent #FFFFFF #000000;
-moz-border-left-colors: transparent #888888 #000000;
-moz-border-radius-topright: 2px;
-moz-border-radius-bottomleft: 2px;
/*padding: 1px 0px 1px 2px ;*/
padding: 0px;
background-color: -moz-Field;
color: -moz-FieldText;
}
menulist#name[droppable="false"] > .menulist-editable-box > html|*.textbox-input {
margin: 0px !important;
border: none !important;
padding: 0px !important;
background-color: inherit;
color: inherit;
font: inherit;
}
/* Hide the drop marker and the popup. */
menulist#name[droppable="false"] > .menulist-dropmarker {
display: none;
}
/*
* Editable menulists look almost like regular textboxes, but not quite,
* which makes it look like something is off a bit when you place a menulist
* next to a textbox, f.e. the microsummary picker above the Location field
* and other fields in the Bookmarks Properties dialog box.
*
* Of course, there aren't any text fields here in the Add Bookmark dialog box,
* but for consistency with the Bookmark Properties dialog box, we correct
* the appearance of the picker here as well.
*
*/
menulist#name > .menulist-editable-box {
/* Normal editable menulists set this to "menulist-textfield". */
-moz-appearance: none;
}
menulist#name {
/* These rules come from the textbox element in textbox.css. */
/* Normal editable menulists set this to "none". */
-moz-appearance: textfield;
/* Follow the rule for normal editable menulists (cursor: auto;) instead of
* textboxes (cursor: text;) so the cursor is a pointer over the dropmarker.
*/
/* cursor: text; */
/* Follow the rule for normal editable menulists (margin: 2px 2px;) instead of
* textboxes (margin: 2px 4px;) so the list lines up with the "Create in:"
* drop-down menu below it.
*/
/* margin: 2px 4px; */
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
padding: 2px 2px 3px 4px;
background-color: -moz-Field;
color: -moz-FieldText;
menulist#name[droppable="false"] > menupopup {
display: none;
}

View File

@ -34,41 +34,32 @@
*
* ***** END LICENSE BLOCK ***** */
/* Hide the drop marker if no microsummaries are available. */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
/* Make the microsummary picker look like a regular textbox instead of
* an editable menulist when no microsummaries are available.
*/
menulist#name[droppable="false"] {
-moz-appearance: none;
margin: 0px;
border: none;
padding: 0px;
height: auto !important;
}
menulist#name[droppable="false"] > .menulist-dropmarker {
display: none;
}
/*
* Editable menulists look almost like regular textboxes, but not quite,
* which makes it look like something is off a bit when you place a menulist
* next to a textbox, f.e. the microsummary picker above the Location field
* and other fields in the Bookmarks Properties dialog box.
*
* These styles correct the appearance of the picker in that dialog box,
* making it look just like the textboxes below it.
*
*/
menulist#name > .menulist-editable-box {
/* Normal editable menulists set this to "menulist-textfield". */
-moz-appearance: none;
}
menulist#name {
/* These rules come from the textbox element in textbox.css. */
/* Normal editable menulists set this to "none". */
-moz-appearance: textfield;
/* Follow the rule for normal editable menulists (cursor: auto;) instead of
* textboxes (cursor: text;) so the cursor is a pointer over the dropmarker.
menulist#name[droppable="false"] > .menulist-editable-box {
/* These rules are duplicates of the rules for the textbox element
* in textbox.css and should track changes in that file.
*/
/* cursor: text; */
/* Normal editable menulists set this to "2px 2px". */
-moz-appearance: textfield;
cursor: text;
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
@ -78,3 +69,22 @@ menulist#name {
background-color: -moz-Field;
color: -moz-FieldText;
}
menulist#name[droppable="false"] > .menulist-editable-box > html|*.textbox-input {
margin: 0px !important;
border: none !important;
padding: 0px !important;
background-color: inherit;
color: inherit;
font: inherit;
}
/* Hide the drop marker and the popup. */
menulist#name[droppable="false"] > .menulist-dropmarker {
display: none;
}
menulist#name[droppable="false"] > menupopup {
display: none;
}