Merge remote-tracking branch 'origin/master'

This commit is contained in:
tommy tomson 2012-05-11 02:40:09 +02:00
commit b2bd25a470
3 changed files with 12 additions and 9 deletions

View File

@ -831,7 +831,7 @@ ul.menu-popup .empty {
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
}
.acpopupitem {
color: #2e2f2e;
color: #eec;
padding: 4px;
clear: left;
}

View File

@ -3,10 +3,7 @@
* Additional Changes: Michael Vogel <icarus@dabo.de>
**/
/* ========= */
/* = Admin = */
/* ========= */
/** Fancy Box **/
#fancybox-content {
width: 0;
height: 0;
@ -19,6 +16,11 @@
background: #2e2e2f !important;
}
/* ========= */
/* = Admin = */
/* ========= */
#adminpage {
/* width: 80%;*/
}
@ -633,7 +635,7 @@ header #banner #logo-text {
text-decoration: none;
}
.mail-list-wrapper {
background-color: #eec;
background-color: #333;
margin-bottom: 5px;
width: 100%;
height: auto;
@ -644,6 +646,7 @@ header #banner #logo-text {
float: left;
width: 20%;
overflow: hidden;
background: #2e2e2f;
}
.mail-list-wrapper .mail-subject {
width: 30%;
@ -915,7 +918,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 {
@ -1685,7 +1688,7 @@ body .pageheader{
.wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px;
height: 4em;
color: #2e302e;
color: #eec;
border: 1px solid #2e302e;
}
.comment-edit-preview {

View File

@ -3171,7 +3171,7 @@ ul.menu-popup {
#recip {
}
.autocomplete-w1 { background:url(img/shadow.png) no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }
.autocomplete .selected { background:#F0F0F0; }
.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }