Fix Bug 765600 - Node cannot be inserted at the specified point in attendees dialog. r=philipp,a=philipp
authorRichard Marti <richard.marti@gmail.com>
Mon, 18 Jun 2012 17:59:14 +0200
changeset 11902 47897e195a21e43d29b0142f55f7e64ded1fc78f
parent 11899 cd7e03be21f62291f0418b79d458740dcd44f16c
child 11905 d2da6023f092929a4ab1bb5e3ff9dea8b4277955
push id564
push usermozilla@kewis.ch
push dateThu, 21 Jun 2012 14:54:37 +0000
treeherdercomm-beta@47897e195a21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp, philipp
bugs765600
Fix Bug 765600 - Node cannot be inserted at the specified point in attendees dialog. r=philipp,a=philipp
calendar/base/jar.mn
calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -171,16 +171,17 @@ calendar.jar:
 
 # Following files only add for OSX.
 #ifdef XP_MACOSX
     skin/calendar/sidebar-item.png                         (themes/@THEME@/images/sidebar-item.png)
 #endif
 
 # The following files are added for aero support on windows.
 #ifdef XP_WIN
+% style chrome://global/content/customizeToolbar.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
 % style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
 % style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
 % skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-classic/ os=WINNT osversion<6
 % skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-aero/ os=WINNT osversion>=6
     skin/calendar/win-classic/calendar.css                 (themes/@THEME@/win-classic/calendar.css)
     skin/calendar/win-classic/calendar-event-dialog.css    (themes/@THEME@/win-classic/calendar-event-dialog.css)
     skin/calendar/win-classic/lightning.css                (themes/@THEME@/win-classic/lightning.css)
--- a/calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
@@ -1,14 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://calendar-windows/skin/calendar-event-dialog.css);
-
 /*--------------------------------------------------------------------
  *   Event dialog keep duration button
  *-------------------------------------------------------------------*/
 
 #keepduration-button {
     min-width: 21px;
 }