Checking in fixes to bug 199449.
git-svn-id: svn://10.0.0.236/trunk@144214 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
5c6c1dc66b
commit
acd98afaea
@ -70,15 +70,10 @@
|
||||
|
||||
<vbox id="multiweek-view-box" flex="1">
|
||||
|
||||
<!-- Month View: Controls-->
|
||||
<hbox id="multiweek-content-box">
|
||||
|
||||
|
||||
<vbox id="multiweek-content-box">
|
||||
|
||||
<!-- Near Future View: Calendar Grid -->
|
||||
|
||||
<box id="multiweek-grid-box" flex="1" debug="false">
|
||||
<grid id="multiweek-grid" flex="1">
|
||||
<box id="multiweek-grid-box" flex="1">
|
||||
<grid id="multiweek-grid" flex="1">
|
||||
<columns>
|
||||
<column id="multiweek-view-leftcol" class="multiweek-leftcol-class"/>
|
||||
<column id="multiweek-view-column-1" class="month-column-class" flex="1"/>
|
||||
@ -92,28 +87,28 @@
|
||||
|
||||
<rows >
|
||||
<row id="multiweek-week-header-row">
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-left-class">
|
||||
<label id="multiweek-title" />
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-1"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-2"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-3"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-4"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-5"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-6"/>
|
||||
</vbox>
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-class">
|
||||
<label class="month-view-header-days" id="multiweek-view-header-day-7"/>
|
||||
</vbox>
|
||||
</row>
|
||||
@ -336,8 +331,9 @@
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</box> <!-- End: Multiweek grid box -->
|
||||
<vbox class="multiweek-rightcol-class">
|
||||
<vbox class="month-column-center-day-class">
|
||||
<vbox class="multiweek-header-left-class">
|
||||
<label value=" " />
|
||||
</vbox>
|
||||
<vbox class="multiweek-previous-button-box">
|
||||
@ -356,8 +352,7 @@
|
||||
<image id="multiweek-next-button" class="updownbuttons" onclick="gCalendarWindow.goToNext()"/>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</box> <!-- End: Multiweek grid box -->
|
||||
|
||||
</vbox> <!-- End: Multiweek content box -->
|
||||
</hbox> <!-- End: Multiweek content box -->
|
||||
</vbox>
|
||||
</overlay>
|
||||
|
||||
@ -109,7 +109,7 @@ calendar.jar:
|
||||
skin/classic/calendar/dot_selected.png (skin/classic/dot_selected.png)
|
||||
skin/classic/calendar/eventDialog.css (skin/classic/eventDialog.css)
|
||||
skin/classic/calendar/overlay.css (skin/classic/overlay.css)
|
||||
skin/classic/calendar/pageupdown.gif (skin/classic/pageupdown.gif)
|
||||
skin/classic/calendar/pageupdown.png (skin/classic/pageupdown.png)
|
||||
skin/classic/calendar/prevnextarrow.png (skin/classic/prevnextarrow.png)
|
||||
skin/classic/calendar/selectAddresses.css (skin/classic/selectAddresses.css)
|
||||
skin/classic/calendar/synch_animated.gif (skin/classic/synch_animated.gif)
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
* Karl Guertin <grayrest@grayrest.com>
|
||||
* Colin Phillips <colinp@oeone.com>
|
||||
* ArentJan Banck <ajbanck@planet.nl>
|
||||
* Eric Belhaire <belhaire@ief.u-psud.fr>
|
||||
* Mark Swaffer <swaff@fudo.org>
|
||||
* Eric Belhaire <belhaire@ief.u-psud.fr>
|
||||
* Mark Swaffer <swaff@fudo.org>
|
||||
*
|
||||
* 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
|
||||
@ -63,7 +63,7 @@
|
||||
*-------------------------------------------------------------------*/
|
||||
|
||||
.toolbarbutton-1 {
|
||||
list-style-image: url("chrome://calendar/skin/btn1.gif");
|
||||
list-style-image: url("chrome://calendar/skin/btn1.png");
|
||||
}
|
||||
|
||||
|
||||
@ -288,9 +288,25 @@
|
||||
*****************************
|
||||
*/
|
||||
#multiweek-grid{
|
||||
border-right: 1px solid #3f7d91;
|
||||
border: 1px solid #3f7d91;
|
||||
}
|
||||
|
||||
#multiweek-grid-box{
|
||||
border: 1px solid #3f7d91;
|
||||
padding: 2px;
|
||||
margin: 10px 2px 15px 10px;
|
||||
background-color: #E7EEEC;
|
||||
background-position: 50% 50%;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
|
||||
/*Right column*/
|
||||
.multiweek-rightcol-class{
|
||||
margin: 10px 2px 15px 2px;
|
||||
}
|
||||
|
||||
|
||||
#multiweek-view-box{
|
||||
-moz-box-align: center;
|
||||
-moz-box-pack: center;
|
||||
@ -307,15 +323,28 @@
|
||||
padding:0px;
|
||||
}
|
||||
|
||||
.multiweek-header-class{
|
||||
border-left: 1px solid #3f7d91;
|
||||
-moz-box-align: center;
|
||||
font-size: 1.3em;
|
||||
font-family: Arial, Helvetica;
|
||||
color: #3f7d91;
|
||||
background-color: #FFFFFF;
|
||||
font-weight:bold;
|
||||
}
|
||||
.multiweek-header-left-class{
|
||||
-moz-box-align: center;
|
||||
font-size: 1.3em;
|
||||
font-family: Arial, Helvetica;
|
||||
color: #3f7d91;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.multiweek-leftcol-box-class{
|
||||
display : -moz-stack;
|
||||
background-color : #E7EEEC;
|
||||
}
|
||||
|
||||
/*Right column*/
|
||||
.multiweek-rightcol-class{
|
||||
background-color : #E7EEEC;
|
||||
}
|
||||
/*Previous/Next Buttons*/
|
||||
.updownbuttons{
|
||||
list-style-image: url("chrome://calendar/skin/pageupdown.gif");
|
||||
@ -1293,6 +1322,12 @@ treechildren:-moz-tree-cell-text(selected) {
|
||||
list-style-image : url( "chrome://calendar/skin/synch_animated.gif" );
|
||||
}
|
||||
|
||||
listitem[selected="true"] > .calendar-list-item-class
|
||||
{
|
||||
background-color : White;
|
||||
color : Black;
|
||||
}
|
||||
|
||||
.todo-due-image-class
|
||||
{
|
||||
list-style-image : url( "chrome://calendar/skin/unifinder/priority_header.png" )
|
||||
|
||||
BIN
mozilla/calendar/resources/skin/classic/pageupdown.png
Normal file
BIN
mozilla/calendar/resources/skin/classic/pageupdown.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
@ -23,8 +23,8 @@
|
||||
* Karl Guertin <grayrest@grayrest.com>
|
||||
* Colin Phillips <colinp@oeone.com>
|
||||
* ArentJan Banck <ajbanck@planet.nl>
|
||||
* Mark Swaffer <swaff@fudo.org>
|
||||
* Eric Belhaire <belhaire@ief.u-psud.fr>
|
||||
* Mark Swaffer <swaff@fudo.org>
|
||||
* Eric Belhaire <belhaire@ief.u-psud.fr>
|
||||
*
|
||||
* 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
|
||||
@ -68,7 +68,7 @@
|
||||
*-------------------------------------------------------------------*/
|
||||
|
||||
.toolbarbutton-1 {
|
||||
list-style-image: url("chrome://calendar/skin/btn1.gif");
|
||||
list-style-image: url("chrome://calendar/skin/btn1.png");
|
||||
}
|
||||
|
||||
|
||||
@ -295,7 +295,22 @@
|
||||
*****************************
|
||||
*/
|
||||
#multiweek-grid{
|
||||
border-right: 1px solid #3f7d91;
|
||||
border: 1px solid #3f7d91;
|
||||
}
|
||||
|
||||
#multiweek-grid-box{
|
||||
border: 1px solid #3f7d91;
|
||||
padding: 2px;
|
||||
margin: 10px 2px 15px 10px;
|
||||
background-color: #E7EEEC;
|
||||
background-position: 50% 50%;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
|
||||
/*Right column*/
|
||||
.multiweek-rightcol-class{
|
||||
margin: 10px 2px 15px 2px;
|
||||
}
|
||||
|
||||
#multiweek-view-box{
|
||||
@ -314,14 +329,28 @@
|
||||
padding:0px;
|
||||
}
|
||||
|
||||
.multiweek-header-class{
|
||||
border-left: 1px solid #3f7d91;
|
||||
-moz-box-align: center;
|
||||
font-size: 1.3em;
|
||||
font-family: Arial, Helvetica;
|
||||
color: #3f7d91;
|
||||
background-color: #FFFFFF;
|
||||
font-weight:bold;
|
||||
}
|
||||
.multiweek-header-left-class{
|
||||
-moz-box-align: center;
|
||||
font-size: 1.3em;
|
||||
font-family: Arial, Helvetica;
|
||||
color: #3f7d91;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.multiweek-leftcol-box-class{
|
||||
display : -moz-stack;
|
||||
background-color : #E7EEEC;
|
||||
}
|
||||
/*Right column*/
|
||||
.multiweek-rightcol-class{
|
||||
background-color : #E7EEEC;
|
||||
}
|
||||
|
||||
/*Previous/Next Buttons*/
|
||||
.updownbuttons{
|
||||
list-style-image: url("chrome://calendar/skin/pageupdown.gif");
|
||||
@ -1312,6 +1341,12 @@ treechildren:-moz-tree-cell-text(selected) {
|
||||
list-style-image : url( "chrome://calendar/skin/synch_animated.gif" );
|
||||
}
|
||||
|
||||
listitem[selected="true"] > .calendar-list-item-class
|
||||
{
|
||||
background-color : White;
|
||||
color : Black;
|
||||
}
|
||||
|
||||
.todo-due-image-class
|
||||
{
|
||||
list-style-image : url( "chrome://calendar/skin/unifinder/priority_header.png" )
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user