1
1
Fork 0

Merge branch 'pull'

This commit is contained in:
friendica 2012-03-05 15:05:09 -08:00
commit c47bae7a5f

View file

@ -1703,11 +1703,11 @@ div[id$="wrapper"] br {
} }
#settings-nickname-desc { #settings-nickname-desc {
background-color:#DDEFFF; background-color: #def;
-webkit-border-radius:5px; -webkit-border-radius: 5px;
-moz-border-radius:5px; -moz-border-radius: 5px;
border-radius:5px; border-radius: 5px;
padding:5px; padding: 5px;
} }
#register-form div, #register-form div,
@ -2116,7 +2116,7 @@ div[id$="wrapper"] br {
margin: 0 10px 0.2em 0; margin: 0 10px 0.2em 0;
border: 1px #999 solid; border: 1px #999 solid;
padding: 5px; padding: 5px;
background: #f2eedf; background: #def;
vertical-align: middle; vertical-align: middle;
} }
.field input { .field input {
@ -2132,7 +2132,7 @@ div[id$="wrapper"] br {
} }
.field_help { .field_help {
display: block; display: block;
margin-left: 0px; margin-left: 222px;
color: #666; color: #666;
} }
.field .onoff { .field .onoff {
@ -2142,25 +2142,19 @@ div[id$="wrapper"] br {
.field .onoff a { .field .onoff a {
display: block; display: block;
border: 1px solid #666; border: 1px solid #666;
background: url("../../../images/onoff.jpg") no-repeat; padding: 3px 6px 4px 10px;
padding: 4px 2px 2px;
height: 16px; height: 16px;
text-decoration: none; text-decoration: none;
} }
.field .onoff .off {
border-color: #666;
padding-left: 40px;
background: #ccc left center;
color: #666;
text-align:right;
}
.field .onoff .on { .field .onoff .on {
border-color:#204a87; background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def;
padding-right:40px; color: #333;
background-position:right center; text-align: left;
background-color:#3465A4; }
color:#fff; .field .onoff .off {
text-align:left; background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
color: #333;
text-align: right;
} }
.hidden { .hidden {
display:none !important; display:none !important;