diff --git a/assets/stylesheets/template/base/_accesskey.scss b/assets/stylesheets/template/base/_accesskey.scss index 065e503..3523ed3 100644 --- a/assets/stylesheets/template/base/_accesskey.scss +++ b/assets/stylesheets/template/base/_accesskey.scss @@ -7,7 +7,7 @@ a[accesskey] { } #orbit-bar a[accesskey] { - color: #525252; + color: #333; margin-left: 0; position: relative; &:hover { diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 812fed1..22f2653 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -82,7 +82,7 @@ a[href="/en/sitemap"]{ } blockquote{ - color: #525252; + color: #333; padding: 0; margin: 0; font-size: unset; @@ -97,7 +97,7 @@ a[href="/en/sitemap"]{ display: none; } a{ - color: #525252; + color: #333; text-decoration: none; display: inline-block; height: 40px; diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 4c32f13..74385e0 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -131,7 +131,7 @@ transform: rotate(45deg); float: left; i{ - color: #525252; + color: #333; font-size: 1em!important; padding: 0!important; } diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 9a1f1b9..8f19334 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -97,22 +97,22 @@ position: relative; width: 100%; // background-image: linear-gradient(280deg, #e6e6e6 56%, #fff 0); - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .contentwrap2{ overflow: hidden; position: relative; width: 100%; - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .contentwrap3{ overflow: hidden; position: relative; width: 100%; - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .iconwrap{ padding: 4em 0 0; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index cd811f2..c516c8a 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -4,6 +4,10 @@ #orbit-bar .orbit-bar-title a { color: #333 !important; } +sup { + line-height: 0; + font-size: 0.6em; +} .outdropdowns{ width: 100%; z-index: 1; @@ -103,6 +107,38 @@ .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ display: flex; align-items: center; +} +.default_site_h1 { + display: flex; + align-items: center; + font-size: 1rem; + font-weight: normal; + margin: 0; + color: $theme-color-second; + @media(max-width:1300px){ + flex-wrap: wrap; + } + strong { + display: flex; + flex-direction: column; + justify-content: center; + border-left: 1px solid rgba($theme-color-second, 0.2); + padding-left: 1em; + margin-left: 0.5em; + line-height: 1; + font-weight: normal; + span { + font-size: 1.2em; + font-weight: bold; + display: block; + } + } + + sup { + font-size: 0.65em; + color: #6a6a6a; + align-self: flex-end; + } } .navbar-header { z-index: 10; @@ -122,6 +158,7 @@ line-height: 2.125em; color: $theme-color-main; font-family: $main-font; + display: block; // align-items: center; // display: flex; @media (min-width: 769px){ diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 2a4e653..3846acb 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -386,7 +386,7 @@ ul.button-mid{ .ad-overlay { padding:1em; position: relative; - background: $theme-color-second; + background: $theme-color-second!important; } .controlplay { right: 0; @@ -628,6 +628,9 @@ ul.button-mid{ // widget8 .ba-banner-widget-8 { position: relative; + .banner-overlay{ + background:$theme-color-second; + } // ✅ mp4 jPlayer 修正：讓 jplayer_slide 有固定高度，不繼承 wrap 的 padding-bottom 0 .jplayer_slide { diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 5785803..d264ff5 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -417,10 +417,10 @@ display: block; font-family: $main-font; font-weight: 600; - color: #525252; + color: #333; font-size: 1em; @media(max-width: 768px){ - color: #525252; + color: #333; } } @@ -470,7 +470,7 @@ & > a { display: block; font-family: $main-font; - color:#525252; + color:#333; font-weight: 500; font-weight: bold; } diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index 6983ed2..f62ad79 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -10,6 +10,13 @@ } } } +.modules-menu{ + @media(min-width:769px){ + .widget-content{ + width: 100%!important; + } + } +} .liWrapper{ position: relative; } @@ -139,6 +146,7 @@ .widget-content { border-radius: 1em; overflow: hidden; + padding: 0; &:hover{ transition: all 0.3s; background-color: rgba($theme-color-second, 0.1); diff --git a/home/index.html.erb b/home/index.html.erb index 62de7a8..fbcd081 100644 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -11,7 +11,7 @@
-
+
@@ -113,7 +113,11 @@
- +
+
+
+
+
<%= render_footer %> diff --git a/modules/ad_banner/_ad_banner_widget8_video.html.erb b/modules/ad_banner/_ad_banner_widget8_video.html.erb index 6303059..3403ddb 100644 --- a/modules/ad_banner/_ad_banner_widget8_video.html.erb +++ b/modules/ad_banner/_ad_banner_widget8_video.html.erb @@ -398,6 +398,12 @@ $(this).addClass('active'); $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active'); }); + $('[data-subpart-id="{{subpart-id}}"] .next-button').click(function(){ + $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next"); + }) + $('[data-subpart-id="{{subpart-id}}"] .prev-button').click(function(){ + $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev"); + }) }); /* 修正點：處理 Pager 無障礙朗讀文字 */ $('.cycle-slideshow').on('cycle-post-initialize', function(event, optionHash) { diff --git a/modules/announcement/_annc_widget22.html.erb b/modules/announcement/_annc_widget22.html.erb index b1d48fd..e80d594 100644 --- a/modules/announcement/_annc_widget22.html.erb +++ b/modules/announcement/_annc_widget22.html.erb @@ -34,7 +34,7 @@ {{status}}

- {{title}} + {{title}}

{{subtitle}}

diff --git a/modules/announcement/_annc_widget5.html.erb b/modules/announcement/_annc_widget5.html.erb index 8ecca3e..86dc57d 100644 --- a/modules/announcement/_annc_widget5.html.erb +++ b/modules/announcement/_annc_widget5.html.erb @@ -20,7 +20,7 @@ {{status}} - {{title}} + {{title}}

{{subtitle}}

{{orbithashtags}}