diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-19 15:21:06 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-19 15:21:06 +0100 |
| commit | d8f9458663f3a8212e98c1d781a06fc22c34e3a2 (patch) | |
| tree | dfca7346e315bed7c4fcfeb7306b809fdabbc3d8 /view | |
| parent | 468c1824054b7527a3d691e0e404e09c37721711 (diff) | |
| parent | 766ade06d5e3b387d1fd3d2d0b00b15852e877b1 (diff) | |
| download | volse-hubzilla-d8f9458663f3a8212e98c1d781a06fc22c34e3a2.tar.gz volse-hubzilla-d8f9458663f3a8212e98c1d781a06fc22c34e3a2.tar.bz2 volse-hubzilla-d8f9458663f3a8212e98c1d781a06fc22c34e3a2.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view')
| -rw-r--r-- | view/en/profile_edit.tpl | 7 | ||||
| -rw-r--r-- | view/it/profile_edit.tpl | 7 | ||||
| -rw-r--r-- | view/profile_vcard.tpl | 2 | ||||
| -rw-r--r-- | view/theme/default/style.css | 10 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 7 |
5 files changed, 31 insertions, 2 deletions
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl index 50227b7f3..beff3b8bd 100644 --- a/view/en/profile_edit.tpl +++ b/view/en/profile_edit.tpl @@ -29,6 +29,13 @@ $default </div> <div id="profile-edit-name-end"></div> +<div id="profile-edit-pdesc-wrapper" > +<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label> +<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" /> +</div> +<div id="profile-edit-pdesc-end"></div> + + <div id="profile-edit-gender-wrapper" > <label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label> $gender diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl index db2957bac..e5d0976ec 100644 --- a/view/it/profile_edit.tpl +++ b/view/it/profile_edit.tpl @@ -29,6 +29,13 @@ $default </div> <div id="profile-edit-name-end"></div> +<div id="profile-edit-pdesc-wrapper" > +<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Il tuo titolo: </label> +<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" /> +</div> +<div id="profile-edit-pdesc-end"></div> + + <div id="profile-edit-gender-wrapper" > <label id="profile-edit-gender-label" for="gender-select" >Il tuo sesso: </label> $gender diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 81659af6a..3cd96eabf 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -1,7 +1,7 @@ <div class="vcard"> $fullname - + $pdesc $tabs $photo diff --git a/view/theme/default/style.css b/view/theme/default/style.css index d9e93bbe6..0457850dc 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -256,10 +256,15 @@ nav { .fn { font-size: 1.4em; - margin-bottom: 10px; + margin-bottom: 5px; line-height: 1.5; } +.vcard .title { + margin-bottom: 5px; +} + + .powered { font-size: 0.6em; color: black; @@ -731,6 +736,7 @@ input#dfrn-url { #profile-edit-profile-name-label, #profile-edit-name-label, +#profile-edit-pdesc-label, #profile-edit-gender-label, #profile-edit-dob-label, #profile-edit-address-label, @@ -750,6 +756,7 @@ input#dfrn-url { #profile-edit-profile-name, #profile-edit-name, +#profile-edit-pdesc, #gender-select, #profile-edit-dob, #profile-edit-address, @@ -819,6 +826,7 @@ input#dfrn-url { #profile-edit-profile-name-end, #profile-edit-name-end, +#profile-edit-pdesc-end, #profile-edit-gender-end, #profile-edit-dob-end, #profile-edit-address-end, diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b2bdb6e87..9d51c86f7 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -604,6 +604,7 @@ input#dfrn-url { #profile-edit-profile-name-label, #profile-edit-name-label, +#profile-edit-pdesc-label, #profile-edit-gender-label, #profile-edit-dob-label, #profile-edit-address-label, @@ -623,6 +624,7 @@ input#dfrn-url { #profile-edit-profile-name, #profile-edit-name, +#profile-edit-pdesc, #gender-select, #profile-edit-dob, #profile-edit-address, @@ -692,6 +694,7 @@ input#dfrn-url { #profile-edit-profile-name-end, #profile-edit-name-end, +#profile-edit-pdesc-end, #profile-edit-gender-end, #profile-edit-dob-end, #profile-edit-address-end, @@ -1842,6 +1845,10 @@ a.mail-list-link { font-weight: bold; } +.vcard .title { + margin-bottom: 5px; +} + #birthday-title { float: left; |