Merge branch 'pull'

This commit is contained in:
friendica 2012-04-04 02:02:50 -07:00
commit 51658826f9
2 changed files with 38 additions and 20 deletions

View file

@ -444,10 +444,10 @@ div.jGrowl div.info {
padding-left: 58px; padding-left: 58px;
} }
#nav-notifications-menu { #nav-notifications-menu {
margin: 30px 0 0 -45px; margin: 30px 0 0 -20px;
width: 300px; width: 275px;
max-height: 400px; max-height: 300px;
overflow: auto; overflow-y: auto;
font-size: 9pt; font-size: 9pt;
} }
#nav-notifications-menu .contactname { #nav-notifications-menu .contactname {
@ -764,10 +764,18 @@ aside #viewcontacts {
#dfrn-request-link { #dfrn-request-link {
background: #3465A4 url(connect.png) no-repeat 95% center; background: #3465A4 url(connect.png) no-repeat 95% center;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
color:#fff; color: #eec;
display: block; display: block;
font-size: 1.2em; font-size: 1.2em;
padding:.2em .5em; padding: 0.2em 0.5em;
}
#wallmessage-link {
/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
/*border-radius: 5px 5px 5px 5px;*/
color: #eee;
display: block;
font-size: 1.2em;
padding: 0.2em 0.5em;
} }
#netsearch-box { #netsearch-box {
margin: 20px 0px 30px; margin: 20px 0px 30px;
@ -1113,6 +1121,7 @@ section {
} }
.shiny { .shiny {
background: #2e3436; background: #2e3436;
border-radius: 5px;
} }
.wall-outside-wrapper .shiny { .wall-outside-wrapper .shiny {
border-radius: 5px; border-radius: 5px;

View file

@ -444,10 +444,10 @@ div.jGrowl div.info {
padding-left: 58px; padding-left: 58px;
} }
#nav-notifications-menu { #nav-notifications-menu {
margin: 30px 0 0 -45px; margin: 30px 0 0 -20px;
width: 300px; width: 275px;
max-height: 400px; max-height: 300px;
overflow: auto; overflow-y: auto;
font-size: 9pt; font-size: 9pt;
} }
#nav-notifications-menu .contactname { #nav-notifications-menu .contactname {
@ -767,7 +767,15 @@ aside #viewcontacts {
color: #fff; color: #fff;
display: block; display: block;
font-size: 1.2em; font-size: 1.2em;
padding:.2em .5em; padding: 0.2em 0.5em;
}
#wallmessage-link {
/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
/*border-radius: 5px 5px 5px 5px;*/
color: #eee;
display: block;
font-size: 1.2em;
padding: 0.2em 0.5em;
} }
#netsearch-box { #netsearch-box {
margin: 20px 0px 30px; margin: 20px 0px 30px;
@ -1113,6 +1121,7 @@ section {
} }
.shiny { .shiny {
background: #efefdf; background: #efefdf;
border-radius: 5px;
} }
.wall-outside-wrapper .shiny { .wall-outside-wrapper .shiny {
border-radius: 5px; border-radius: 5px;