diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-20 08:17:41 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-20 08:17:41 +0100 |
| commit | a8b9b219158e8565af615b852c587787ad58a0a3 (patch) | |
| tree | 2476b3b0aa892b2711943a500e1869d15b29d607 /view | |
| parent | b43ec25955de2a2e18cd1d65023341abdcd5b519 (diff) | |
| parent | 2ffe0d0b1d9589b6b37d8ade0114caef31339001 (diff) | |
| download | volse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.tar.gz volse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.tar.bz2 volse-hubzilla-a8b9b219158e8565af615b852c587787ad58a0a3.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view')
| -rw-r--r-- | view/it/profile_edit.tpl | 4 | ||||
| -rw-r--r-- | view/it/settings.tpl | 2 | ||||
| -rw-r--r-- | view/theme/default/style.css | 7 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 8 |
4 files changed, 18 insertions, 3 deletions
diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl index e5d0976ec..efdb5d448 100644 --- a/view/it/profile_edit.tpl +++ b/view/it/profile_edit.tpl @@ -30,9 +30,9 @@ $default <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> +<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Breve descrizione: </label> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" /> -</div> +</div><div id="profile-edit-pdesc-desc">(es. titolo, posizione, altro)</div> <div id="profile-edit-pdesc-end"></div> diff --git a/view/it/settings.tpl b/view/it/settings.tpl index 365e5cb70..2ff259acc 100644 --- a/view/it/settings.tpl +++ b/view/it/settings.tpl @@ -153,7 +153,7 @@ Lascia questi campi in bianco per non effettuare variazioni alla password </div> -<h3 class="settings-heading">Impostazioni Avanzante Pagina</h3> +<h3 class="settings-heading">Impostazioni Avanzate Account</h3> $pagetype diff --git a/view/theme/default/style.css b/view/theme/default/style.css index 0457850dc..e34b622c6 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -1989,3 +1989,10 @@ a.mail-list-link { #birthday-wrapper { margin-bottom: 20px; } + + +#network-new-link { + margin-top: 15px; + margin-bottom: 15px; +} + diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 9d51c86f7..b00f24cc2 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -667,6 +667,7 @@ input#dfrn-url { margin-left: 20px; } +#profile-edit-pdesc-desc, #profile-edit-keywords-desc { float: left; margin-left: 20px; @@ -1872,3 +1873,10 @@ a.mail-list-link { #birthday-wrapper { margin-bottom: 20px; } + +#network-new-link { + margin-top: 15px; + margin-bottom: 15px; +} + + |