Commit 16e28262 authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge "Theme update from master"

parents 1e96bb88 37d0896f
......@@ -523,6 +523,11 @@ div.sideblock ul ul {
#sb-loginbox input.password {
width: 240px;
}
#sb-loginbox #login_login_container,
#sb-loginbox #login_login_extra_container {
border: 0;
background: #000000;
}
/* Side Profile */
#sb-profile #user-profileicon {
......
......@@ -560,6 +560,16 @@ div.sideblock .sidebar-content a {
#sb-loginbox label {
color: #1A428F;
}
#sb-loginbox #login_login_container {
border: 0;
margin-top: 0;
background: #e5e6f1;
}
#sb-loginbox #login_login_extra_container {
border: 0;
margin-top: 5px;
background: #e5e6f1;
}
/* Side Profile */
#sb-profile {
background: url(../images/sidebar-yellow-bottom.png) no-repeat bottom left;
......
......@@ -749,10 +749,16 @@ form#uploadcsv {
/* warnings for the admin screen */
.admin-warning-box {
border: 1px solid #e98a88;
background: #fbeceb;
margin-bottom: 5px;
padding: 5px;
margin-bottom: 15px;
padding: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
color: #333333;
}
.admin-warning-box ul {
margin-bottom: 0;
}
.admin-warning-box h3 {
......
......@@ -468,6 +468,7 @@ fieldset {
margin: 5px 0;
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
}
* html fieldset {
width: 90%;
......@@ -1215,7 +1216,10 @@ div.rel {
padding-top: 5px;
}
div.ok, div.error {
padding: 2px 5px 2px 25px;
padding: 2px 5px 2px 30px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
/* upload file message */
.message.info,
......@@ -1231,11 +1235,11 @@ div.info img {
/* different message types */
#messages .ok, div.ok {
color: #547c22;
background: #e7f1c3 url(../images/success.gif) no-repeat 5px 3px;
background: #e7f1c3 url(../images/success.gif) no-repeat 7px 1px;
}
#messages .error, div.error {
color: #dd0221;
background: #ffd3d9 url(../images/failure.gif) no-repeat 5px 3px;
background: #ffeded url(../images/failure.gif) no-repeat 7px 1px;
}
#editaccess div.error {
color: #474220;
......@@ -1342,6 +1346,42 @@ div.sideblock ul li {
#sb-loginbox .login-externallink {
margin-top: 3px;
}
#loginform_container #login_login_container {
border: 1px solid #d6d6d6;
background: #f4f4f4;
padding: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
margin-top: 10px;
}
#loginform_container {
width: 256px;
}
#sb-loginbox #loginform_container {
width: 100%;
}
#loginform_container #login_login_container #login-helplinks {
height: 24px;
}
#loginform_container #login_login_extra_container {
border: 1px solid #d6d6d6;
background: #f4f4f4;
padding: 10px 10px 15px 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
margin-top: 10px;
}
#loginform_container #login_login_extra_container label {
display: block;
margin-bottom: 5px;
}
#loginform_container #login_login_extra_container .login-externallink {
display: inline;
margin-right: 5px;
font-size: 1.091em;
}
/* Side Profile */
#user-profileicon {
float: right;
......
......@@ -439,6 +439,13 @@ div.sideblock ul ul {
color: #e8c1ea;
}
/* Side Login */
#sb-loginbox #login_login_container,
#sb-loginbox #login_login_extra_container {
border: 0;
background: #000000;
}
/* Side Quota Bar */
#quota_used {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment