diff options
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 5 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0a879cb71..a9ea29ba1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1514,11 +1514,15 @@ blockquote { left: 0px; } - #nav-app-link-wrapper { + #nav-app-link-wrapper.has_location { min-width: 0; flex-basis: 25%; } + #nav-app-link-wrapper { + margin-right: 0.5rem; + } + #navbar-collapse-2 .navbar-app i { font-size: 1rem; margin-right: 0.5rem; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 70d196a02..688e92148 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -20,7 +20,8 @@ $(document).ready(function() { if($(window).width() >= 992) { $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), - parent: 'main' + parent: 'main', + spacer: '.aside_spacer' }); } @@ -42,7 +43,7 @@ $(document).ready(function() { }); - var right_aside_height = $('#rightt_aside_wrapper').height(); + var right_aside_height = $('#right_aside_wrapper').height(); $('#right_aside_wrapper').on('click', function() { if(right_aside_height != $('#right_aside_wrapper').height()) { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index a11b9b5ea..a0e8edaf7 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -63,7 +63,7 @@ {{/if}} </div> {{if $sel.name}} -<div id="nav-app-link-wrapper" class="navbar-nav mr-auto"> +<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation}} has_location mr-auto{{/if}}"> <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> {{$sel.name}} {{if $sitelocation}} |