diff options
| author | Friendika <info@friendika.com> | 2011-05-23 18:17:02 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-05-23 18:17:02 -0700 |
| commit | 78b2db3a9840f551c951bf0a58a54cce08133bcf (patch) | |
| tree | 95ed3bd4e52218640d0c13f9691da5a051be5cd8 /view | |
| parent | 3e6180183bdc01edfa01dc4b966daa4081c29604 (diff) | |
| parent | dd32a2366c52f7cd234a562c2d9ab7627f162305 (diff) | |
| download | volse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.tar.gz volse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.tar.bz2 volse-hubzilla-78b2db3a9840f551c951bf0a58a54cce08133bcf.zip | |
Merge branch 'fabrixxm-master'
Conflicts:
boot.php
Diffstat (limited to 'view')
| -rw-r--r-- | view/settings_nick_set.tpl | 4 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 15 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 8 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 8 |
4 files changed, 32 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> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index a212c1935..b7c41c89c 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -171,6 +171,18 @@ nav .nav-link { #home-update { background-position: -90px 0px; } /** sysmsg **/ +#sysmsg_info{ + position:fixed; + bottom: 0px; right:20%; + -moz-box-shadow: 0px 0px 5px #888; + -webkit-box-shadow: 0px 0px 5px #888; + box-shadow: 0px 0px 5px #888; + padding: 10px; + background-color: #fcaf3e; border:2px solid #f8911b; + border-bottom:0px; + padding-bottom: 50px; + z-index: 1000; +} #sysmsg { position:fixed; bottom: 0px; right:10%; @@ -183,12 +195,15 @@ nav .nav-link { padding-bottom: 50px; z-index: 1000; } +#sysmsg_info br, #sysmsg br { display:block; margin:2px 0px; border-top: 1px solid #ccccce; } + + /** * aside **/ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 9e7ebbc06..61da54231 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -93,6 +93,14 @@ nav #site-location { padding: 10px; } +.info-message { + color: #204a87; + font-size: 1.1em; + border: 1px solid #3465a4; + background-color: #d7e3f1; + padding: 10px; +} + nav #banner { display: block; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 0ae2ab4cd..92c2c20a7 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -290,6 +290,14 @@ nav { background-color: #FFEEEE; padding: 10px; } +.info-message { + color: #204a87; + font-size: 1.1em; + border: 1px solid #3465a4; + background-color: #d7e3f1; + padding: 10px; +} + .nav-link { float: right; |