Merge r7065, r7066 from the release 1.2 maintenance branch

This commit is contained in:
jeb228 2011-01-17 14:58:37 +00:00
parent adbdee50ed
commit 940fe03123
4 changed files with 49 additions and 42 deletions

View file

@ -62,40 +62,6 @@ h3.internal-auth{
margin-bottom: 0;
padding-bottom: 0;
}
#error-alert{
color: #900;
padding: 10px;
margin-bottom: 5px;
height: 30px;
}
#error-alert img {
float:left;
margin: 0;
padding: 0;
vertical-align: middle;
}
#error-alert p {
padding-left: 30px;
font-size: 0.9em;
line-height: 30px;
}
#confirmation-alert {
color: #169f43;
padding: 0px;
margin-bottom: 5px;
height: 30px;
}
#confirmation-alert img {
float: left;
margin: 0;
padding: 0;
vertical-align: middle;
}
#confirmation-alert p {
padding-left: 30px;
font-size: 0.9em;
line-height: 30px;
}
.formFieldAlert {
border: 2px solid #900;
}

View file

@ -23,4 +23,47 @@ Miscellaneous
.hidden {
display: none !important;
}
/************************
User feedback
************************/
#error-alert{
color: #900;
padding: 10px;
margin-bottom: 5px;
height: 30px;
}
#error-alert img {
float:left;
margin: 0;
padding: 0;
vertical-align: middle;
}
#error-alert p {
padding-left: 30px;
font-size: 0.9em;
line-height: 30px;
}
#confirmation-alert {
color: #169f43;
padding: 0px;
margin-bottom: 5px;
height: 30px;
}
#confirmation-alert img {
float: left;
margin: 0;
padding: 0;
vertical-align: middle;
}
#confirmation-alert p {
padding-left: 30px;
font-size: 0.9em;
line-height: 30px;
}
#flash-message{
background-color: #7285a0;
padding: 0.5em;
margin-bottom: 10px;
}