Bug 1073497 - Merge autocomplete-search.svg CSS rules. r=unfocused

This commit is contained in:
Dão Gottwald 2014-09-30 12:57:27 +02:00
parent 88ae29cfc2
commit 16c4c6ad95
3 changed files with 12 additions and 36 deletions

View File

@ -1468,14 +1468,16 @@ notification[value="translation"] menulist > .menulist-dropmarker {
}
.ac-result-type-keyword,
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
width: 16px;
height: 16px;
}
.ac-result-type-keyword[selected="true"],
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected),
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted);
}
@ -1505,14 +1507,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
padding: 0 3px;
}
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
}
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
}
.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
color: GrayText;
}

View File

@ -2212,14 +2212,16 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
}
.ac-result-type-keyword,
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
width: 16px;
height: 16px;
}
.ac-result-type-keyword[selected="true"],
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected),
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted);
}
@ -2256,14 +2258,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
-moz-image-region: rect(11px, 16px, 22px, 0);
}
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
}
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
}
@media (min-resolution: 2dppx) {
.ac-result-type-bookmark {
list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");

View File

@ -1394,7 +1394,8 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
}
.ac-result-type-keyword,
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
width: 16px;
height: 16px;
@ -1404,7 +1405,8 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
@media not all and (-moz-windows-default-theme) {
%endif
.ac-result-type-keyword[selected="true"],
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected),
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted);
}
%ifdef WINDOWS_AERO
@ -1463,20 +1465,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
}
%endif
richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
}
%ifdef WINDOWS_AERO
@media not all and (-moz-windows-default-theme) {
%endif
richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
}
%ifdef WINDOWS_AERO
}
%endif
.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
color: GrayText;
}