diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 6 | ||||
| -rw-r--r-- | view/tpl/navbar_default.tpl | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index ca27bb825..7a6d795a4 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -6,18 +6,19 @@ let redbasic_dark_mode = localStorage.getItem('redbasic_dark_mode'); if (redbasic_dark_mode == 1) { $('html').attr('data-bs-theme', 'light'); - $('meta[name=theme-color]').attr('content', $('nav').css('background-color')); $('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o'); } if (redbasic_dark_mode == 2) { $('html').attr('data-bs-theme', 'dark'); - $('meta[name=theme-color]').attr('content', $('nav').css('background-color')); $('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o'); } + $(document).ready(function() { + $('meta[name=theme-color]').attr('content', $('nav').css('background-color')); + // CSS3 calc() fallback (for unsupported browsers) $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); if( $('#css3-calc').width() == 10) { @@ -31,6 +32,7 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element + if (document.querySelector('#region_1')) { stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0); } diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 83844a2f7..d376647e3 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -91,7 +91,7 @@ {{if $nav.login && !$userinfo}} <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} - <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-bs-toggle="modal" data-bs-target="#nav-login"> + <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" data-bs-toggle="modal" data-bs-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> {{else}} @@ -103,7 +103,7 @@ {{/if}} {{if $nav.register}} <li class="nav-item {{$nav.register.2}} d-lg-flex"> - <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> + <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}">{{$nav.register.1}}</a> </li> {{/if}} {{if $nav.alogout}} @@ -166,7 +166,7 @@ {{if $nav.login && !$userinfo}} <div class="hstack gap-1 d-lg-none pt-1 pb-1"> {{if $nav.loginmenu.1.4}} - <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-bs-toggle="modal" data-bs-target="#nav-login"> + <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" data-bs-toggle="modal" data-bs-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> {{else}} @@ -175,7 +175,7 @@ </a> {{/if}} {{if $nav.register}} - <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > + <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}"> {{$nav.register.1}} </a> {{/if}} |