aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-09 17:49:15 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-09 17:49:15 +0200
commitf99c007187b83755d7b1c80c63fde7c1162a99c4 (patch)
treef2d04b55b56d9011478f48209553aba5e8255ab5 /view
parent54a06903230ad87570b3a37161fa888dd38cb389 (diff)
downloadvolse-hubzilla-f99c007187b83755d7b1c80c63fde7c1162a99c4.tar.gz
volse-hubzilla-f99c007187b83755d7b1c80c63fde7c1162a99c4.tar.bz2
volse-hubzilla-f99c007187b83755d7b1c80c63fde7c1162a99c4.zip
new notification changes - use sticky_kit instead of position fixed
Diffstat (limited to 'view')
-rw-r--r--view/php/default.php2
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/theme/redbasic/js/redbasic.js5
-rwxr-xr-xview/tpl/nav.tpl8
-rw-r--r--view/tpl/notifications_widget.tpl16
5 files changed, 19 insertions, 16 deletions
diff --git a/view/php/default.php b/view/php/default.php
index 444e24197..b180a6eb8 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -15,7 +15,7 @@
<div id="page-footer"></div>
<div id="pause"></div>
</section>
- <aside id="region_3" class="d-none d-xl-table-cell"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+ <aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
</main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index de6f8dac1..a912fb825 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -161,6 +161,10 @@ nav {
filter:alpha(opacity=$nav_percent_min_opacity);
}
+#nav-app-link {
+ white-space: nowrap;
+}
+
#powered-by {
font-size: 0.5rem;
position: absolute;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 257e7cfb6..3fa9d2a76 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -22,6 +22,11 @@ $(document).ready(function() {
parent: 'main',
spacer: '#left_aside_spacer'
});
+ $('#right_aside_wrapper').stick_in_parent({
+ offset_top: parseInt($('#region_3').css('padding-top')),
+ parent: 'main',
+ spacer: '#right_aside_spacer'
+ });
}
$('#expand-aside').on('click', toggleAside);
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index bbc5b4fb0..15896c159 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -22,7 +22,7 @@
<a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
{{/foreach}}
{{if $nav.manage}}
- <a class="dropdown-item{{if $sel.active == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+ <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
{{/if}}
{{if $nav.channels}}
{{foreach $nav.channels as $chan}}
@@ -34,11 +34,11 @@
{{/if}}
{{if $nav.settings}}
<div class="dropdown-divider"></div>
- <a class="dropdown-item{{if $sel.active == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+ <a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
{{/if}}
{{if $nav.admin}}
<div class="dropdown-divider"></div>
- <a class="dropdown-item{{if $sel.active == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+ <a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
{{/if}}
{{if $nav.logout}}
<div class="dropdown-divider"></div>
@@ -54,7 +54,7 @@
{{/if}}
</div>
<div class="navbar-nav mr-auto">
- <div class="text-white">{{$sel.active}}</div>
+ <div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div>
</div>
{{/if}}
<div class="navbar-toggler-right">
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 26004338d..3323422d6 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,13 +1,6 @@
<style>
- #notifications {
- position: fixed;
- top: 4.5rem;
- width: 266px;
- padding: 0 .5rem;
- }
-
.notification-content {
- max-height: 50vh;
+ max-height: 70vh;
overflow: auto;
}
@@ -16,11 +9,12 @@
}
.fs {
- top: 0px !important;
+ position: fixed;
+ top: 0px;
left: 0px;
- padding-top: 4.5rem !important;
+ padding: 4.5rem .5rem 0 .5rem;
background-color: white;
- width: 100% !important;
+ width: 100%;
max-width: 100%;
height: 100vh;
z-index: 1030;