From 832601a0a53a8e004b2b64879223cd8d1fc68c45 Mon Sep 17 00:00:00 2001 From: g7sim Date: Tue, 25 Jul 2023 19:35:23 +0200 Subject: [PATCH] Update Bootstrap 5.2 Theme V0.9 --- themes/Bootstrap5.3_mult/1-white/style.scss | 9 ++- themes/Bootstrap5.3_mult/2-white/style.scss | 13 +++- themes/Bootstrap5.3_mult/3-blue/style.scss | 18 +++++- themes/Bootstrap5.3_mult/4-green/style.scss | 23 ++++++-- themes/Bootstrap5.3_mult/Addon.ini | 2 +- .../Bootstrap5.3_mult/assets/css/style.scss | 2 + themes/Bootstrap5.3_mult/assets/js/init.js | 59 +++++++++++++++++++ themes/Bootstrap5.3_mult/settings.php | 1 - themes/Bootstrap5.3_mult/template.php | 8 +-- 9 files changed, 119 insertions(+), 16 deletions(-) diff --git a/themes/Bootstrap5.3_mult/1-white/style.scss b/themes/Bootstrap5.3_mult/1-white/style.scss index 4f83033..aa7ac4b 100644 --- a/themes/Bootstrap5.3_mult/1-white/style.scss +++ b/themes/Bootstrap5.3_mult/1-white/style.scss @@ -41,7 +41,9 @@ nav.nav-custom{ --bs-dropdown-link-active-bg: lightgray; /*! #0d6efd; */ } - +@media only screen and ( max-width: 990px ) { +ul.navbar-nav{min-width:250px;} +} /*! ----- search-button -----*/ div.input-group span.input-group-btn{ @@ -53,3 +55,8 @@ div.input-group span.input-group-btn{ $footer-bg: $gray-300; /*! Standard */ +footer.main-footer { + font-size: 0.875rem; + background: #dee2e6; + color: #212529; +} \ No newline at end of file diff --git a/themes/Bootstrap5.3_mult/2-white/style.scss b/themes/Bootstrap5.3_mult/2-white/style.scss index 02a075a..f37912c 100644 --- a/themes/Bootstrap5.3_mult/2-white/style.scss +++ b/themes/Bootstrap5.3_mult/2-white/style.scss @@ -39,8 +39,17 @@ nav.nav-custom{ background-image: linear-gradient(#f9fafb, #f8f9fa 60%, #e9eae --bs-dropdown-link-active-bg: lightgray; /*! #0d6efd; */ } +@media only screen and ( max-width: 990px ) { +ul.navbar-nav{min-width:250px;} +} + +/*! --- common footer-styles in _common/footer.scss ----- */ +$footer-bg: $gray-300; /*! Standard */ - - +footer.main-footer { + font-size: 0.875rem; + background: #dee2e6; + color: #212529; +} diff --git a/themes/Bootstrap5.3_mult/3-blue/style.scss b/themes/Bootstrap5.3_mult/3-blue/style.scss index 40b24d1..bb2339e 100644 --- a/themes/Bootstrap5.3_mult/3-blue/style.scss +++ b/themes/Bootstrap5.3_mult/3-blue/style.scss @@ -31,7 +31,7 @@ nav.nav-custom { color: dimgray; } -@media only screen and ( min-width: 951px ) { +@media only screen and ( min-width: 991px ) { nav.nav-custom { ul:not(.submenu) a{color:white;} ul.dropdown-menu a, ul.submenu a {color:dimgray;} @@ -40,8 +40,9 @@ nav.nav-custom { color: white; } } -@media only screen and ( max-width: 950px ) { -ul.navbar-nav{min-width:250px;} +@media only screen and ( max-width: 990px ) { +ul.navbar-nav{min-width:250px; background-color:white;} +div#offcanvasGp.offcanvas{background-color:#567baf;} } @@ -64,4 +65,15 @@ div.input-group span.input-group-btn:hover { } +/*! --- common footer-styles in _common/footer.scss ----- */ +$footer-bg: #272727; /*! css - instead Standard */ + +span.login_link:before{color:white;} +span.sitemap_link a, span.login_link a{color:white;} + +footer.main-footer { + font-size: 0.875rem; + background: #272727; + color: white; +} diff --git a/themes/Bootstrap5.3_mult/4-green/style.scss b/themes/Bootstrap5.3_mult/4-green/style.scss index 61f76c1..b1a58d3 100644 --- a/themes/Bootstrap5.3_mult/4-green/style.scss +++ b/themes/Bootstrap5.3_mult/4-green/style.scss @@ -32,7 +32,7 @@ nav.nav-custom { color: dimgray; } -@media only screen and ( min-width: 951px ) { +@media only screen and ( min-width: 991px ) { nav.nav-custom { ul:not(.submenu) a{color:white;} ul.dropdown-menu a, ul.submenu a {color:dimgray;} @@ -41,8 +41,9 @@ nav.nav-custom { color: white; } } -@media only screen and ( max-width: 950px ) { -ul.navbar-nav{min-width:250px;} +@media only screen and ( max-width: 990px ) { +ul.navbar-nav{min-width:250px;background-color:white;} +div#offcanvasGp.offcanvas{background-color:#329932;} } .dropdown-item.active, .dropdown-item:active { @@ -60,4 +61,18 @@ ul.navbar-nav{min-width:250px;} div.input-group span.input-group-btn:hover { background-color: lightgreen; - } \ No newline at end of file + } + + +/*! --- common footer-styles in _common/footer.scss ----- */ +$footer-bg: #090909; /*! css - instead Standard */ + + +span.login_link:before{color:white;} +span.sitemap_link a, span.login_link a{color:white;} + +footer.main-footer { + font-size: 0.875rem; + background: #090909; + color: white; +} diff --git a/themes/Bootstrap5.3_mult/Addon.ini b/themes/Bootstrap5.3_mult/Addon.ini index 1e2f72e..340b2a1 100644 --- a/themes/Bootstrap5.3_mult/Addon.ini +++ b/themes/Bootstrap5.3_mult/Addon.ini @@ -1,6 +1,6 @@ Addon_Name = 'Boot5.3-offcan-mult' ;Addon_Unique_ID = -Addon_Version = 0.8 +Addon_Version = 0.9 min_gpeasy_version = 5.2 [FrontEndFramework] diff --git a/themes/Bootstrap5.3_mult/assets/css/style.scss b/themes/Bootstrap5.3_mult/assets/css/style.scss index 48d9888..4ced1c8 100644 --- a/themes/Bootstrap5.3_mult/assets/css/style.scss +++ b/themes/Bootstrap5.3_mult/assets/css/style.scss @@ -47,6 +47,8 @@ span.sitemap_link a, span.login_link a{text-decoration:none;} ul.navbar-nav{ padding:15px; border:1px lightgray solid; border-radius:4px;} + + .gpMenu #main-nav ul li{min-width:220px;} div.gpMenu.gpArea_FullMenu.GPAREA > .navbar-nav{ border: 1px lightgray solid; diff --git a/themes/Bootstrap5.3_mult/assets/js/init.js b/themes/Bootstrap5.3_mult/assets/js/init.js index 52145cb..1d38929 100644 --- a/themes/Bootstrap5.3_mult/assets/js/init.js +++ b/themes/Bootstrap5.3_mult/assets/js/init.js @@ -2,3 +2,62 @@ function externalLinks() { for(var c = document.getElementsByTagName("a"), a = 0;a < c.length;a++) { var b = c[a]; b.getAttribute("href") && b.hostname !== location.hostname && (b.rel = "nofollow noopener") } } ; externalLinks(); + +// menu -classes +//$( "div.gpMenu ul.dropdown-menu li a").addClass("dropdown-item"); +//$( "div.gpMenu ul.navbar-nav li.nav-item a").addClass("nav-link"); + + +$(document).ready(function() { + $("ul.navbar-nav > li > ul.dropdown-menu > li > ul.dropdown-menu").addClass("submenu"); +}); + + +document.addEventListener("DOMContentLoaded", function() { + var dropdownMenus = document.querySelectorAll("ul.navbar-nav > li > ul.dropdown-menu > li > ul.dropdown-menu"); + for (var i = 0; i < dropdownMenus.length; i++) { + dropdownMenus[i].classList.add("submenu"); + } +}); + + +// Replace div.gpMenu ul.dropdown-menu li a with dropdown-item class +var dropdownItems = document.querySelectorAll("div.gpMenu ul.dropdown-menu li a"); +for (var i = 0; i < dropdownItems.length; i++) { + dropdownItems[i].classList.add("dropdown-item"); +} + +// Replace div.gpMenu ul.navbar-nav li.nav-item a with nav-link class +var navLinks = document.querySelectorAll("div.gpMenu ul.navbar-nav li.nav-item a"); +for (var i = 0; i < navLinks.length; i++) { + navLinks[i].classList.add("nav-link"); +} + + + // JavaScript/jQuery code to handle dropdowns + document.addEventListener("DOMContentLoaded", function() { + var dropdownToggle = document.querySelector(".navbar .dropdown-toggle"); + if (dropdownToggle) { + dropdownToggle.addEventListener("click", function(e) { + e.preventDefault(); + var dropdownMenu = dropdownToggle.nextElementSibling; + if (dropdownMenu.style.display === "block") { + dropdownMenu.style.display = "none"; + } else { + dropdownMenu.style.display = "block"; + } + }); + } + }); + + +// (c) 2020-2022 Written by Simon Köhler in Panama +// github.com/koehlersimon +// simon-koehler.com +document.addEventListener('click',function(e){ + // Hamburger menu + if(e.target.classList.contains('hamburger-toggle')){ + e.target.children[0].classList.toggle('active'); + } +}) + diff --git a/themes/Bootstrap5.3_mult/settings.php b/themes/Bootstrap5.3_mult/settings.php index 4eff627..7c97110 100644 --- a/themes/Bootstrap5.3_mult/settings.php +++ b/themes/Bootstrap5.3_mult/settings.php @@ -21,6 +21,5 @@ $themeDir = dirname($page->theme_path); //$page->head_js[] = $themeDir.'/assets/js/bootnavbar.js'; $page->head_js[] = $themeDir.'/assets/js/script.js'; -$page->head_js[] = $themeDir.'/assets/js/init.js'; diff --git a/themes/Bootstrap5.3_mult/template.php b/themes/Bootstrap5.3_mult/template.php index 7199a9a..60573c6 100644 --- a/themes/Bootstrap5.3_mult/template.php +++ b/themes/Bootstrap5.3_mult/template.php @@ -42,7 +42,7 @@ $lang = isset($page->lang) ? $page->lang : $config['language'];
-
+
@@ -64,13 +64,13 @@ $lang = isset($page->lang) ? $page->lang : $config['language'];
Navbar
- +
-
+
lang) ? $page->lang : $config['language']; -