Bug 735217 - Status icons styled incorrectly. r=mconley, ui-r=bwinton, a=bienvenu
authorAndreas Nilsson <nisses.mail@home.se>
Wed, 28 Mar 2012 20:32:27 -0400
changeset 11171 71030ae61bce5acaee7cab42eacb4639431aed0e
parent 11170 4665697c1864784d78713afdf88eb5a3997de786
child 11172 cb2ba44f41aa9cc919c1aba28e28d6bbbfd7a3ef
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, bwinton, bienvenu
bugs735217
Bug 735217 - Status icons styled incorrectly. r=mconley, ui-r=bwinton, a=bienvenu
mail/components/im/content/imAccounts.xul
mail/components/im/themes/imAccounts.css
mail/themes/gnomestripe/mail/chat.css
mail/themes/pinstripe/mail/chat.css
mail/themes/qute/mail/chat.css
--- a/mail/components/im/content/imAccounts.xul
+++ b/mail/components/im/content/imAccounts.xul
@@ -35,16 +35,17 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://messenger/content/chat/imAccounts.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/imRichlistbox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/imAccounts.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
 
 <!DOCTYPE window [
  <!ENTITY % accountsDTD SYSTEM "chrome://messenger/locale/imAccounts.dtd">
  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
  <!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/chat.dtd">
  %accountsDTD;
  %brandDTD;
  %chatDTD;
--- a/mail/components/im/themes/imAccounts.css
+++ b/mail/components/im/themes/imAccounts.css
@@ -289,17 +289,17 @@ richlistitem[error="true"] .accountState
 }
 
 #userIcon:hover {
   border-color: rgba(0,0,0,0.35);
   background-color: rgba(0,0,0,0.35);
   opacity: .4;
 }
 
-#statusTypeIcon {
+#statusImageStack #statusTypeIcon {
   margin: 32px 0 0 32px;
   width: 16px;
   height: 16px;
   min-height: 16px;
   min-width: 16px;
   -moz-appearance: none;
   background: transparent;
   box-shadow: none;
@@ -337,45 +337,8 @@ richlistitem[error="true"] .accountState
 #statusTypeIcon[status="invisible"],
 #statusTypeOffline {
   list-style-image: url('chrome://chat/skin/offline-16.png');
 }
 
 #statusTypeIcon[status="idle"] {
   list-style-image: url('chrome://chat/skin/idle-16.png');
 }
-
-%ifdef XP_MACOSX
-#statusMessage {
-  margin: 32px 0 0;
-  min-height: 16px;
-}
-
-#statusMessage[editing] {
-  margin: 29px 2px 0 -4px;
-}
-
-#displayName[editing] {
-  margin-left: -4px;
-}
-%else
-#statusMessage {
-  margin: 32px 0 0;
-}
-
-#statusMessage[editing] {
-%ifdef XP_WIN
-  margin: 30px 0 1px -2px;
-%else
-  margin: 30px -2px -2px -4px;
-%endif
-}
-
-#displayName[editing] {
-%ifdef XP_WIN
-  margin-left: -2px;
-%else
-  margin-left: -4px;
-  margin-right: -2px;
-%endif
-  margin-bottom: 18px;
-}
-%endif
--- a/mail/themes/gnomestripe/mail/chat.css
+++ b/mail/themes/gnomestripe/mail/chat.css
@@ -81,37 +81,58 @@ toolbar[iconsize="small"] #button-join-c
 toolbar[iconsize="small"] #button-join-chat[disabled] {
   list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
-#imStatusAvailable {
+#imStatusAvailable,
+richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #statusTypeIcon[status="idle"],
 .statusTypeIcon[status="idle"] {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #statusTypeIcon[status="offline"],
 #statusTypeIcon[status="invisible"],
 #statusTypeOffline,
 .statusTypeIcon[status="offline"],
 .statusTypeIcon[status="invisible"],
-#imStatusOffline {
+#imStatusOffline,
+richlistitem[state="disconnected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 #statusTypeIcon[status="unavailable"],
 #statusTypeIcon[status="away"],
 #statusTypeUnavailable,
 .statusTypeIcon[status="unavailable"],
 .statusTypeIcon[status="away"] {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 64px 16px 48px);
-}
\ No newline at end of file
+}
+
+#displayNameAndstatusMessageStack #statusMessage {
+  margin: 32px 0 0;
+}
+
+#displayNameAndstatusMessageStack #statusMessage[editing] {
+  margin: 30px -2px -2px -4px;
+}
+
+#displayNameAndstatusMessageStack #displayName[editing] {
+  margin-left: -4px;
+  margin-right: -2px;
+  margin-bottom: 18px;
+}
+
+#setStatusTypeMenupopup .menu-iconic-icon,
+#imAccountsStatus .menu-iconic-icon {
+  visibility: visible;
+}
--- a/mail/themes/pinstripe/mail/chat.css
+++ b/mail/themes/pinstripe/mail/chat.css
@@ -97,42 +97,45 @@ toolbar[iconsize="small"] #button-join-c
   list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
   -moz-image-region: rect(24px 48px 48px 24px);
 }
 
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
-#imStatusAvailable {
+#imStatusAvailable,
+richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #statusTypeIcon[status="idle"],
 .statusTypeIcon[status="idle"] {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #statusTypeIcon[status="offline"],
 #statusTypeIcon[status="invisible"],
 #statusTypeOffline,
 .statusTypeIcon[status="offline"],
 .statusTypeIcon[status="invisible"],
-#imStatusOffline {
+#imStatusOffline,
+richlistitem[state="disconnected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 #statusTypeIcon[status="unavailable"],
 #statusTypeIcon[status="away"],
 #statusTypeUnavailable,
 .statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"] {
+.statusTypeIcon[status="away"],
+#imStatusUnavailable {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 64px 16px 48px);
 }
 
 imconv, imcontact, imgroup {
   padding-left: 4px;
 }
 
@@ -151,8 +154,23 @@ imconv, imcontact, imgroup {
 
 #contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected]:-moz-system-metric(mac-graphite-theme) {
   background-position: 0 -54px;
 }
 
 :-moz-any(imconv, imcontact, imgroup)[selected]:-moz-window-inactive {
   background-position: 0 -72px;
 }
+
+#displayNameAndstatusMessageStack #statusMessage {
+  margin: 32px 0 0;
+  min-height: 16px;
+}
+
+#displayNameAndstatusMessageStack #statusMessage[editing] {
+  margin: 29px 2px 0 -4px;
+}
+
+#displayNameAndstatusMessageStack #displayName[editing] {
+  margin-left: -4px;
+  margin-right: -2px;
+  margin-bottom: 18px;
+}
--- a/mail/themes/qute/mail/chat.css
+++ b/mail/themes/qute/mail/chat.css
@@ -159,37 +159,53 @@ toolbar[iconsize="small"] #button-join-c
 toolbar[iconsize="small"] #button-join-chat[disabled] {
   list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
-#imStatusAvailable {
+#imStatusAvailable,
+richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #statusTypeIcon[status="idle"],
 .statusTypeIcon[status="idle"] {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #statusTypeIcon[status="offline"],
 #statusTypeIcon[status="invisible"],
 #statusTypeOffline,
 .statusTypeIcon[status="offline"],
 .statusTypeIcon[status="invisible"],
-#imStatusOffline {
+#imStatusOffline,
+richlistitem[state="disconnected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 #statusTypeIcon[status="unavailable"],
 #statusTypeIcon[status="away"],
 #statusTypeUnavailable,
 .statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"] {
+.statusTypeIcon[status="away"],
+#imStatusUnavailable {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 64px 16px 48px);
 }
+
+#displayNameAndstatusMessageStack #statusMessage {
+  margin: 32px 0 0;
+}
+
+#displayNameAndstatusMessageStack  #statusMessage[editing] {
+  margin: 30px 0 1px -2px;
+}
+
+#displayNameAndstatusMessageStack #displayName[editing] {
+  margin-left: -2px;
+  margin-bottom: 18px;
+}