Bug 797700 - Restrict height/width of ambient notification icons to 16x16. r=mixedpuppy
authorJared Wein <jwein@mozilla.com>
Fri, 05 Oct 2012 13:06:39 -0700
changeset 109444 8d24b8e3c07821844cdeb4d62f214e4c7e849874
parent 109443 51d572ef4e0e987cbf9af02b96e5734ea66ed732
child 109445 0263db40256b862acbf41d451009073fd550bf78
push id23630
push useremorley@mozilla.com
push dateSat, 06 Oct 2012 19:35:27 +0000
treeherdermozilla-central@9f677c2bb33d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmixedpuppy
bugs797700
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 797700 - Restrict height/width of ambient notification icons to 16x16. r=mixedpuppy
browser/base/content/browser-social.js
browser/themes/gnomestripe/browser.css
browser/themes/pinstripe/browser.css
browser/themes/winstripe/browser.css
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -649,16 +649,17 @@ var SocialToolbar = {
         }, false);
         box.setAttribute("notificationFrameId", notificationFrameId);
         stack = document.createElement("stack");
         stack.setAttribute("id", stackId);
         stack.classList.add("social-notification-icon-stack");
         stack.classList.add("toolbarbutton-icon");
         image = document.createElement("image");
         image.setAttribute("id", imageId);
+        image.classList.add("social-notification-icon-image");
         image = stack.appendChild(image);
         label = document.createElement("label");
         label.setAttribute("id", labelId);
         label.classList.add("social-notification-icon-label");
         let hbox = document.createElement("hbox");
         hbox.classList.add("social-notification-icon-hbox");
         hbox.setAttribute("align", "start");
         hbox.setAttribute("pack", "end");
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -2632,19 +2632,20 @@ html|*#gcli-output-frame {
 #social-provider-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 .social-notification-icon-stack {
   padding: 0;
 }
 
-.social-notification-icon-stack > image {
+.social-notification-icon-image {
   margin: 5px 3px;
-  max-height: 16px;
+  width: 16px;
+  height: 16px;
 }
 
 .social-notification-icon-hbox {
   padding: 0;
 }
 
 .social-notification-icon-label {
   background-color: rgb(240,61,37);
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -4045,20 +4045,16 @@ html|*#gcli-output-frame {
 #social-provider-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 .social-notification-icon-stack {
   padding: 0;
 }
 
-.social-notification-icon-stack > image {
-  max-height: 16px;
-}
-
 .social-notification-icon-hbox {
   padding: 0;
 }
 .social-notification-icon-label {
   text-align: end;
   font-size: 9px;
   font-weight: bold;
   padding: 0 1px;
@@ -4076,20 +4072,19 @@ html|*#gcli-output-frame {
 }
 
 @media (-moz-mac-lion-theme) {
   .social-notification-icon-stack > image:-moz-window-inactive {
     opacity: .5;
   }
 }
 
-@media (min-resolution: 2dppx) {
-  .social-notification-icon-image {
-    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
-  }
+.social-notification-icon-image {
+  width: 16px;
+  height: 16px;
 }
 
 /* === end of social toolbar button === */
 
 /* === social toolbar provider menu  === */
 
 #social-statusarea-user {
   cursor: default;
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -3324,24 +3324,19 @@ html|*#gcli-output-frame {
   border-radius: 2px;
   box-shadow: 0 1px 0 rgba(0,39,121,0.77);
 }
 
 .social-notification-icon-label[value=""] {
   display: none;
 }
 
-/* notification image */
 .social-notification-icon-image {
-  padding: 2px;
-  margin: 0;
-  min-width: 20px;
-  max-width: 32px;
-  max-height: 20px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  width: 16px;
+  height: 16px;
 }
 
 /* social toolbar provider menu */
 #social-statusarea-popup {
   margin-top: 0;
   margin-left: -12px;
   margin-right: -12px;
 }