aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-11 05:23:45 -0700
committerFriendika <info@friendika.com>2011-05-11 05:23:45 -0700
commit1ca9263c879c5043cf35aec345d462bcfdd71321 (patch)
treef08e3a47f621b96b0eae367540f676ac6aad4e7d /view
parentb2e92e0af32f86212d15748c6d432d658905d4b6 (diff)
downloadvolse-hubzilla-1ca9263c879c5043cf35aec345d462bcfdd71321.tar.gz
volse-hubzilla-1ca9263c879c5043cf35aec345d462bcfdd71321.tar.bz2
volse-hubzilla-1ca9263c879c5043cf35aec345d462bcfdd71321.zip
bug #66, identity address string malformed if line wraps
Diffstat (limited to 'view')
-rw-r--r--view/settings.tpl4
-rw-r--r--view/settings_nick_set.tpl2
-rw-r--r--view/theme/duepuntozero/style.css14
3 files changed, 10 insertions, 10 deletions
diff --git a/view/settings.tpl b/view/settings.tpl
index dfa9e5039..25f570be6 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,11 +1,11 @@
<h1>$ptitle</h1>
+$nickname_block
+
<div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
$uexport
-$nickname_block
-
<form action="settings" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 4378b4884..1b0766099 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,7 +1,7 @@
<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
-<span class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</span>
+<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
</p>
</div>
<div id="settings-nick-end" ></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5f8f06a6c..4c9f389e2 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -383,7 +383,7 @@ input#dfrn-url {
#settings-nick-wrapper {
margin-top: 20px;
- margin-bottom: 30px;
+
}
#settings-expire-end {
@@ -506,10 +506,6 @@ input#dfrn-url {
width: 500px;
}
-#settings-nick {
- margin-bottom: 50px;
-}
-
#cropimage-wrapper, #cropimage-preview-wrapper {
float: left;
padding: 30px;
@@ -2126,11 +2122,15 @@ a.mail-list-link {
}
-#plugin-settings-link, #account-settings-link, #uexport-link {
+#plugin-settings-link, #account-settings-link {
margin-bottom: 10px;
}
-/* end from defautlt */
+#uexport-link {
+ margin-bottom: 20px;
+}
+
+/* end from default */
.fn {