aboutsummaryrefslogtreecommitdiffstats
path: root/view/settings_nick_set.tpl
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-23 18:17:02 -0700
committerFriendika <info@friendika.com>2011-05-23 18:17:02 -0700
commit78b2db3a9840f551c951bf0a58a54cce08133bcf (patch)
tree95ed3bd4e52218640d0c13f9691da5a051be5cd8 /view/settings_nick_set.tpl
parent3e6180183bdc01edfa01dc4b966daa4081c29604 (diff)
parentdd32a2366c52f7cd234a562c2d9ab7627f162305 (diff)
downloadvolse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.tar.gz
volse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.tar.bz2
volse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.zip
Merge branch 'fabrixxm-master'
Conflicts: boot.php
Diffstat (limited to 'view/settings_nick_set.tpl')
-rw-r--r--view/settings_nick_set.tpl4
1 files changed, 1 insertions, 3 deletions
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 1b0766099..eb4721d50 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,7 +1,5 @@
<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
-</p>
+<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
</div>
<div id="settings-nick-end" ></div>