Fix regression for bug 512779 - Style pinstripe theme splitters like Thunderbird. r=philipp
authorIlja Sekler <ilja_sekler_@gmx.de>
Mon, 07 Mar 2011 10:14:08 +0100
changeset 7269 9adffca33dd784f622f5d947e3596464b17ef4af
parent 7268 7e520bf6faada339fb24ad79cd9a618696597fff
child 7270 4087c9b318d3bbc59131af15abf9cd315be84161
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs512779
Fix regression for bug 512779 - Style pinstripe theme splitters like Thunderbird. r=philipp
calendar/base/jar.mn
calendar/base/themes/common/calendar-task-tree.css
calendar/base/themes/pinstripe/calendar-task-tree.css
calendar/base/themes/winstripe/calendar-task-tree.css
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -112,17 +112,17 @@ calendar.jar:
     skin/calendar/calendar-timezone-highlighter.css        (themes/common/dialogs/calendar-timezone-highlighter.css)
     skin/calendar/calendar-properties-dialog.css           (themes/common/dialogs/calendar-properties-dialog.css)
     skin/calendar/calendar-subscriptions-dialog.css        (themes/common/dialogs/calendar-subscriptions-dialog.css)
     skin/calendar/calendar-providerUninstall-dialog.css    (themes/common/calendar-providerUninstall-dialog.css)
     skin/calendar/calendar-overlay.png                     (themes/common/images/calendar-overlay.png)
     skin/calendar/category-overlay.png                     (themes/common/images/category-overlay.png)
     skin/calendar/calendar-printing.css                    (themes/common/calendar-printing.css)
     skin/calendar/calendar-status.png                      (themes/common/images/calendar-status.png)
-    skin/calendar/calendar-task-tree.css                   (themes/common/calendar-task-tree.css)
+    skin/calendar/common/calendar-task-tree.css            (themes/common/calendar-task-tree.css)
     skin/calendar/daypicker-background.png                 (themes/common/images/daypicker-background.png)
     skin/calendar/day-box-item-image.png                   (themes/common/images/day-box-item-image.png)
     skin/calendar/event-dialog-keepduration-button.png     (themes/common/images/event-dialog-keepduration-button.png)
     skin/calendar/event-grippy-bottom.png                  (themes/common/images/event-grippy-bottom.png)
     skin/calendar/event-grippy-left.png                    (themes/common/images/event-grippy-left.png)
     skin/calendar/event-grippy-right.png                   (themes/common/images/event-grippy-right.png)
     skin/calendar/event-grippy-top.png                     (themes/common/images/event-grippy-top.png)
     skin/calendar/gradient-overlay.png                     (themes/common/images/gradient-overlay.png)
@@ -140,16 +140,17 @@ calendar.jar:
     skin/calendar/calendar-event-dialog-attendees.png      (themes/@THEME@/dialogs/images/calendar-event-dialog-attendees.png)
     skin/calendar/calendar-event-dialog-toolbar.png        (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar.png)
     skin/calendar/calendar-event-dialog-toolbar-small.png  (themes/@THEME@/dialogs/calendar-event-dialog-toolbar-small.png)
     skin/calendar/calendar-event-dialog.png                (themes/@THEME@/dialogs/images/calendar-event-dialog.png)
     skin/calendar/calendar-invitations-dialog-button-images.png  (themes/@THEME@/dialogs/images/calendar-invitations-dialog-button-images.png)
     skin/calendar/calendar-invitations-dialog-list-images.png  (themes/@THEME@/dialogs/images/calendar-invitations-dialog-list-images.png)
     skin/calendar/calendar-management.css                  (themes/@THEME@/calendar-management.css)
     skin/calendar/calendar-occurrence-prompt.png           (themes/@THEME@/images/calendar-occurrence-prompt.png)
+    skin/calendar/calendar-task-tree.css                   (themes/@THEME@/calendar-task-tree.css)
     skin/calendar/calendar-task-view.css                   (themes/@THEME@/calendar-task-view.css)
     skin/calendar/calendar-unifinder.css                   (themes/@THEME@/calendar-unifinder.css)
     skin/calendar/calendar-views.css                       (themes/@THEME@/calendar-views.css)
     skin/calendar/checkbox-images.png                      (themes/@THEME@/images/checkbox-images.png)
     skin/calendar/ok-cancel.png                            (themes/@THEME@/images/ok-cancel.png)
     skin/calendar/today-pane.css                           (themes/@THEME@/today-pane.css)
     skin/calendar/toolbar-large.png                        (themes/@THEME@/images/toolbar-large.png)
     skin/calendar/toolbar-small.png                        (themes/@THEME@/images/toolbar-small.png)
--- a/calendar/base/themes/common/calendar-task-tree.css
+++ b/calendar/base/themes/common/calendar-task-tree.css
@@ -111,35 +111,16 @@
 .calendar-task-tree > treechildren::-moz-tree-row(completed, selected, focus) {
     background-color: Highlight;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-cell-text(completed, selected, focus) {
     color: HighlightText;
 }
 
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
-.calendar-task-tree-col-completed {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
-    -moz-image-region: rect(0 32px 16px 16px);
-}
-
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, duetoday),
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, overdue),
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, future),
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
-    -moz-image-region: rect(0 16px 16px 0);
-}
-
-.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
-    -moz-image-region: rect(0 48px 16px 32px);
-}
-
 .calendar-task-tree-col-priority {
     list-style-image: url(chrome://calendar/skin/task-images.png);
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, mediumpriority),
 .todo-due-image-class {
     list-style-image: url(chrome://calendar/skin/task-images.png);
new file mode 100644
--- /dev/null
+++ b/calendar/base/themes/pinstripe/calendar-task-tree.css
@@ -0,0 +1,59 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Sun Microsystems code.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Michael Buettner <michael.buettner@sun.com>
+ *   Lars Wohlfahrt <thetux.moz@googlemail.com>
+ *   Philipp Kewisch <mozilla@kewis.ch>
+ *   Simon Paquet <bugzilla@babylonsounds.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * 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 ***** */
+
+@import url(chrome://calendar/skin/common/calendar-task-tree.css);
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
+.calendar-task-tree-col-completed {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 32px 16px 16px);
+}
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, duetoday),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, overdue),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, future),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 16px 16px 0);
+}
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 48px 16px 32px);
+}
new file mode 100644
--- /dev/null
+++ b/calendar/base/themes/winstripe/calendar-task-tree.css
@@ -0,0 +1,59 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Sun Microsystems code.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Michael Buettner <michael.buettner@sun.com>
+ *   Lars Wohlfahrt <thetux.moz@googlemail.com>
+ *   Philipp Kewisch <mozilla@kewis.ch>
+ *   Simon Paquet <bugzilla@babylonsounds.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * 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 ***** */
+
+@import url(chrome://calendar/skin/common/calendar-task-tree.css);
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
+.calendar-task-tree-col-completed {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 26px 13px 13px);
+}
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, duetoday),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, overdue),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, future),
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 13px 13px 0);
+}
+
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 39px 13px 26px);
+}