Fix bug 512779 - Style pinstripe theme splitters like Thunderbird. r=Decathlon
authorPhilipp Kewisch <mozilla@kewis.ch>
Sat, 05 Mar 2011 11:08:20 +0100
changeset 7255 59e01ab2fabd62200dffba5fed9604ab31815ad5
parent 7254 18feac9335869622054679f23a48c0bff92bf586
child 7256 21d32ea89dbfb901a59fa4a2f9d4707043d87b75
push idunknown
push userunknown
push dateunknown
reviewersDecathlon
bugs512779
Fix bug 512779 - Style pinstripe theme splitters like Thunderbird. r=Decathlon
calendar/base/content/calendar-task-view.xul
calendar/base/content/calendar-unifinder.xul
calendar/base/content/today-pane.xul
calendar/base/jar.mn
calendar/base/themes/common/calendar-task-tree.css
calendar/base/themes/common/images/task-images.png
calendar/base/themes/common/images/unifinder-images.png
calendar/base/themes/pinstripe/calendar-management.css
calendar/base/themes/pinstripe/calendar-unifinder.css
calendar/base/themes/pinstripe/images/checkbox-images.png
calendar/base/themes/pinstripe/images/sidebar-item.png
calendar/base/themes/pinstripe/today-pane.css
calendar/base/themes/winstripe/calendar-management.css
calendar/base/themes/winstripe/images/checkbox-images.png
calendar/lightning/content/messenger-overlay-sidebar.xul
calendar/lightning/themes/pinstripe/lightning.css
--- a/calendar/base/content/calendar-task-view.xul
+++ b/calendar/base/content/calendar-task-view.xul
@@ -72,17 +72,17 @@
                  onblur="taskEdit.onBlur(event)"
                  onkeypress="taskEdit.onKeyPress(event)"/>
       </hbox>
       <vbox flex="1">
         <calendar-task-tree id="calendar-task-tree" flex="1"
                             visible-columns="completed priority title startdate duedate"
                             persist="visible-columns ordinals widths sort-active sort-direction height"
                             context="taskitem-context-menu"/>
-        <splitter id="calendar-task-view-splitter" collapse="none" persist="state"/>
+        <splitter id="calendar-task-view-splitter" collapse="none" persist="state" class="calendar-splitter"/>
         <vbox id="calendar-task-details-container" class="main-header-area" flex="1" context="task-actions-toolbar-context-menu">
           <hbox id="calendar-task-details">
             <grid id="calendar-task-details-grid" flex="1">
               <columns id="calendar-task-details-columns">
                 <column id="calendar-header-name-column"/>
                 <column id="calendar-header-value-column"/>
               </columns>
               <rows id="calendar-task-details-rows">
--- a/calendar/base/content/calendar-unifinder.xul
+++ b/calendar/base/content/calendar-unifinder.xul
@@ -159,13 +159,13 @@
                       onfocus="focusFirstItemIfNoSelection( );"/>
       </tree>
     </vbox>
     <splitter id="calendar-view-splitter"
               insertbefore="calendar-nav-control"
               resizebefore="closest"
               resizeafter="farthest"
               persist="state"
-              class="chromeclass-extrachrome sidebar-splitter"
+              class="chromeclass-extrachrome sidebar-splitter calendar-splitter"
               orient="vertical"
               onmouseup="setTimeout(refreshEventTree, 10);"/>
   </vbox>
 </overlay>
--- a/calendar/base/content/today-pane.xul
+++ b/calendar/base/content/today-pane.xul
@@ -184,27 +184,27 @@
                                    onchange="TodayPane.setDaywithjsDate(this.value);
                                              document.getElementById('miniday-month-panel').hidePopup();"/>
                       </panel>
                    </toolbarbutton>
                  </hbox>
                 </stack>
               </modebox>
             <vbox flex="1">
-              <toolbar id="agenda-toolbar" iconsize="small">
+              <hbox id="agenda-toolbar" iconsize="small">
                 <toolbarbutton id="todaypane-new-event-button"
                                mode="mail"
                                iconsize="small"
                                orient="horizontal"
                                label="&calendar.newevent.button.label;"
                                tooltiptext="&calendar.newevent.button.tooltip;"
                                oncommand="agendaListbox.createNewEvent(event)">
                   <observes element="calendar_new_event_command" attribute="disabled"/>
                 </toolbarbutton>
-             </toolbar>
+             </hbox>
              <menupopup id="agenda-menu" onpopupshowing="if (event.target == event.currentTarget) { agendaListbox.buildAgendaPopupMenu(this) }"/>
              <vbox id="agenda-menu-box" hidden="true">
                <menuitem label="&calendar.context.modifyorviewitem.label;"
                          accesskey="&calendar.context.modifyorviewitem.accesskey;"
                          observes="agenda_edit_event_command"/>
                <menu id="agenda-context-menu-convert-menu"
                      label="&calendar.context.convertmenu.label;"
                      accesskey="&calendar.context.convertmenu.accesskey.calendar;">
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -122,17 +122,17 @@ calendar.jar:
     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)
     skin/calendar/mini-day-background.png                  (themes/common/images/mini-day-background.png)
-    skin/calendar/unifinder-images.png                     (themes/common/images/unifinder-images.png)
+    skin/calendar/task-images.png                          (themes/common/images/task-images.png)
     skin/calendar/timezone_map.png                         (themes/common/images/timezone_map.png)
     skin/calendar/timezones.png                            (themes/common/images/timezones.png)
     skin/calendar/widgets/minimonth.css                    (themes/common/widgets/minimonth.css)
     skin/calendar/widgets/nav-buttons.png                  (themes/common/widgets/images/nav-buttons.png)
     skin/calendar/widgets/view-navigation.png              (themes/common/widgets/images/view-navigation.png)
     skin/calendar/cal-icon32.png                           (themes/@THEME@/images/cal-icon32.png)
     skin/calendar/calendar-alarm-dialog.css                (themes/@THEME@/dialogs/calendar-alarm-dialog.css)
     skin/calendar/calendar-daypicker.css                   (themes/@THEME@/calendar-daypicker.css)
@@ -143,13 +143,17 @@ calendar.jar:
     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-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)
     skin/calendar/widgets/calendar-widgets.css             (themes/@THEME@/widgets/calendar-widgets.css)
+#ifdef XP_MACOSX
+    skin/calendar/sidebar-item.png                         (themes/@THEME@/images/sidebar-item.png)
+#endif
--- a/calendar/base/themes/common/calendar-task-tree.css
+++ b/calendar/base/themes/common/calendar-task-tree.css
@@ -113,57 +113,57 @@
 }
 
 .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/unifinder-images.png);
-    -moz-image-region: rect(0 26px 13px 13px);
+    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/unifinder-images.png);
-    -moz-image-region: rect(0 13px 13px 0);
+    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/unifinder-images.png);
-    -moz-image-region: rect(0 39px 13px 26px);
+    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/unifinder-images.png);
-    -moz-image-region: rect(0 65px 13px 52px);
+    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/unifinder-images.png);
-    -moz-image-region: rect(0 65px 13px 52px);
+    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, highpriority),
 .todo-due-image-class[highpriority="true"] {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
-    -moz-image-region: rect(0 104px 13px 91px);
+    list-style-image: url(chrome://calendar/skin/task-images.png);
+    -moz-image-region: rect(0 52px 13px 39px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, lowpriority),
 .todo-due-image-class[lowpriority="true"] {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
-    -moz-image-region: rect(0 78px 13px 65px);
+    list-style-image: url(chrome://calendar/skin/task-images.png);
+    -moz-image-region: rect(0 26px 13px 13px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, selected, highpriority) {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
-    -moz-image-region: rect(0 117px 13px 104px);
+    list-style-image: url(chrome://calendar/skin/task-images.png);
+    -moz-image-region: rect(0 65px 13px 52px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, selected, lowpriority) {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
-    -moz-image-region: rect(0 91px 13px 78px);
+    list-style-image: url(chrome://calendar/skin/task-images.png);
+    -moz-image-region: rect(0 39px 13px 26px);
 }
rename from calendar/base/themes/common/images/unifinder-images.png
rename to calendar/base/themes/common/images/task-images.png
index 5804cd1ca36c4641b9ca9b5d401303039c6cf206..ddf4188c1f78a702584a22c8e9a55c817c42b2d4
GIT binary patch
literal 297
zc$@(#0oMMBP)<h;3K|Lk000e1NJLTq002P%000dL1^@s6_H6@F0002+Nkl<ZNDb|l
zF%rTs3<ND23O+!~{~txm2PmjaoMdMrMF$C0hQ!TTw$7H%^2k<eEqiY#C4iZ2R~@_l
z5}V|tA|L>$go@+m+f!~7eJA!h4g!Fag+6rI19Yyb2+m^%#vwv?$%hC^gsx&(dj(+Y
zZ>H5pA6o&J1vYR>0Uhhegia1A!X~qT`&*X<u+l7OlcqjPtvoIjA}fur`$cX#MwOMT
zZ=8YJ%Hw(=+J5Q!X(sSL0LP#u!~;iL5Mw~m&T0G)z}zd2A~@*gQxV7j&@qI;!9n2`
vhdDSH=jS#V0M0$K5!MHtk9-c!>(7lh*R)8!Ii;V<00000NkvXXu0mjf%#?R~
--- a/calendar/base/themes/pinstripe/calendar-management.css
+++ b/calendar/base/themes/pinstripe/calendar-management.css
@@ -30,26 +30,26 @@
  * 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 ***** */
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
-    -moz-image-region: rect(0 13px 13px 0);
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+    -moz-image-region: rect(0 16px 16px 0);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol, checked) {
-    -moz-image-region: rect(0 26px 13px 13px);
+    -moz-image-region: rect(0 32px 16px 16px);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol, disabled) {
-    -moz-image-region: rect(0 39px 13px 26px);
+    -moz-image-region: rect(0 48px 16px 32px);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-cell(color-treecol, color-default) {
     background-color: #a8c2e1;
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-cell(checkbox-treecol) {
     padding: 0;
@@ -87,8 +87,33 @@ calendar-list-tree > tree {
 calendar-list-tree > tree > treecols > treecol[hideheader="true"],
 calendar-list-tree > tree > treecols > treecol[hideheader="true"] {
   font-size: 0px;
   border: none;
   padding: 0;
   max-height: 0px;
   height: 0px;
 }
+
+calendar-list-tree treechildren::-moz-tree-row(selected) {
+  background: url(chrome://calendar/skin/sidebar-item.png) 0 0 repeat-x #90A0C0;
+}
+
+calendar-list-tree treechildren::-moz-tree-row(selected, focus) {
+  background-position: 0 -18px;
+}
+
+calendar-list-tree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected) {
+  background-position: 0 -36px;
+}
+
+calendar-list-tree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected, focus) {
+  background-position: 0 -54px;
+}
+
+calendar-list-tree treechildren:-moz-window-inactive::-moz-tree-row(selected) {
+  background-position: 0 -72px;
+}
+
+calendar-list-tree treechildren::-moz-tree-cell-text(selected, focus),
+calendar-list-tree treechildren::-moz-tree-cell-text(selected) {
+  color: HighlightText;
+}
--- a/calendar/base/themes/pinstripe/calendar-unifinder.css
+++ b/calendar/base/themes/pinstripe/calendar-unifinder.css
@@ -71,36 +71,32 @@
     border: 0;
     -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
     -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
     border-bottom: 1px solid;
     border-top: 1px solid;
     margin: 0;
 }
 
-/* restyle splitter-border to match Thunderbird's layout */
-#calendar-view-splitter {
-    border: none;
-    min-height: 5px;
-}
-
 /* added for new id ..... search box ..... */
 #unifinder-searchBox {
+    background: -moz-linear-gradient(top, #eaeaea, #d1d1d1);
+    border-bottom: 1px solid #bebebe;
     border-top: 1px solid ThreeDHighlight;
     height: 30px;
-    background-color: transparent;
 }
 
 .unifinder-closebutton {
-    list-style-image: url("chrome://global/skin/icons/closetab.png");
+    list-style-image: url("chrome://global/skin/icons/close.png");
+    -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .unifinder-closebutton:hover {
-    list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+    -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .unifinder-closebutton:hover:active {
-    list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+    -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .unifinder-closebutton > .toolbarbutton-text {
     display: none;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c41e2f872768a6e3314ad96220856e8f38492a0f
GIT binary patch
literal 1514
zc$@+11r_><P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000HCNkl<ZSPA7<
z+fSTT5dZD&w^w0dS#B**t`b^fpf+6$R=Xic+9EOZ!8FDPMVt8OKj2H_n-BU-Bu#@g
zP1*<Bv^B<-P-z=kZ9>Xb8>lthx)fM0%PxESoH_J-eti4U=nF5N<m|c3{ASL~nVIt~
zR8_@Z_KO!U4s~~Tlgho-EA`#GcTer>>(lfr*uyq8HFf>+<;www!?A~2|4}tNJFAY5
zkHcoOX`7k@!r|~u^3KVHg#{528i#ITu~<-AT8fsIme)&4N``bK%*;PK`~9tno^W`L
z6j))=6KSqe|KY|J%uGMUmtTA~YanBJdHHiX;JMAsO(SW?+U<6uyuAFAf`WoxJ%RAu
zgzw!A&k-;^JuM&y4<6K@ngj0Nzkjl(rUo4y9biMv8Vea48w2tF($&?qgXzkx@t(T6
zQgps^1a_N+WB}|2Hk|wT=om&Hq)}Dfg1=(^Eb()5bLaB%@=#k_3#-+dMdyu7CWFPr
zMG)^dMhDPd?~Cx{9E^^Rf_Xe1k0xK!w6d~-y1F_jiXuXU!^EuD*ViKwiD&}kWMF0u
zMHR(ZiKnp~+wM#86s=QOSdHS_?=E384V*dqF+xvcWfCXHcsvfj-!F{k3oz^K80KMK
zV|x)kolawDXggpjdXY#ZG`JQ4GB25#n=uMx5#d{qyqXl6TuoT;X*`Js12>UOY~hur
zBdDmX5-fKIe#T6A5v`{>VfPi|R&qNO^>}tR>tOlPcuA*nDZ)seL7&5thxhpGBO@b7
zrBbM@tVB^!kswb@On_6Psi_HGuNRc=5=K$_yz$Mm0PYzzBM!oc(RZftA(%I-+3ncK
zSdh1`0(S=bajEYDBGDM;$nYPpUqgOjF&diRKrEwT&0)`i^X;-OVe4~8NZl%7r13nO
zrHI_4)WGEABnAfu#Z9lRtzme07`eH*;OI5tHA}d-Y;A1`2IK9^)AE6m$t0LJtGVp>
zZDkAI(wC8Y=qQGN9m0jHHxOBVhUxVLy52vHiKvQ=6os!l`xTHEkR{i!!Ixlm0TRze
zy1Kd=j~_o4(XhV0E+hm30Wli!ngg6pr^tCWp1o;w0(*`d(_Ai>nD6*;+u@+<?^dh`
zo_ZJaQ@>;QZogn@ek+Konpz~%D&izYab-JzLs%dBX8QRIyuVutNIZu+7d;MrZd}_6
z3k$W&)#J4k;9F&aokE$t$)oJNmU}#!JHP?IQ-Pmucfa3<_dfU#xef*UsA!$&=tQC0
zi6V~!#V!S}zLf0%mdnoN&gYPGIr5&|XI^8|<Jp#D$BqdWu2+qXjRI?i*Ceq~EQF0_
zrP7-$g+0$*=A>B)oc6j<>~SHVZdXw(D1NOGOKoqXroI8?B?VMlfE4Aj(`v&}uhV#b
zp<5bhynV?mqi{C|=<#J`WoT$<5Z^8G*)zjy4&Y+JPl+^68ZDLc$c|y2)zww~wwO0t
zSK+4j-|w{v2UsaoPoL=mrxpb+(qw#!QXrkQ;E<Y)=ckG53mfsG#yt9GO!AuH4<A09
zCC`Z09Ke;6jpqWg+ab7saB(5tuiDz$q;4^KW*&wjd7eN~PCXP=0X+z?krUEnScY?#
zxYEfqB7Z)DZRR1ZwnJ13Sz1~Ok=}sM=aXBeBY&?DZx)UB_}u>$uQ?zX44%Jz`}Rlt
zeC*aJG|zLYw70j1j6A{M@t*$vehd!%v|VnE4A0jTj-l4p)-fabz<~o}Po6vp%+Jpo
zNjugQg`tXyit9TzX+ikVzr^!5f_8q3%!`eUjpOvOaGX4>Qm#KDnI$xO^@^yV+@TK%
zA4N(vjbH0&jE_d6`{^su!?nV!(cu^K^YcOfBd!_gu~@8`@Ff(YD}>*EyL3#1&E+N4
zsHarX|Im@dl%Bgc=^6Jio^0AM(&_SYXg{A)GE6<1lan*bJemWHfd9+-Z?2_PoUE1J
Q)&Kwi07*qoM6N<$f;F!16951J
copy from mail/themes/pinstripe/mail/icons/sidebar-item.png
copy to calendar/base/themes/pinstripe/images/sidebar-item.png
--- a/calendar/base/themes/pinstripe/today-pane.css
+++ b/calendar/base/themes/pinstripe/today-pane.css
@@ -46,17 +46,16 @@
 
 #buttonspacer {
   width: 5px;
 }
 
 #today-pane-panel {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
-  border-left: 1px solid ThreeDShadow;
 }
 
 #today-pane-panel:-moz-lwtheme {
   background-color: transparent;
   border-top: 1px solid ThreeDShadow;
 }
 
 #agenda-panel:-moz-lwtheme > vbox,
@@ -167,34 +166,37 @@
   display: none;
 }
 
 #miniday-dropdown-button > .toolbarbutton-menu-dropmarker {
     -moz-padding-start: 0;
 }
 
 .today-closebutton {
-  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
+  list-style-image: url("chrome://global/skin/icons/close-sidebar.png") !important;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .today-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png") !important;
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .today-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .today-closebutton > .toolbarbutton-text {
    display: none;
 }
 
 #agenda-toolbar {
   border: none;
   padding: 1px;
+  background-color: -moz-dialog;
+  color: -moz-dialogtext;
 }
 
 #todaypane-new-event-button {
   -moz-user-focus: normal;
 }
 
 #todaypane-new-event-button > .toolbarbutton-text {
  -moz-padding-start: 5px;
--- a/calendar/base/themes/winstripe/calendar-management.css
+++ b/calendar/base/themes/winstripe/calendar-management.css
@@ -30,17 +30,17 @@
  * 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 ***** */
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
-    list-style-image: url(chrome://calendar/skin/unifinder-images.png);
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol, checked) {
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol, disabled) {
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..630db33c120a6d9a50a5400f11a98c8ec37b391c
GIT binary patch
literal 658
zc$@)}0&V??P)<h;3K|Lk000e1NJLTq001-q000dL0ssI2X>Z!u00076Nkl<ZI1$a2
zy>1#o5XbKe?m%$z9hD(CNQwOj6tuBjAkonv6ih>%<OO&W1a;g%ktj5zNFq6}5X+!o
z8Y4m^1Lo6^|K7j`gMGe8E;15(v%_!yGqbw~;>Qo4gr~FpgO^VyCMeL_KX_rUc>d$U
zIcA!My;`^X8-Npx73cA2_Hy*CLrhVa=A-5Wlb|APnTQDcER8a)W`CbR1VKDI`#v5|
z5G71}%<Qpl_t#`Hfd(+vr7Sz@bsL*br-eeHTrTJH`B*GQS$UN-eQ3NFYc%RNH$zbn
zJsuAhva+1)Fff<PCCk#)RU3XF5WrY07HhRyI-QP2qg=$wx)2uFQy}~a2fMLAn2fN|
za0E=#G{l=fo1@X#uj__siV|DQ&H}pjMsl(&Pp7kFGI@IX{`PiODwQggN<1D<rBXhh
z4+=c1B*_x`z{nolK|O4`j@28DPN#$TW%F_{82J7EXQ7a)s)R8`m!eQZsFrtjr%g)_
z7!0LUtJUk?_17=o5{X1Mn?+@mk7r$<KIGG}>bl<V_3HJD;cx^$6bj*d_!3r}ylR?9
z;jlufShm5;2+QSixN5b}wZo%VnapcrXJ-SWth9uW+iHY`!{Jt|)$jMPXQ)h5)pfOh
zxN~%HhGCqXWPG~+_~>wVH^|d-hrMX4u0-5D)*HKQxImV_1PODy-N9h6-ENx!Q^QMe
z7h}cU+bd7T9ggkoJ%9J+Est+FON{p0s*?fMPXon>=a|>)jYJ|8+`w3Iv)K%9k+pou
s@CSnY1#^ha=X1W?#&Lp)|MP$AAD+>*O$<%%EdT%j07*qoM6N<$f>RbeLjV8(
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -559,31 +559,35 @@
                 <calendar-list-tree id="calendar-list-tree-widget"
                                     class="task-tree-subpane"
                                     flex="1"/>
               </modevbox>
           </modevbox>
           </vbox>
         </vbox>
 
-        <splitter id="calsidebar_splitter" collapse="before" persist="state"/>
+        <splitter id="calsidebar_splitter"
+                  collapse="before"
+                  persist="state"
+                  class="calendar-sidebar-splitter"/>
 
         <deck id="calendarDisplayDeck" flex="1">
           <!-- vbox "calendar-view-box will be overlayed..." -->
           <vbox id="calendar-view-box"/>
         </deck>
       </hbox>
     </vbox>
   </tabpanels>
 
   <hbox id="tabmail-container">
     <splitter id="today-splitter"
               collapse="after"
               resizebefore="closest"
               state="collapsed"
+              class="calendar-sidebar-splitter"
               oncommand="TodayPane.storeWidthAndState();">
       <grippy/>
     </splitter>
     <modevbox id="today-pane-panel" />
   </hbox>
 
   <statusbar id="status-bar">
     <statusbarpanel id="calendar-show-todaypane-panel"
--- a/calendar/lightning/themes/pinstripe/lightning.css
+++ b/calendar/lightning/themes/pinstripe/lightning.css
@@ -175,8 +175,53 @@ radio[pane=paneLightning] {
 
 #calendar-status-todaypane-button[checked="true"] > .toolbarbutton-icon-end {
   list-style-image: url(chrome://global/skin/icons/expand.png);
 }  
 
 #calMinimonthBox {
     margin-top: 3px;
 }
+
+.calendar-splitter {
+  height: 8px !important;
+  min-height: 8px;
+  background-image: url("chrome://messenger/skin/icons/vertical-threadpane-splitter-bg.gif");
+  background-repeat: repeat-y;
+  -moz-border-start: 1px solid #A6A6A6;
+  -moz-border-end: 1px solid #8C8C8C;
+}
+
+.calendar-splitter:-moz-locale-dir(rtl) {
+  background-image: url("chrome://messenger/skin/icons/vertical-threadpane-splitter-bg-rtl.gif");
+}
+
+/* The orient="vertical" isn't which direction the splitter itself runs, it's
+   actually which way its parent lays out its children, so when it's vertical,
+   the splitter is a horizontal bar. */
+.calendar-splitter[orient="vertical"] {
+  background-image: url("chrome://messenger/skin/icons/threadpane-splitter-bg.gif");
+  background-repeat: repeat-x;
+  border-top: 1px solid #A6A6A6;
+  border-bottom: 1px solid #8C8C8C;
+  -moz-border-start-width: 0;
+  -moz-border-end-width: 0;
+}
+
+.calendar-splitter[state="collapsed"] {
+  border-bottom-width: 0;
+  -moz-border-end: 0;
+}
+
+.calendar-sidebar-splitter {
+  background-image: none;
+  min-width: 3px;
+  width: 3px;
+}
+
+#today-splitter {
+  border-left: 1px solid #8B8B8B;
+}
+
+#ltnSidebar {
+  border-right: 1px solid #8B8B8B;
+  -moz-margin-end: -3px !important;
+}