From 3efe144fa0c455529a3f6244557d1253885134cf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Nov 2017 21:41:45 +0100 Subject: revisit media breakpoints - do not switch to mobile view to early. --- view/css/bootstrap-red.css | 4 ++-- view/js/main.js | 12 ++++++------ view/php/default.php | 2 +- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/js/redbasic.js | 10 ++++++---- view/tpl/navbar_default.tpl | 15 ++++++++++----- view/tpl/navbar_tucson.tpl | 13 +++++++++---- view/tpl/notifications_widget.tpl | 2 +- 8 files changed, 36 insertions(+), 24 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 18efd69e4..a0b7c5bba 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -11,7 +11,7 @@ nav .dropdown-menu { min-width: 16rem; } -@media screen and (min-width: 767px) { +@media screen and (min-width: 992px) { nav .badge { top: 0px; left: 0px; @@ -19,7 +19,7 @@ nav .dropdown-menu { } } -@media screen and (max-width: 767px) { +@media screen and (max-width: 992px) { .navbar { padding: .5rem 7px; } diff --git a/view/js/main.js b/view/js/main.js index 026036300..ddd876689 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -451,20 +451,20 @@ function NavUpdate() { updateCountsOnly = false; if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) { - $('#notifications-btn').css('opacity', 1); + $('.notifications-btn').css('opacity', 1); } else { - $('#notifications-btn').css('opacity', 0.5); + $('.notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('show'); } if(data.home || data.intros || data.register || data.mail || data.notify || data.files) { - $('#notifications-btn-icon').removeClass('fa-exclamation-circle'); - $('#notifications-btn-icon').addClass('fa-exclamation-triangle'); + $('.notifications-btn-icon').removeClass('fa-exclamation-circle'); + $('.notifications-btn-icon').addClass('fa-exclamation-triangle'); } if(!data.home && !data.intros && !data.register && !data.mail && !data.notify && !data.files) { - $('#notifications-btn-icon').removeClass('fa-exclamation-triangle'); - $('#notifications-btn-icon').addClass('fa-exclamation-circle'); + $('.notifications-btn-icon').removeClass('fa-exclamation-triangle'); + $('.notifications-btn-icon').addClass('fa-exclamation-circle'); } $.each(data, function(index, item) { diff --git a/view/php/default.php b/view/php/default.php index b180a6eb8..06cecc56f 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ >
- +
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6df5a060b..0bdb4bc27 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1484,7 +1484,7 @@ blockquote { color: $nav_active_icon_colour; } -@media screen and (max-width: 767px) { +@media screen and (max-width: 992px) { aside#region_1 { border-right: 1px solid $nav_bd; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index ed9ef02aa..41f5eb7ce 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -8,7 +8,7 @@ $(document).ready(function() { $('body').append(''); if( $('#css3-calc').width() == 10) { $(window).resize(function() { - if($(window).width() < 767) { + if($(window).width() < 992) { $('main').css('width', $(window).width() + $('aside').outerWidth() ); } else { $('main').css('width', '100%' ); @@ -17,7 +17,7 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element - if($(window).width() >= 767) { + if($(window).width() >= 992) { $('#left_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), parent: 'main', @@ -25,7 +25,7 @@ $(document).ready(function() { }); } - if($(window).width() >= 1200) { + if($(window).width() >= 992) { $('#right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), parent: 'main', @@ -77,7 +77,9 @@ $(document).ready(function() { } }); - $('#notifications-btn').click(function() { + $('.notifications-btn').click(function(e) { + e.preventDefault(); + e.stopPropagation(); if($('#navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-2').removeClass('show'); } diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 426d32047..62524ad5b 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -
+
{{if $nav.loginmenu.1.4}} {{$nav.loginmenu.1.1}} @@ -76,12 +76,12 @@ {{/if}} - {{if $localuser || $nav.pubs}} - {{/if}}
-