diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-13 19:26:18 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-13 19:26:18 -0400 |
| commit | a3d95f79f27ca73d657907ab42b51ecc50872089 (patch) | |
| tree | 74865c7ef150c0d92485f9ec1b1dd204175e34ca /view/theme/quattro/nav.tpl | |
| parent | 093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc (diff) | |
| parent | bfb821e9188ef83fb2621250fd97bdb169447f3d (diff) | |
| download | volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.tar.gz volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.tar.bz2 volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
well that was a silly mistake...
setting wasn't being applied
rev update
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
diabook: theme-settings: users can set font-size and line-height for posts and comments
diabook-themes: small fixes
quattro: language icon in navbar
move html out of lang_selector() and new template lang_selector.tpl
display settings: show theme screenshot on page load
quattro: add admin theme settigs. darker items background with a bottom border.
admin: change global theme settings
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
validate_url allow naked subdomain if is "localhost"
* master:
Diffstat (limited to 'view/theme/quattro/nav.tpl')
| -rw-r--r-- | view/theme/quattro/nav.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl index 26f04f134..af1fc9414 100644 --- a/view/theme/quattro/nav.tpl +++ b/view/theme/quattro/nav.tpl @@ -43,6 +43,7 @@ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> <ul id="nav-notifications-menu" class="menu-popup"> + <!-- TODO: better icons! --> <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li> <li class="empty">$emptynotifications</li> </ul> @@ -91,3 +92,4 @@ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> +<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div> |