From cde7a3f66cd8d48f0c7aea2391a2778fe494f884 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 12:52:19 +0100 Subject: more work on app-bin --- view/css/bootstrap-red.css | 8 ---- view/js/main.js | 22 ++++------- view/theme/redbasic/css/style.css | 2 +- view/tpl/nav.tpl | 82 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 26 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index cea911440..6cc4a4238 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -44,14 +44,6 @@ nav .dropdown-menu { margin-top: 0px; } -nav .navbar-collapse .navbar-left { - float: left; -} - -nav .navbar-collapse .navbar-right { - float: right; -} - /* nav overrides end */ diff --git a/view/js/main.js b/view/js/main.js index 2fc912093..ed2f6a2e1 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -308,12 +308,6 @@ $(function() { } } - // fancyboxes - // Is this actually used anywhere? - $("a.popupbox").colorbox({ - 'transition' : 'elastic' - }); - NavUpdate(); // Allow folks to stop the ajax page updates with the pause/break key $(document).keydown(function(event) { @@ -376,28 +370,28 @@ function NavUpdate() { if(data.network == 0) { data.network = ''; - $('.net-update').removeClass('show'); + $('.net-update, .net-button').hide(); } else { - $('.net-update').addClass('show'); + $('.net-update, .net-button').show(); } $('.net-update').html(data.network); - if(data.home == 0) { data.home = ''; $('.home-update').removeClass('show'); } else { $('.home-update').addClass('show'); } + if(data.home == 0) { data.home = ''; $('.home-update, .home-button').hide(); } else { $('.home-update, .home-button').show(); } $('.home-update').html(data.home); - if(data.intros == 0) { data.intros = ''; $('.intro-update').removeClass('show'); } else { $('.intro-update').addClass('show'); } + if(data.intros == 0) { data.intros = ''; $('.intro-update, .intro-button').hide(); } else { $('.intro-update, .intro-button').show(); } $('.intro-update').html(data.intros); - if(data.mail == 0) { data.mail = ''; $('.mail-update').removeClass('show'); } else { $('.mail-update').addClass('show'); } + if(data.mail == 0) { data.mail = ''; $('.mail-update, .mail-button').hide(); } else { $('.mail-update, .mail-button').show(); } $('.mail-update').html(data.mail); - if(data.notify == 0) { data.notify = ''; $('.notify-update').removeClass('show'); } else { $('.notify-update').addClass('show'); } + if(data.notify == 0) { data.notify = ''; $('.notify-update, .notify-button').hide(); } else { $('.notify-update, .notify-button').show(); } $('.notify-update').html(data.notify); if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show'); } else { $('.register-update').addClass('show'); } $('.register-update').html(data.register); - if(data.events == 0) { data.events = ''; $('.events-update').removeClass('show'); } else { $('.events-update').addClass('show'); } + if(data.events == 0) { data.events = ''; $('.events-update, .events-button').hide(); } else { $('.events-update, .events-button').show(); } $('.events-update').html(data.events); if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show'); } else { $('.events-today-update').addClass('show'); $('.events-update').html(data.events + '*'); } @@ -409,7 +403,7 @@ function NavUpdate() { if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show'); } else { $('.birthdays-today-update').addClass('show'); $('.birthdays-update').html(data.birthdays + '*'); } $('.birthdays-today-update').html(data.birthdays_today); - if(data.all_events == 0) { data.all_events = ''; $('.all_events-update').removeClass('show'); } else { $('.all_events-update').addClass('show'); } + if(data.all_events == 0) { data.all_events = ''; $('.all_events-update, .all_events-button').hide(); } else { $('.all_events-update, .all_events-button').show(); } $('.all_events-update').html(data.all_events); if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show'); } else { $('.all_events-today-update').addClass('show'); $('.all_events-update').html(data.all_events + '*'); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index cd222e06d..3f1d9e992 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2118,4 +2118,4 @@ dl.bb-dl > dd > li { border: 1px solid #ccc; border-radius: $radiuspx; -} \ No newline at end of file +} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 86f9d5cf9..e131bbbf5 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -58,7 +58,79 @@ -- cgit v1.2.3 From 1a56045b42ffee538c20337a70e7ae4a8b62937d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 13:08:41 +0100 Subject: nav dropdown-menu overrides --- view/css/bootstrap-red.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 6cc4a4238..e98065b2b 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -37,13 +37,6 @@ nav .navbar-header img { margin-top: 1px; } -nav .dropdown-menu { - max-height: 450px; - width: 270px; - overflow-y: auto; - margin-top: 0px; -} - /* nav overrides end */ -- cgit v1.2.3 From d476b7477b72557d127837be048098d24c82ae87 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 22:24:37 +0100 Subject: fix notifications badge positioning and rendering of submenus in collapsed mode --- view/css/bootstrap-red.css | 26 +++++++------------------- view/tpl/nav.tpl | 43 ++++++++++++++++++++++++++++--------------- view/tpl/navapps.tpl | 2 +- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index e98065b2b..b7310954a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,10 +3,8 @@ /* nav overrides */ nav .badge { - position: relative; - top: -49px; - left: 2px; - float: left; + margin-top: -30px; + margin-left: -30px; font-size: 10px; line-height: 20px; padding: 0px 5px; @@ -14,12 +12,7 @@ nav .badge { min-width: 20px; border-radius: 10px; cursor: pointer; -} - -@media screen and (max-width: 767px) { - nav .badge { - top: -46px; - } + display: inline-block !important; } #navbar-collapse-1 i, @@ -27,10 +20,6 @@ nav .badge { font-size: 14px; } -nav ul li { - max-height: 50px; -} - nav .navbar-header img { height: 49px; width: 49px; @@ -45,13 +34,12 @@ aside .nav-pills > li > a, padding: 6px 10px; } -.wall-item-tools .dropdown-menu { - min-width: auto; +nav .dropdown-menu { + margin-top: 0px; } -.dropdown-menu li a { - overflow: hidden; - text-overflow: ellipsis; +.wall-item-tools .dropdown-menu { + min-width: auto; } .nav-tabs.nav-justified > li { diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 666fdfd67..bd829d4d3 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -60,8 +60,10 @@
    {{if $nav.network}}