Bug 559978 - Vertically center icons in places lists (bookmarks, awesomebar) [r=mfinkle]

This commit is contained in:
Matt Brubeck 2010-04-20 00:01:40 -04:00
parent 0cfdbb6c24
commit 9d76d65770
3 changed files with 25 additions and 18 deletions

View File

@ -47,11 +47,13 @@
<binding id="popup_autocomplete_result">
<content orient="vertical">
<xul:hbox class="autocomplete-item-label" align="center" xbl:inherits="tags, favorite" mousethrough="always">
<xul:hbox class="autocomplete-item-label" align="top" xbl:inherits="tags, favorite" mousethrough="always">
<xul:image xbl:inherits="src"/>
<xul:label flex="1" crop="center" xbl:inherits="value"/>
<xul:vbox flex="1">
<xul:label crop="center" xbl:inherits="value"/>
<xul:label class="autocomplete-item-url" xbl:inherits="value=url" crop="center" mousethrough="always"/>
</xul:vbox>
</xul:hbox>
<xul:label class="autocomplete-item-url" xbl:inherits="value=url" crop="center" mousethrough="always"/>
</content>
</binding>
@ -600,11 +602,13 @@
<binding id="place-item" extends="chrome://browser/content/bindings.xml#place-base">
<content orient="vertical">
<xul:hbox anonid="bookmark-item" class="bookmark-item-label" align="center" flex="1" xbl:inherits="tags" mousethrough="always">
<xul:hbox anonid="bookmark-item" class="bookmark-item-label" align="top" flex="1" xbl:inherits="tags" mousethrough="always">
<xul:image xbl:inherits="src"/>
<xul:label flex="1" crop="center" xbl:inherits="value=title"/>
<xul:vbox flex="1">
<xul:label crop="center" xbl:inherits="value=title"/>
<xul:label anonid="bookmark-url" class="bookmark-item-url" xbl:inherits="value=uri" crop="center" mousethrough="always"/>
</xul:vbox>
</xul:hbox>
<xul:label anonid="bookmark-url" class="bookmark-item-url" xbl:inherits="value=uri" crop="center" mousethrough="always"/>
<xul:hbox anonid="bookmark-manage" class="bookmark-manage" hidden="true" flex="1">
<xul:image xbl:inherits="src"/>

View File

@ -508,6 +508,7 @@ placelist[ui="manage"] placeitem[type="folder"] {
placeitem[type="folder"] > .bookmark-item-label > image,
placeitem[type="folder"] > .bookmark-manage > image {
list-style-image: url(images/folder-32.png);
margin-top: 0;
}
placeitem[type="folder"] .bookmark-item-url {
@ -609,21 +610,22 @@ placeitem > .bookmark-manage > image {
width: 32px;
height: 32px;
max-height: 32px;
margin: 0 16px 0 8px;
/* margin-top = (1 - title's line-height) * title's font-size */
margin: 5px 16px 0 8px;
}
placeitem[src=""] .bookmark-item-label > image {
list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
}
.autocomplete-item-label > label,
.bookmark-item-label > label {
.autocomplete-item-label > vbox > label,
.bookmark-item-label > vbox > label {
-moz-margin-start: 1px;
}
.autocomplete-item-label[favorite="true"] {
padding-right: 30px;
background: url(images/star-24.png) no-repeat 100%;
background: url(images/star-24.png) no-repeat 100% 2px;
}
.autocomplete-item-label:not([tags=""]):after,
@ -640,9 +642,7 @@ placeitem[src=""] .bookmark-item-label > image {
.bookmark-item-url {
color: blue;
font-size: 18px !important;
margin-left: 24px;
margin-right: 24px;
padding-left: 34px;
}
/* special "no results" and "all bookmarks" items */

View File

@ -360,17 +360,22 @@ placelist placeitem:active:not([selected="true"]),
.autocomplete-item-label > image,
.bookmark-item-label > image {
margin: 0mm 2.5mm 0mm 2mm;
/* margin-top = (1 - title's line-height) * title's font-size */
margin: 0.4mm 2.5mm 0mm 2mm;
}
.autocomplete-item-label > label,
.bookmark-item-label > label {
placeitem[type="folder"] > .bookmark-item-label > image {
margin-top: 0;
}
.autocomplete-item-label > vbox > label,
.bookmark-item-label > vbox > label {
-moz-margin-start: 1px;
}
.autocomplete-item-label[favorite="true"] {
padding-right: 30px;
background: url(images/star-24.png) no-repeat 100%;
background: url(images/star-24.png) no-repeat 100% 0.2mm;
}
.autocomplete-item-label:not([tags=""]):after,
@ -389,9 +394,7 @@ placelist placeitem:active:not([selected="true"]),
padding: 0;
color: blue;
font-size: 8pt !important;
margin-right: 2mm;
margin-left: inherit;
padding-left: 4.5mm; /* left padding is equal to left+right margin of the autocomplete-item-label > image */
}
/* special "no results" and "all bookmarks" items */