From 4278fd0a39e2990a1deda4b5e178cd772cbeb785 Mon Sep 17 00:00:00 2001 From: ken Date: Tue, 15 Sep 2026 22:48:57 +0800 Subject: [PATCH] update --- assets/javascripts/app.js | 4 ++-- assets/stylesheets/template/layout/content.scss | 6 ++---- assets/stylesheets/template/layout/header.scss | 9 +++++++-- assets/stylesheets/template/modules/menu.scss | 2 +- home/header.html.erb | 5 ++--- template.json | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 445f0ec..7bda678 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -2545,7 +2545,7 @@ $(function() { if ($(window).width() <769) { $('.modules-menu-level-0').after($('.header-nav')); }else{ - $('.navbar-header').before($('.header-nav')); + $('.dropdowns').before($('.header-nav')); }; $('.sitemenu-vertical .sitemenu-dropdown-toggle').click(function(){ $('.sitemenu-vertical .dropdown-menu').slideToggle(); @@ -2612,7 +2612,7 @@ $(function() { if ($(window).width() <769) { $('.modules-menu-level-0').after($('.header-nav')); }else{ - $('.navbar-header').before($('.header-nav')); + $('.dropdowns').before($('.header-nav')); }; if ($(window).width() > 821) { diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 9a1f1b9..af30839 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -15,7 +15,7 @@ } .internal-page{ .verticalhome{ - padding-top: 5em; + } // .outdropdowns{ // @media(min-width:769px){ @@ -24,10 +24,9 @@ // } } .verticalhome{ - padding-top: 3em; position: relative; width: 100%; - z-index: unset!important; + z-index: unset; } .internal-page{ .layout-content{ @@ -87,7 +86,6 @@ position: relative; width: 100%; padding-bottom: 3em; - padding-top: 2em; // p{ // padding-bottom: 1em; // } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 0e0e40f..b7e1364 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -4,17 +4,22 @@ #orbit-bar .orbit-bar-title a { color: #333 !important; } + .outdropdowns{ background: linear-gradient( lighten($theme-color-second, 58%) 0px, rgba(lighten($theme-color-second, 58%), 0.7) 50%, transparent ); - position: absolute; width: 100%; z-index: 1; padding: 0.5em 0; - padding-bottom: 3em; +} +.dropdowns{ + @media(min-width:769px){ + display: flex; + align-items: center; + } } .header-nav { ul{ diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 824a413..d1fc7ab 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -218,7 +218,7 @@ display: flex; flex-wrap: wrap; justify-content: flex-end; - width: 80%; + // width: 80%; } .has-dropdown.level-1.active { .modules-menu-level-1 { diff --git a/home/header.html.erb b/home/header.html.erb index a1a7852..61d38ea 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -18,13 +18,12 @@