From aff2c8a5ff11c68b55ee8a65c600ad7e7a800405 Mon Sep 17 00:00:00 2001 From: ken Date: Tue, 29 Sep 2026 19:33:50 +0800 Subject: [PATCH] up --- assets/stylesheets/template/base/_global.scss | 22 ++--- assets/stylesheets/template/base/_unity.scss | 9 +- .../stylesheets/template/base/_variables.scss | 3 + .../stylesheets/template/layout/content.scss | 9 +- .../stylesheets/template/layout/header.scss | 28 ++++-- .../template/modules/ad_banner.scss | 62 ++++++------ .../template/modules/announcement.scss | 7 +- assets/stylesheets/template/modules/menu.scss | 26 ++++- .../template/modules/universal-table.scss | 4 + .../stylesheets/template/modules/video.scss | 8 +- .../template/modules/web_resource.scss | 6 +- .../template/widget/breadcrumb.scss | 3 + home/header.html.erb | 2 +- home/index.html.erb | 39 +++----- modules/ad_banner/_ad_banner_widget3.html.erb | 99 +++++++++++++++++++ modules/ad_banner/info.json | 8 ++ 16 files changed, 240 insertions(+), 95 deletions(-) create mode 100644 modules/ad_banner/_ad_banner_widget3.html.erb diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 22f2653..9708547 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -75,14 +75,8 @@ a[href="/en/sitemap"]{ } -.orbit-bar-inner{ - .orbit-bar-menu{ - display: flex; - align-items: center; - } - blockquote{ - color: #333; + color: #fff; padding: 0; margin: 0; font-size: unset; @@ -97,15 +91,15 @@ a[href="/en/sitemap"]{ display: none; } a{ - color: #333; + color: #fff; text-decoration: none; display: inline-block; height: 40px; - padding: 0.7em; - font-size: 0.85em; + height: 40px; + line-height: 40px; + padding: 0 0.5em; } } -} .fa-classic, .fa-regular, .fa-solid, .far, .fas ,.fa{ font-family: var(--fa-style-family, "FontAwesome")!important; } @@ -290,9 +284,9 @@ blockquote ol:last-child, blockquote p:last-child, blockquote ul:last-child { } iframe{ @media(max-width:1024px){ - width: 100%!important; - aspect-ratio: 16 / 9; - height: auto !important; + width: 100%; + // aspect-ratio: 16 / 9; + // height: auto !important; } } diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 74385e0..9df259e 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -1,10 +1,13 @@ @charset "utf-8"; @import "variables"; +.page-module-title{ + margin-top: 1em; +} .internal-page{ - // .unity-title{ - // margin-top: 1em; - // } + .unity-title{ + margin-top: 1em; + } .page-module-title{ display: block !important; text-align: left !important; diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 894cd7d..c8568ae 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -19,6 +19,9 @@ $theme-color-third: darken(#256b86, 8%); $theme-color-green: #0c81ae; $theme-color-hover: darken(#256b86, 8%); +// :root { +// --theme-color-second: #{$theme-color-second}; +// } // Font stacks $main-font: "Noto Sans TC", sans-serif; $sub-font: "Noto Sans TC", sans-serif; diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 8f19334..ce8ef97 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -14,9 +14,6 @@ text-align: end!important; } .internal-page{ - .verticalhome{ - padding-top: 5em; - } // .outdropdowns{ // @media(min-width:769px){ // position: absolute!important; @@ -24,7 +21,7 @@ // } } .verticalhome{ - padding-top: 3em; + // padding-top: 3em; position: relative; width: 100%; z-index: unset!important; @@ -86,8 +83,8 @@ overflow: hidden; position: relative; width: 100%; - padding-bottom: 3em; - padding-top: 2em; + padding-bottom: 1em; + padding-top: 1em; // p{ // padding-bottom: 1em; // } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index ac36fe6..74f0ea3 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -2,7 +2,7 @@ @import "../initial"; #orbit-bar .orbit-bar-title a { - color: #333 !important; + color: #fff !important; } sup { line-height: 0; @@ -18,11 +18,11 @@ sup { .w-ad-banner{ border-radius: 0; } - @media(min-width:1025px){ - .w-ba-banner__wrap{ - height: 50vh; - } - } + // @media(min-width:1025px){ + // .w-ba-banner__wrap{ + // height: 50vh; + // } + // } } .dropdowns{ background-image: linear-gradient( @@ -45,6 +45,12 @@ sup { float: right; } @media(max-width: 768px){ + a{ + color: #333; + padding: 0.5em; + margin: 0; + position: relative; + } ul{ display: flex!important; flex-wrap: wrap; @@ -118,6 +124,9 @@ sup { } } .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ + @media(max-width:768px){ + font-size: 0.8em; + } display: flex; align-items: center; } @@ -161,6 +170,11 @@ sup { .navbar-header { z-index: 10; position: relative; + @media(max-width:768px){ + display: flex; + align-items: center; + justify-content: space-between; + } padding: 0; padding-top: 0.5em!important; margin: 0; @@ -222,7 +236,7 @@ sup { float: left; height: 50px; padding-right: 0.5em; - width: auto!important; + width: auto; @media(min-width: 1024px){ height: 50px; } diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index f73c472..79f172d 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -11,17 +11,33 @@ .outdropdowns{ .w-ba-banner .controlplay { width: auto; - margin-top: 7em; + margin-top: 8em; } } .ba-banner-widget-youtube{ - overflow: hidden; - height: auto !important; - .banner-overlay{ - @media(max-width:768px){ - position: relative; + overflow: hidden; + iframe{ + @media(min-width:1025px){ + position: absolute; + top: -180px; + left: 0; + width: 100%; + height: calc(100% + 215px); + } + } + .jarallax-video-audio{ + @media(min-width:769px){ + top: 7em; + } + } + .w-ba-banner__wrap{ + height: auto !important; + } + .banner-overlay{ + @media(max-width:768px){ + position: relative; + } } - } } .w-ba-banner { position: relative; @@ -274,10 +290,10 @@ ul.button-mid{ } // Widget 0 .ba-banner-widget-0 { - height: 100vh !important; + height: 70vh !important; z-index: 0; .w-ba-banner__wrap{ - height: 100vh !important; + height: 70vh !important; } .youtube, .cycle-youtube { width: 100%; @@ -288,12 +304,6 @@ ul.button-mid{ width: 100%; height: 100%; } - .banner-pager { - right: 1em; - top: -2em; - z-index: 100; - display: none; - } .button-mid{ z-index: 101; } @@ -320,7 +330,6 @@ ul.button-mid{ // width: auto; max-width: unset; // transform: translateX(-9%); - height: 100vh; } } &,& .jp-jplayer{ @@ -474,25 +483,22 @@ ul.button-mid{ // Widget 3 .ba-banner-widget-3 { -.banner-pager .active-slide a { - background: $theme-color-second !important; -} - - .w-ba-banner__wrap { + overflow: hidden; + border-radius: 2em; + .w-ba-banner__image { width: 100%; + height: auto; } - .w-ba-banner__slide { + .youtube, .cycle-youtube { width: 100%; - position: relative; + height: 100%; } - .banner-pager { - right: 0; - bottom: 2em; - li { height: unset; width: unset; } + object, embed { + width: 100%; + height: 100%; } - ul.button-mid { display: none; } } //Widget 4 diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index f25a090..01a47e8 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -2306,6 +2306,10 @@ img.w-annc__img { } //widget 15 .widget-announcement-15 { + .w-annc__item_inner{ + -webkit-box-shadow: 0 1px 2px 0 #0000002e; + box-shadow: 0 1px 2px 0 #0000002e; + } .cycle-carousel-wrap { align-items: stretch; } @@ -2354,10 +2358,9 @@ img.w-annc__img { // } .w-annc__img-wrap { - margin: 0; overflow: hidden; - border: 2px solid #333; + aspect-ratio: 16 / 9; aspect-ratio: 16 / 9; // @media(min-width:480px)and(max-width:820px){ // height: 9.5em; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index ea006ac..c527611 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -78,6 +78,29 @@ //固定選單 .navFixed { + @media (max-width: 768px) { + .site-logo { + display: block!important; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + -ms-transition: all .3s ease; + -o-transition: all .3s ease; + transition: all .3s ease; + height: 40px !important; + width: auto !important; + } + .default_site_h1{ + padding: 0.5em !important; + } + .navbar-header .default_site_h1>*{ + display: none; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + -ms-transition: all .3s ease; + -o-transition: all .3s ease; + transition: all .3s ease; + } + } .dropdowns{ background-image: none!important; } @@ -228,7 +251,8 @@ div#layout-navigation.show { .modules-menu-level-0 { width: 100%; padding: 0; - align-items: center; + align-items: center; + justify-content: space-between; @media (min-width:769px)and(max-width: 1200px){ display: flex; flex-wrap: wrap; diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss index 6789b2c..985dbd5 100644 --- a/assets/stylesheets/template/modules/universal-table.scss +++ b/assets/stylesheets/template/modules/universal-table.scss @@ -4,6 +4,10 @@ .universal-th-text{ white-space: pre; } +.btn-info { + background-color: #157d9d; + border-color: #157d9d; +} .universal-table-index h3 { padding: 0; } diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss index c1ec642..4f98c88 100644 --- a/assets/stylesheets/template/modules/video.scss +++ b/assets/stylesheets/template/modules/video.scss @@ -453,7 +453,7 @@ font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif; font-weight: normal; letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.6; cursor: pointer; } @@ -707,7 +707,7 @@ .movie_desc{ clear: both; letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.8; } .video_title { @@ -727,7 +727,7 @@ clear: both; } .video_group_time{ - color: #8f8f8f!important; + color: #707070!important; } .movietitle{ margin-bottom: 15px; @@ -905,7 +905,7 @@ } .video_desc{ letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.6; max-height: 5em; } diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index f62ad79..b849988 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -72,7 +72,11 @@ vertical-align: top; } .widget-link { - margin-bottom: 1em; + margin-bottom: 1em; + margin-top: 1em; + .widget-link__more{ + display: none; + } } .morebken{ font-size: 1.2em; diff --git a/assets/stylesheets/template/widget/breadcrumb.scss b/assets/stylesheets/template/widget/breadcrumb.scss index df648a3..6ceaec1 100644 --- a/assets/stylesheets/template/widget/breadcrumb.scss +++ b/assets/stylesheets/template/widget/breadcrumb.scss @@ -7,6 +7,9 @@ // padding-left: 0.9375em!important; } } +.widget-breadcrumb{ + margin-bottom: 1em; +} .breadcrumb { @media(max-width: 768px){ padding: 0; diff --git a/home/header.html.erb b/home/header.html.erb index 3cee11c..078cf5f 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -38,7 +38,7 @@ -
+