Bug 482253 Fix Activity Manager's themes so that text can be read when window is not focused, and make it easier for themes to be applied across all activity types. r=philor

mail/components/activity/content/activity.xml

@@ -58,7 +58,7 @@
   <binding id="activity-group"
            extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
     <resources>
-      <stylesheet src="chrome://messenger/skin/activity.css"/>
+      <stylesheet src="chrome://messenger/skin/activity/activity.css"/>
     </resources>
     <implementation>
       <constructor>
@@ -145,7 +145,7 @@
 
   <binding id="activity-base" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
     <resources>
-      <stylesheet src="chrome://messenger/skin/activity.css"/>
+      <stylesheet src="chrome://messenger/skin/activity/activity.css"/>
     </resources>
     <implementation implements="nsIActivityListener">
       <constructor>
@@ -573,7 +573,7 @@
         </getter>
       </property>
     </implementation>
-    <content>
+    <content class="activityitem">
       <xul:hbox flex="1" class="activityContentBox">
         <xul:vbox pack="center" class="processIconBox">
           <xul:image anonid="image" xbl:inherits="class=iconclass"/>
@@ -700,7 +700,7 @@
         </body>
       </method>
     </implementation>
-    <content>
+    <content class="activityitem">
       <xul:hbox flex="1">
         <xul:vbox pack="center" class="eventIconBox">
           <xul:image anonid="image" xbl:inherits="class=iconclass"/>
@@ -809,7 +809,7 @@
         </body>
       </method>
     </implementation>
-    <content>
+    <content class="activityitem">
       <xul:hbox flex="1">
         <xul:vbox pack="center" class="warningIconBox">
           <xul:image anonid="image"/>

mail/themes/gnomestripe/mail/activity/activity.css

@@ -56,10 +56,6 @@
   list-style-image: url(moz-icon://stock/gtk-clear?size=button&state=disabled);
 }
 
-activity-event:not([selected="true"]):nth-child(odd) {
-  background-color: -moz-oddtreerow;
-}
-
 /**
  * Images for buttons in the interface
  */
@@ -210,9 +206,6 @@ activity-process {
   min-height: 40px !important;
 }
 
-activity-event[selected="true"] {
-}
-
 activity-process .statusText {
   font-size: smaller;
   color: #555;
@@ -289,49 +282,32 @@ image.compactMail {
   -moz-padding-end: 2px;
 }
 
+.activityitem:not([selected="true"]):nth-child(odd) {
+  background-color: -moz-oddtreerow;
+}
+
 /* these are copied from richlistbox.css, to give us a starting point on selection */
 
-activity-process, activity-warning, activity-event {
+.activityitem {
   padding: 2px 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
 
-activity-event[selected="true"],activity-warning[selected="true"],activity-process[selected="true"]{
+.activityitem[selected="true"] {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
 }
 
-richlistbox.activitygroupbox:focus activity-process[selected="true"]{
-  background-color: Highlight;
-  color: Highlight;
-}
-
-richlistbox:focus activity-event[selected="true"],activity-warning[selected="true"]{
-  background-color: Highlight;
-  color: Highlight;
-}
-
+richlistbox:focus .activityitem[selected="true"],
 richlistbox:focus activity-group[selected="true"] {
   background-color: Highlight;
-}
-
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .statusText,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .dateTime,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .displayText {
   color: HighlightText;
 }
 
-richlistbox:focus activity-event[selected="true"] .completionTime,
-richlistbox:focus activity-event[selected="true"] .displayText,
-richlistbox:focus activity-event[selected="true"] .dateTime,
-richlistbox:focus activity-event[selected="true"] .statusText {
-  color: HighlightText;
-}
-
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .displayText,
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .statusText {
+richlistbox:focus .activityitem[selected="true"] .statusText,
+richlistbox:focus .activityitem[selected="true"] .dateTime,
+richlistbox:focus .activityitem[selected="true"] .displayText,
+richlistbox:focus .activityitem[selected="true"] .completionTime {
   color: HighlightText;
 }

mail/themes/pinstripe/mail/activity/activity.css

@@ -78,10 +78,6 @@
   background: url(chrome://global/skin/icons/white-gray-gradient-active.gif);
 }
 
-activity-event:not([selected="true"]):nth-child(odd) {
-  background-color: -moz-oddtreerow;
-}
-
 /**
  * Images for buttons in the interface
  */
@@ -232,9 +228,6 @@ activity-process {
   min-height: 40px !important;
 }
 
-activity-event[selected="true"] {
-}
-
 activity-process .statusText {
   font-size: smaller;
   color: #555;
@@ -312,52 +305,33 @@ image.compactMail {
   -moz-padding-end: 2px;
 }
 
+.activityitem:not([selected="true"]):nth-child(odd) {
+  background-color: -moz-oddtreerow;
+}
 
 /* these are copied from richlistbox.css, to give us a starting point on selection */
 
-activity-process, activity-warning, activity-event {
+.activityitem {
   padding: 2px 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
 
-activity-event[selected="true"],activity-warning[selected="true"],activity-process[selected="true"]{
+
+.activityitem[selected="true"] {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
 }
 
-richlistbox.activitygroupbox:focus activity-process[selected="true"]{
+richlistbox:focus .activityitem[selected="true"],
+richlistbox:focus .activity-group[selected="true"] {
   background-color: Highlight;
-  color: Highlight;
-}
-
-richlistbox:focus activity-event[selected="true"],activity-warning[selected="true"]{
-  background-color: Highlight;
-  color: Highlight;
-}
-
-richlistbox:focus activity-group[selected="true"] {
-  background-color: Highlight;
-}
-
-
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .statusText,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .dateTime,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .displayText {
   color: HighlightText;
 }
 
-richlistbox:focus activity-event[selected="true"] .completionTime,
-richlistbox:focus activity-event[selected="true"] .displayText,
-richlistbox:focus activity-event[selected="true"] .dateTime,
-richlistbox:focus activity-event[selected="true"] .statusText {
+richlistbox:focus .activityitem[selected="true"] .statusText,
+richlistbox:focus .activityitem[selected="true"] .dateTime,
+richlistbox:focus .activityitem[selected="true"] .displayText,
+richlistbox:focus .activityitem[selected="true"] .completionTime {
   color: HighlightText;
 }
-
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .displayText,
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .statusText {
-  color: HighlightText;
-}
-

mail/themes/qute/mail/activity/activity.css

@@ -55,10 +55,6 @@
   margin-top: 3px;
 }
 
-activity-event:not([selected="true"]):nth-child(odd) {
-  background-color: -moz-oddtreerow;
-}
-
 /**
  * Images for buttons in the interface
  */
@@ -209,9 +205,6 @@ activity-process {
   min-height: 40px !important;
 }
 
-activity-event[selected="true"] {
-}
-
 activity-process .statusText {
   font-size: smaller;
   color: #555;
@@ -289,52 +282,32 @@ image.compactMail {
   -moz-padding-end: 2px;
 }
 
+.activityitem:not([selected="true"]):nth-child(odd) {
+  background-color: -moz-oddtreerow;
+}
 
 /* these are copied from richlistbox.css, to give us a starting point on selection */
 
-activity-process, activity-warning, activity-event {
+.activityitem {
   padding: 2px 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
 
-activity-event[selected="true"],activity-warning[selected="true"],activity-process[selected="true"]{
+.activityitem[selected="true"] {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
 }
 
-richlistbox.activitygroupbox:focus activity-process[selected="true"]{
-  background-color: Highlight;
-  color: Highlight;
-}
-
-richlistbox:focus activity-event[selected="true"],activity-warning[selected="true"]{
-  background-color: Highlight;
-  color: Highlight;
-}
-
+richlistbox:focus .activityitem[selected="true"],
 richlistbox:focus activity-group[selected="true"] {
   background-color: Highlight;
-}
-
-
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .statusText,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .dateTime,
-richlistbox.activitygroupbox:focus activity-process[selected="true"] .displayText {
   color: HighlightText;
 }
 
-richlistbox:focus activity-event[selected="true"] .completionTime,
-richlistbox:focus activity-event[selected="true"] .displayText,
-richlistbox:focus activity-event[selected="true"] .dateTime,
-richlistbox:focus activity-event[selected="true"] .statusText {
+richlistbox:focus .activityitem[selected="true"] .statusText,
+richlistbox:focus .activityitem[selected="true"] .dateTime,
+richlistbox:focus .activityitem[selected="true"] .displayText,
+richlistbox:focus .activityitem[selected="true"] .completionTime {
   color: HighlightText;
 }
-
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .displayText,
-richlistbox:focus activity-warning[selected="true"] .dateTime,
-richlistbox:focus activity-warning[selected="true"] .statusText {
-  color: HighlightText;
-}
-