diff --git a/mozilla/calendar/base/content/calendar-ui-utils.js b/mozilla/calendar/base/content/calendar-ui-utils.js index e9ad679d5c1..32a2fd282f3 100644 --- a/mozilla/calendar/base/content/calendar-ui-utils.js +++ b/mozilla/calendar/base/content/calendar-ui-utils.js @@ -343,9 +343,9 @@ function addMenuItem(aParent, aLabel, aValue, aCommand) { * @param aParent the parent node. * @param aAttribute the name of the attribute to be set. * @param aValue the value of the attribute. - * @param aFilterAttribute The name of an attribute that the child nodes used - * to filter the childnodes. - * @param aFilterValue The value of the filterattribute. If set only those + * @param aFilterAttribute OPTIONAL The name of an attribute that the child nodes carry + * and that is used to filter the childnodes. + * @param aFilterValue OPTIONAL The value of the filterattribute. If set only those * childnodes are modified that have an attribute * 'aFilterAttribute' with the given value * 'aFilterValue' set. diff --git a/mozilla/calendar/base/content/calendar-view-core.xml b/mozilla/calendar/base/content/calendar-view-core.xml index e0224c1e8b7..edd1e7fe2bd 100644 --- a/mozilla/calendar/base/content/calendar-view-core.xml +++ b/mozilla/calendar/base/content/calendar-view-core.xml @@ -51,7 +51,6 @@ - - - @@ -438,13 +435,4 @@ - - - - - - - - - diff --git a/mozilla/calendar/base/themes/pinstripe/calendar-views.css b/mozilla/calendar/base/themes/pinstripe/calendar-views.css index 19ec3b6b305..d43ff216f5c 100644 --- a/mozilla/calendar/base/themes/pinstripe/calendar-views.css +++ b/mozilla/calendar/base/themes/pinstripe/calendar-views.css @@ -1,144 +1,147 @@ /* ***** 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 Calendar view code. -* -* The Initial Developer of the Original Code is -* Oracle Corporation -* Portions created by the Initial Developer are Copyright (C) 2005 -* the Initial Developer. All Rights Reserved. -* -* Contributor(s): -* Vladimir Vukicevic -* Joey Minta -* Michiel van Leeuwen -* Philipp Kewisch -* Markus Adrario -* Simon Paquet -* Berend Cornelius -* -* 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 ***** */ + * 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 Calendar view code. + * + * The Initial Developer of the Original Code is + * Oracle Corporation + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Vladimir Vukicevic + * Joey Minta + * Michiel van Leeuwen + * Philipp Kewisch + * Markus Adrario + * Simon Paquet + * Berend Cornelius + * Christian Jansen + * + * 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 ***** */ /* Core */ calendar-category-box:not([categories]) { - display: none; + display: none; } /* Multiday view */ calendar-event-column { - background-color: #FFFFFF; + background-color: #FFFFFF; } calendar-event-column[orient="horizontal"] { - border-top: 1px solid #3F7D91; + border-top: 1px solid #D2D2D2; } + calendar-event-column[orient="vertical"] { - border-left: 1px solid #3F7D91; + border-left: 1px solid #D2D2D2; } calendar-header-container { background-color: #FFFFFF; - border-left: 1px solid #3F7D91; + border-left: 1px solid #D2D2D2; } calendar-header-container[weekend="true"], .calendar-event-column-linebox[weekend="true"], .calendar-event-column-linebox[off-time="true"] { - background-color: #f4f4f4; + background-color: #F0F0F0; } calendar-header-container[relation="today"], -.calendar-event-column-linebox[relation="today"] { +.calendar-event-column-linebox[relation="today"], +calendar-day-label[relation="today"] { background-color: #dfeaf4; } calendar-header-container[selected="true"], .calendar-event-column-linebox[selected="true"] { - background-color: #ffe79c; + background-color: #FFF0C0; } calendar-header-container[weekend="true"][relation="today"], .calendar-event-column-linebox[weekend="true"][relation="today"], .calendar-event-column-linebox[off-time="true"][relation="today"] { - background-color: #d6dfe9; + background-color: #D4DEE8; } calendar-header-container[orient="horizontal"] { - border-bottom: 1px solid #3F7D91; + border-bottom: 1px solid #D2D2D2; + min-width: 100px; } calendar-header-container[weekend="true"][selected="true"], .calendar-event-column-linebox[weekend="true"][selected="true"], .calendar-event-column-linebox[off-time="true"][selected="true"] { - background-color: #f5dd92; + background-color: #F2E4B6; +} + +.calendar-event-column-linebox[orient="vertical"] { + border-bottom: 1px solid #D2D2D2; } .calendar-event-column-linebox[orient="horizontal"] { - border-right: 1px solid #3F7D91; -} -.calendar-event-column-linebox[orient="vertical"] { - border-bottom: 1px solid #3F7D91; -} - -/* Make sure the box for day-labels appears to end before the scrollbar. */ -.calendar-label-day-box[orient="horizontal"] { - border-right: 1px solid #3F7D91; -} -.calendar-label-day-box[orient="vertical"] { - border-bottom: 1px solid #3F7D91; + border-right: 1px solid #D2D2D2; } /* Make sure we extend the bold line separating scrollable and non-scrollable -areas over the timebar. */ + areas over the timebar. */ .calendar-header-time-spacer[orient="horizontal"] { - border-bottom: 2px solid #3F7D91; + border-bottom: 2px solid #D2D2D2; } + .calendar-header-time-spacer[orient="vertical"] { - border-right: 2px solid #3F7D91; + border-right: 2px solid #D2D2D2; } .calendar-header-day-box[orient="horizontal"] { - border-right: 1px solid #3F7D91; - border-top: 1px solid #3F7D91; - border-bottom: 2px solid #3F7D91; + border-right: 1px solid #D2D2D2; + border-top: 1px solid #D2D2D2; + border-bottom: 2px solid #D2D2D2; overflow-x: hidden; overflow-y: auto; max-height: 120px; } + +/* Make sure the box for day-labels appears to end before the scrollbar. */ +.calendar-label-day-box[orient="horizontal"] { + border-right: 1px solid #D2D2D2; +} +.calendar-label-day-box[orient="vertical"] { + border-bottom: 1px solid #D2D2D2; +} + .calendar-header-day-box[orient="vertical"] { - border-top: 1px solid #3F7D91; - border-right: 2px solid #3F7D91; + border-top: 1px solid #D2D2D2; + border-right: 2px solid #D2D2D2; } /* Make sure to have a border between the edge of the views and the scrollbar. */ -.calendar-day-box[orient="horizontal"] { - border-right: 1px solid #3F7D91; -} - -.calendar-day-box[orient="vertical"] { - border-bottom: 1px solid #3F7D91; +.calendar-day-box { + border-right: 1px solid transparent; } .fgdragbox { @@ -148,7 +151,8 @@ areas over the timebar. */ .fgdragbox[dragging="true"] { display: -moz-box; - background-color: blue; + background-color: grey; + border: 5px #ffffff; opacity: 0.5; } @@ -159,15 +163,16 @@ areas over the timebar. */ .fgdragcontainer[dragging="true"] { display: -moz-box; - /* This is a workaround for a stack bug and display: hidden in underlying - * elements -- the display: hidden bits get misrendered as being on top. - * Setting an opacity here forces a view to be created for this element, too. - */ + /* This is a workaround for a stack bug and display: hidden in underlying + * elements -- the display: hidden bits get misrendered as being on top. + * Setting an opacity here forces a view to be created for this element, too. + */ opacity: 0.9999; } .fgdragbox-label { font-weight: bold; + text-align: center; overflow: hidden; } @@ -195,6 +200,19 @@ areas over the timebar. */ color: inherit; } +calendar-event-box { + border-left: 1px solid transparent; + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid #D0D0D0; +} + +calendar-event-box[selected="true"] { + border-left: 1px solid transparent; + border-top: 1px solid white; + border-right: 1px solid transparent; + border-bottom: 1px solid #727272; +} calendar-event-box[selected="true"] .calendar-event-selection { color: #000000 !important; @@ -204,32 +222,28 @@ calendar-event-box[selected="true"] .calendar-event-selection { calendar-event-gripbar { -moz-box-align: center; -moz-box-pack: center; - min-height: 4px; - min-width: 4px; } calendar-event-gripbar[parentorient="vertical"] { - -moz-box-align: center; - -moz-box-pack: center; cursor: n-resize; } calendar-event-gripbar[parentorient="horizontal"] { - -moz-box-align: center; - -moz-box-pack: center; cursor: e-resize; } /* headers horizontal, times vertical */ box[anonid="labelbox"][orient="horizontal"] { - height: 30px; + height: 10px; } + box[anonid="headerbox"][orient="horizontal"] { min-height: 50px; } + box[anonid="labelbox"][orient="horizontal"] > box[anonid="labeltimespacer"], box[anonid="headertimespacer"][orient="horizontal"], -calendar-time-bar[anonid="timebar"][orient="vertical"] { +calendar-time-bar[orient="vertical"] { width: 10ex; /* space for "11:00 AM" */ } @@ -237,46 +251,52 @@ calendar-time-bar[anonid="timebar"][orient="vertical"] { box[anonid="labelbox"][orient="vertical"] { width: 30px; } + box[anonid="headerbox"][orient="vertical"] { - width: 120px; + width: 40px; } + box[anonid="labelbox"][orient="vertical"] > box[anonid="labeltimespacer"], box[anonid="headertimespacer"][orient="vertical"], -calendar-time-bar[anonid="timebar"][orient="horizontal"] { +calendar-time-bar[orient="horizontal"] { height: 40px; } .calendar-time-bar-label { - font-weight: bold; - margin: 2px; /* override