Bug 685059 - Remove empty placeholder icon in tabs when a page has no favicon. r=dao,ui-r=shorlander.
authorMike Conley <mconley@mozilla.com>
Wed, 24 Apr 2013 16:04:13 -0400
changeset 158082 8bf747097b31911977bbfd6fc8f839456b851b29
parent 158081 fd26cf8fc03ae6f3155a65a1436274cbf808af97
child 158083 d352115aef51b572fa29c87479094e5410e73c55
push idunknown
push userunknown
push dateunknown
reviewersdao, shorlander
bugs685059
milestone23.0a1
Bug 685059 - Remove empty placeholder icon in tabs when a page has no favicon. r=dao,ui-r=shorlander.
browser/base/content/tabbrowser.css
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/tabs.inc.css
browser/themes/windows/browser.css
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -36,16 +36,17 @@ tabpanels {
   background-color: transparent;
 }
 
 .tab-drop-indicator {
   position: relative;
   z-index: 2;
 }
 
+.tab-icon-image:not([src]):not([pinned]),
 .tab-throbber:not([busy]),
 .tab-throbber[busy] + .tab-icon-image {
   display: none;
 }
 
 .closing-tabs-spacer {
   pointer-events: none;
 }
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1607,20 +1607,17 @@ toolbar[iconsize="small"] #bookmarks-men
 }
 
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
 
 .tab-throbber,
 .tab-icon-image {
-  width: 16px;
-  height: 16px;
   -moz-margin-end: 3px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 .tab-throbber {
   list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }
 
 .tab-throbber[progress] {
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2176,21 +2176,23 @@ toolbarbutton.chevron > .toolbarbutton-m
 /* ::::: tabbrowser ::::: */
 
 .tabbrowser-tabbox {
   margin: 0;
 }
 
 %include ../shared/tabs.inc.css
 
+.tab-label {
+  margin: 0;
+}
+
 .tab-throbber,
 .tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-margin-end: 6px;
 }
 
 .tab-throbber {
   list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }
 
 .tab-throbber[progress] {
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -205,8 +205,21 @@
 }
 
 /* New tab button */
 
 .tabs-newtab-button {
   clip-path: url(chrome://browser/content/browser.xul#tab-clip-path-outer);
   width: 66px;
 }
+
+
+/* Tab icons */
+
+.tab-throbber,
+.tab-icon-image {
+  width: 16px;
+  height: 16px;
+}
+
+.tab-icon-image {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1982,23 +1982,16 @@ richlistitem[type~="action"][actiontype=
   color: inherit;
 }
 
 .tabbrowser-tab[selected=true]:-moz-lwtheme {
   /* Copied from :root:-moz-lwtheme-darktext in global.css */
   text-shadow: 0 -0.5px 1.5px white;
 }
 
-.tab-throbber,
-.tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
 .tab-throbber {
   list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }
 
 .tab-throbber[progress] {
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }