merge of '4b92bd8e12e3f79e2ba6838787a30729a0b2a4cb'

and '578bc8e9cf723c91e4011bbb0f7b4e1a1c52918a'

Monotone-Parent: 4b92bd8e12e3f79e2ba6838787a30729a0b2a4cb
Monotone-Parent: 578bc8e9cf723c91e4011bbb0f7b4e1a1c52918a
Monotone-Revision: b8785a107526f1e90244fbdab4a759e95b15a5b0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-25T17:04:31
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-01-25 17:04:31 +00:00
3 changed files with 9 additions and 8 deletions

View File

@@ -106,6 +106,7 @@ DIV#descriptionDiv DIV.fakeTextArea
{ background-image: url("abcard.gif");
background-repeat: no-repeat;
background-position: 4px center;
background-color: #CCDDEC;
padding: 2px 2px 2px 24px;
width: 260px; }

View File

@@ -812,7 +812,7 @@ SPAN.toolbarSeparator
padding: 0px; }
A.toolbarButton,
A.toolbarButton:hover,
A.toolbarButton:hover,
A.smallToolbarButton,
A.smallToolbarButton:hover {
display: inline;
@@ -834,7 +834,7 @@ A.smallToolbarButton:hover {
background: transparent url('smalltoolbarbtn_a_bg.png') no-repeat scroll top right;
}
A.toolbarButton SPAN,
A.toolbarButton SPAN,
A.toolbarButton:hover SPAN {
text-align: center;
display: block;
@@ -859,14 +859,14 @@ A.smallToolbarButton:hover SPAN {
background: transparent url('smalltoolbarbtn_span_bg.png') no-repeat;
}
A.toolbarButton:active SPAN {
background-position: bottom left;
background-position: bottom left;
}
A.smallToolbarButton:active SPAN {
background-position: bottom left;
background-position: bottom left;
}
A[class~="_disabled"].toolbarButton,
A[class~="_disabled"].toolbarButton:active
A._disabled.toolbarButton,
A._disabled.toolbarButton:active
{ color: #999; }
P#mailerSelectionContainer

View File

@@ -344,7 +344,7 @@ UL#calendarList
{ margin-top: 2px;
height: 100px; }
A.toolbarButton SPAN,
A.toolbarButton SPAN,
A.toolbarButton:hover SPAN {
height: 50px;
padding: 5px 2px 6px 5px;
@@ -354,7 +354,7 @@ A.smallToolbarButton SPAN, A.smallToolbarButton:hover SPAN
{ height: 33px; }
A.toolbarButton:active SPAN {
background-position: auto; /*broken*/
background-position: auto; /*broken*/
}
A.toolbarButton, A.toolbarButton SPAN, A.button, A.button SPAN
{ color: #535D6D; }