keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #95 from simonlnu/master

Browse source 
styling fixes in dispy; typos fixed in settings.tpl
This commit is contained in:
Simon 2012-03-06 13:20:20 -08:00
commit 073241a77a
2 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/settings.tpl
View file

@ -60,9 +60,9 @@ $suggestme
{{inc field_input.tpl with $field=$expire.days }}{{endinc}} {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
<div class="field input"> <div class="field input">
<span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
<div style="display: none;"> <div style="display: none;">
<div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;"> <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
<h3>$expire.advanced</h3> <h3>$expire.advanced</h3>
{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}

71
view/theme/dispy/style.css
View file

@ -177,14 +177,14 @@ input[type=submit] {
padding: 1em; padding: 1em;
} }
.pager { .pager {
padding-top: 30px; margin-top: 60px;
display: block; display: block;
clear: both; clear: both;
text-align: center; text-align: center;
} }
.pager span { .pager span {
padding: 4px; padding: 4px;
margin:4px; margin: 4px;
} }
.pager_current { .pager_current {
background-color: #729fcf; background-color: #729fcf;
@ -618,20 +618,28 @@ aside {
} }
.vcard .fn { .vcard .fn {
font-size: 1.7em; font-size: 1.7em;
font-weight: 700; font-weight: bold;
border-bottom: 1px solid #729fcf; border-bottom: 1px solid #729fcf;
padding-top: 1px; padding-top: 3px;
} }
.vcard #profile-photo-wrapper { .vcard #profile-photo-wrapper {
margin: 10px 0px; margin: 20px;
}
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0;
} }
aside h4 { aside h4 {
font-size: 1.2em; font-size: 1.2em;
} }
aside #viewcontacts { aside #viewcontacts {
text-align: right; text-align: right;
} }
.aprofile dt {
box-shadow: 1px 1px 5px 0;
color: #666666;
margin: 15px 0 5px;
padding-left: 5px;
}
#profile-extra-links ul { #profile-extra-links ul {
margin-left: 0px; margin-left: 0px;
padding-left: 0px; padding-left: 0px;
@ -750,34 +758,27 @@ aside #viewcontacts {
} }
#jot #jot-title { #jot #jot-title {
border: 0px; border: 0px;
margin: 0px; margin: 0 0 5px;
height: 20px; height: 20px;
width: 100%; width: 90%;
font-weight: bold; font-weight: bold;
border: 1px solid #ffffff;
border-radius: 5px; border-radius: 5px;
} vertical-align: middle;
#jot #jot-title:-webkit-input-placeholder { padding: 5px 1px;
font-weight: normal;
}
#jot #jot-title:-moz-placeholder {
font-weight: normal;
}
#jot #jot-title:placeholder {
font-weight: normal;
} }
#jot #jot-title:hover, #jot #jot-title:hover,
#jot #jot-title:focus { #jot #jot-title:focus {
border: 1px solid #999999; border: 1px solid #999;
border-radius: 5px; border-radius: 5px;
} }
#jot #character-counter { #jot #character-counter {
width: 80px; width: 40px;
float: right; float: right;
text-align: right; text-align: right;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
padding-right: 20px; padding: 5px;
margin: 0 0 5px;
} }
#profile-jot-text_tbl { #profile-jot-text_tbl {
margin-bottom: 10px; margin-bottom: 10px;
@ -796,10 +797,6 @@ aside #viewcontacts {
float: left; float: left;
margin-left: 10px; margin-left: 10px;
} }
#character-counter {
float:right;
padding:8px 10px;
}
#profile-rotator-wrapper { #profile-rotator-wrapper {
float: right; float: right;
} }
@ -1556,10 +1553,11 @@ div[id$="wrapper"] br {
.view-contact-wrapper, .view-contact-wrapper,
.contact-entry-wrapper { .contact-entry-wrapper {
float: left; float: left;
margin-right: 20px; margin-right: 5px;
margin-bottom: 20px; margin-bottom: 40px;
width: 120px; width: 120px;
/*height: 120px;*/ height: 120px;
padding: 3px;
position: relative; position: relative;
} }
.contact-direction-wrapper { .contact-direction-wrapper {
@ -1703,13 +1701,15 @@ div[id$="wrapper"] br {
} }
#settings-nickname-desc { #settings-nickname-desc {
background-color: #def; background-color: #eee;
-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;
} }
#settings-default-perms {
margin-bottom: 20px;
}
#register-form div, #register-form div,
#profile-edit-form div { #profile-edit-form div {
clear: both; clear: both;
@ -2112,17 +2112,16 @@ div[id$="wrapper"] br {
display: block; display: block;
font-size: 1.077em; font-size: 1.077em;
/*font-weight: bold;*/ /*font-weight: bold;*/
margin-bottom: 0.2em; margin: 0 10px 0.5em 0;
margin: 0 10px 0.2em 0;
border: 1px #999 solid; border: 1px #999 solid;
padding: 5px; padding: 5px;
background: #def; background: #eee;
vertical-align: middle; vertical-align: middle;
} }
.field input { .field input {
width: 250px; width: 250px;
height: 25px; height: 25px;
border: 1px #666 solid; border: 1px #999 solid;
} }
.field textarea { .field textarea {
width: 80%; width: 80%;
@ -2147,8 +2146,8 @@ div[id$="wrapper"] br {
text-decoration: none; text-decoration: none;
} }
.field .onoff .on { .field .onoff .on {
background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def; background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
color: #333; color: #111;
text-align: left; text-align: left;
} }
.field .onoff .off { .field .onoff .off {