diff --git a/assets/vendor/astroid/scss/_header.scss b/assets/vendor/astroid/scss/_header.scss index 90f1e9f3..0422dc45 100644 --- a/assets/vendor/astroid/scss/_header.scss +++ b/assets/vendor/astroid/scss/_header.scss @@ -272,7 +272,6 @@ header .logo-wrapper { .astroid-logo { margin: 0 auto !important; - justify-content: center; } .astroid-sidebar-mobile-menu { @@ -327,6 +326,13 @@ header .logo-wrapper { .astroid-sidebar-content { overflow-y: auto; + @media(min-width: 1200px) { + padding: 15px 25px; + } + + @media(min-width: 1400px) { + padding: 15px 35px; + } } .astroid-sidebar-collapsable { diff --git a/assets/vendor/astroid/scss/_menu.scss b/assets/vendor/astroid/scss/_menu.scss index 0de98ea2..61f71504 100644 --- a/assets/vendor/astroid/scss/_menu.scss +++ b/assets/vendor/astroid/scss/_menu.scss @@ -254,7 +254,7 @@ ul { height: 0; border-left: 8px solid transparent; border-right: 8px solid transparent; - border-bottom: 8px solid #eee; + border-bottom: 8px solid var(--bs-border-color); z-index: 0; left: 50%; margin-left: -8px; @@ -268,29 +268,40 @@ ul { list-style-type: none; margin: 0; padding: 0; - + .nav-title { + display: block; + } li { - width: 100%; display: block; - border-bottom: 1px solid $border-color; + width: 100%; + margin: 10px 0; + .nav-item-inner { + border-radius: var(--bs-border-radius); + } .as-menu-item { - padding: 10px; - width: calc(100% - 50px); - display: inline-block; + display: block; + padding: $sidebar-menu-item-padding; + flex: auto; } - >ul { - list-style-type: none; - margin: 0; - padding: 0; - padding-left: 20px; + ul.nav-child { display: none; - border-top: 1px solid #eee; - - li { - &:last-child { - border-bottom: 0; + list-style: none; + border-left: 1px dashed var(--bs-border-color); + margin-left: 20px; + padding-left: 15px; + > li > div.nav-item-inner > a { + position: relative; + &:before { + content: ""; + margin-right: 10px; + border-top: 1px dashed var(--bs-border-color); + width: 7px; + height: 1px; + position: absolute; + top: 50%; + left: -13px; } } } @@ -301,14 +312,10 @@ ul { } } - >.nav-item-caret { - width: 50px; - display: inline-block; + .nav-item-caret { font-size: 13px; - text-align: right; - padding: 10px; + padding: $sidebar-menu-item-padding; cursor: pointer; - float: right; line-height: inherit; &:before { diff --git a/assets/vendor/astroid/scss/_variables.scss b/assets/vendor/astroid/scss/_variables.scss index b9e14573..ed1eb434 100644 --- a/assets/vendor/astroid/scss/_variables.scss +++ b/assets/vendor/astroid/scss/_variables.scss @@ -28,6 +28,7 @@ $sidebar-header-mini-width: 54px !default; // Menu $megamenu-gutter-width: 30px !default; +$sidebar-menu-item-padding: 5px 15px !default; // Deprecated Variable $header-sidebar-width: 320px !default; diff --git a/framework/frontend/header/menu/link.php b/framework/frontend/header/menu/link.php index af5b0939..8ed7c2b1 100644 --- a/framework/frontend/header/menu/link.php +++ b/framework/frontend/header/menu/link.php @@ -151,6 +151,6 @@ parent && $item->deeper == 1)) { ?> - + \ No newline at end of file diff --git a/framework/library/astroid/Component/Menu.php b/framework/library/astroid/Component/Menu.php index 8d031562..08cd60d4 100644 --- a/framework/library/astroid/Component/Menu.php +++ b/framework/library/astroid/Component/Menu.php @@ -653,9 +653,11 @@ public static function getSidebarMenu($menutype = '') $options = self::getAstroidMenuOptions($item, $list); $class = self::getLiClass($item, $options, $default_id, $active_id, $path); echo '
  • '; + echo ''; if ($item->deeper) { - echo '