diff options
author | root <root@diekershoff.homeunix.net> | 2010-12-23 07:39:23 +0100 |
---|---|---|
committer | root <root@diekershoff.homeunix.net> | 2010-12-23 07:39:23 +0100 |
commit | a1d593613d737d6f1a694adaddf515187580105c (patch) | |
tree | 1bf8cc90900dcf52f66b7c09a453acb5133a9b6a /view | |
parent | 780ab072f55bd18575ca821eb6ea481cc0728814 (diff) | |
parent | d8969bb84b7a710bf77f23de0d392a192dfc8f53 (diff) | |
download | volse-hubzilla-a1d593613d737d6f1a694adaddf515187580105c.tar.gz volse-hubzilla-a1d593613d737d6f1a694adaddf515187580105c.tar.bz2 volse-hubzilla-a1d593613d737d6f1a694adaddf515187580105c.zip |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view')
-rw-r--r-- | view/en/profile_advanced.php | 1 | ||||
-rw-r--r-- | view/en/settings.tpl | 2 | ||||
-rw-r--r-- | view/theme/default/style.css | 16 |
3 files changed, 18 insertions, 1 deletions
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php index 7e2036890..82c66adec 100644 --- a/view/en/profile_advanced.php +++ b/view/en/profile_advanced.php @@ -223,3 +223,4 @@ $o .= <<< EOT EOT; } + diff --git a/view/en/settings.tpl b/view/en/settings.tpl index 85587afbf..aea463742 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -76,7 +76,7 @@ $profile_in_net_dir <div id="settings-default-perms" class="settings-default-perms" > - <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div> + <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >⇩ $permissions</div> <div id="settings-default-perms-menu-end"></div> <div id="settings-default-perms-select" style="display: none;" > diff --git a/view/theme/default/style.css b/view/theme/default/style.css index 8ad6ee593..f97b8f4c3 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -72,6 +72,14 @@ blockquote:before { content: '>> '; } +#site-location { + position: absolute; + right: 5px; + top: 3px; + color: white; + font-size: 60%; +} + .shiny { border-color: orange !important; } @@ -148,6 +156,14 @@ blockquote:before { vertical-align: top; } +#logo-text a, #logo-text a:hover, #logo-text a:visited { + color: #F5F6FB; + font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif; + margin-left: 3px; + vertical-align: top; +} + + #banner { color: #F5F6FB; font-family: "lucida grande",tahoma,verdana,arial,sans-serif; |