diff options
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/Focus-Light.css | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/Focus-Light.php | 13 | ||||
| -rw-r--r-- | view/tpl/navbar_default.tpl | 2 |
6 files changed, 5 insertions, 32 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index bda0ab3ca..ed29256fa 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -46,10 +46,6 @@ nav .dropdown-menu { } -.navbar-dark .navbar-toggler { - color: rgba(255,255,255,1); -} - /* offcanvas */ .offcanvas, .offcanvas-backdrop.fade { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b93738b00..a31c5ec32 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -26,11 +26,11 @@ --hz-body-bg-image: url('$background_image_dark'); } -[data-bs-theme=light] .navbar-dark.bg-dark { +[data-bs-theme=light] .navbar.bg-body-tertiary { background-color: $nav_bg !important; } -[data-bs-theme=dark] .navbar-dark.bg-dark { +[data-bs-theme=dark] .navbar.bg-body-tertiary { background-color: $nav_bg_dark !important; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index aef688ef2..b58ac98d8 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -72,10 +72,10 @@ if ((!$schema) || ($schema == '---')) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) - $nav_bg = 'rgba(33, 37, 41, 1)'; + $nav_bg = 'rgba(248, 249, 250, 1)'; if (! $nav_bg_dark) - $nav_bg_dark = 'rgba(0, 0, 0, 1)'; + $nav_bg_dark = 'rgba(43, 48, 53, 1)'; if (! $link_color) $link_color = '#0d6efd'; diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css deleted file mode 100644 index bc5da2a1d..000000000 --- a/view/theme/redbasic/schema/Focus-Light.css +++ /dev/null @@ -1,10 +0,0 @@ -.dropdown-header.text-white-50, -.navbar-dark .navbar-toggler, -.navbar-dark .nav-link:active, .navbar-dark .nav-link.active, -.navbar-dark .navbar-text, .navbar-dark .nav-link, .navbar-dark .nav-link:hover { - color: var(--bs-secondary) !important; -} - -.navbar-dark.bg-dark { - background-color: var(--bs-tertiary-bg) !important; -} diff --git a/view/theme/redbasic/schema/Focus-Light.php b/view/theme/redbasic/schema/Focus-Light.php deleted file mode 100644 index 8a542d1b8..000000000 --- a/view/theme/redbasic/schema/Focus-Light.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php - - if (! $nav_bg) - $nav_bg = "#f8f9fa"; - if (! $nav_icon_colour) - $nav_icon_colour = "rgba(0, 0, 0, 0.5)"; - if (! $nav_active_icon_colour) - $nav_active_icon_colour = "rgba(0, 0, 0, 0.7)"; - if (! $radius) - $radius = "4px"; - if (! $banner_colour) - $banner_colour = "rgba(0, 0, 0, 0.7)"; - diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index a61e6c490..685fb01d6 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,4 +1,4 @@ -<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"> +<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary"> <div class="container-fluid flex-nowrap"> {{if $userinfo}} <div class="d-flex" style="max-width: 50%"> |