Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark more CSS fixes.

* master:
This commit is contained in:
Simon L'nu 2012-04-26 00:20:00 -04:00
commit 6b830bfa97
2 changed files with 16 additions and 5 deletions

View file

@ -540,7 +540,7 @@ header #banner a:active,
header #banner a:visited,
header #banner a:link,
header #banner a:hover {
color: #2e2f2e;
color: #eec;
text-decoration: none;
outline: none;
vertical-align: middle;
@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
}
.notify-seen {
background: none repeat scroll 0 0 #DDDDDD;
background: none repeat scroll 0 0 #666;
}
ul.menu-popup {
@ -966,7 +966,7 @@ aside {
vertical-align: top;
width: 160px;
padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2;
border-right: 1px solid #eec;
float: left;
/* background: #F1F1F1; */
}
@ -1241,7 +1241,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside a{color: #88a9d2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }

View file

@ -1201,8 +1201,19 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
margin-bottom: 15px;
padding-top: 120px;
margin-bottom: 12px;
}
aside #login-submit-button{
margin-left: 0px!important;
}
aside #login-extra-links{
padding-top: 0px!important;
}
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left;