diff --git a/assets/images/bgdark.png b/assets/images/bgdark.png index f2f9e52..f82a7e4 100644 Binary files a/assets/images/bgdark.png and b/assets/images/bgdark.png differ diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 67e8612..2c55563 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -992,7 +992,7 @@ var isLinkImage = $parentA.length > 0 && $parentA.text().replace(/\u00a0/g, '').trim() === ""; // --- 1. 處理「裝飾性圖片」標註 --- - if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片" || currentAlt === "這是一張圖片" || currentTitle === "這是一張圖片") { + if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片" || currentAlt === "這是一張圖片" || currentTitle === "這是一張圖片"||currentAlt === "This is a image" ||currentTitle === "This is a image") { $img.attr('alt', ''); $img.removeAttr('title'); return; @@ -2183,6 +2183,28 @@ $(function() { // 預設 aria-expanded 為 false $(".searchbtn2").attr("aria-expanded", "false"); }); + //searchbtn2 Tab 鍵聚焦時自動展開 .searchbox + $(document).ready(function() { + function fixSearchbtn2FocusA11y() { + setTimeout(function() { + $('.searchbtn2').on('focus', function() { + var $searchbox = $('.searchbox'); + + // ✅ 只在收合狀態時才展開，不影響已展開的狀態 + if (!$searchbox.is(':visible')) { + $searchbox.slideDown(300, function() { + // ✅ 同步更新 aria-expanded（與原本 click 邏輯一致） + $('.searchbtn2').attr('aria-expanded', 'true'); + // ✅ 同步加上 ken-click2（與原本 click 邏輯一致） + $('.searchbtn2').closest('.ken-click').addClass('ken-click2'); + }); + } + }); + }, 500); + } + + fixSearchbtn2FocusA11y(); + }); // 強制保持全站search展開 $(document).ready(function () { @@ -3340,6 +3362,11 @@ $(function() { }); //gallery層級問題 $(function() { + // 若 .verticalhome 一開始已被加上 z-index: 2000 則移除 + if ($('.verticalhome').css('z-index') === '2000') { + $('.verticalhome').css('z-index', ''); + } + var target = document.getElementById('gallery-theater-stage'); if (!target) return; diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 4694bf8..c8c4b5e 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -102,17 +102,39 @@ -o-transition: all 0.5s; } +.search_widget{ + font-size: 1em!important; +} .status { font-family: $main-font; font-size: 0.750em; } .status-top { - background-color: $theme-color-main; + border-radius: 1em!important; + display: flex; + justify-content: center; + align-items: center; + transform: rotate(45deg); + float: left; + i{ + color: #a2a2a2!important; + font-size: 1em!important; + padding: 0!important; + } } .status-hot { - background-color: $theme-color-third; + border-radius: 1em!important; + display: flex; + justify-content: center; + align-items: center; + float: left; + i{ + color: #c60000!important; + font-size: 1em!important; + padding: 0!important; + } } .status-source { @@ -124,4 +146,14 @@ } ol, ul{ padding-left: 1.6em; + text-align: left; +} +ul{ + li { + list-style: disc; + } +} +ol{ + padding-left: 1.6em; + text-align: left; } diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 007ae2f..ec3adb5 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -29,43 +29,45 @@ $sub-font: "Noto Sans TC", sans-serif; // Font sizes $font-15: 0.9375rem; $font-13: 0.8125rem; - -$font-h1: 2rem; -$font-h2: 1.8rem; +// $font-h1: 2rem; +// $font-h2: 1.8rem; +// $font-h3: 1.3rem; +// $font-h4: 1rem; +// $font-h5: 0.9rem; +// $font-h6: 0.85rem; +$font-h1: 1.8rem; +$font-h2:1.3rem; $font-h3: 1.3rem; -$font-h4: 1rem; -$font-h5: 0.9rem; -$font-h6: 0.85rem; +$font-h4: 0.9rem; +$font-h5: 0.85rem; +$font-h6: 0.75rem; h1{ - font-size:2rem; - @media(max-width:$screen-xs){ - font-size:2rem; - } -} -h2{ font-size: 1.8rem; @media(max-width:$screen-xs){ font-size:1.8rem; } } -h3{ +h2{ font-size:1.3rem; @media(max-width:$screen-xs){ font-size:1.3rem; } } -h4{ +h3{ font-size: 1rem; @media(max-width:$screen-xs){ font-size:1rem; } } -h5{ +h4{ font-size: 0.9rem; } -h6{ +h5{ font-size: 0.85rem; } +h6{ + font-size: 0.75rem; +} // $font-h1: 1.8rem; // $font-h2: 1.5rem; // $font-h3: 1.2rem; diff --git a/assets/stylesheets/template/layout/bo5.scss b/assets/stylesheets/template/layout/bo5.scss index 9e96402..35675ca 100644 --- a/assets/stylesheets/template/layout/bo5.scss +++ b/assets/stylesheets/template/layout/bo5.scss @@ -309,31 +309,6 @@ a { .i-annc__content-wrap{ padding: 0.5em; } -.index-announcement-7{ - .i-annc__item{ - &:hover{ - -webkit-transition: .6s all ease; - -o-transition: .6s all ease; - transition: .6s all ease; - -webkit-transform: translateY(-6px); - -ms-transform: translateY(-6px); - transform: translateY(-6px); - .i-annc__content-wrap{ - background: radial-gradient(circle at 70% 80%, #66a9e2b3, transparent 60%), radial-gradient(circle at 1% 1%, #fb8f72, transparent 30%), radial-gradient(circle at 50% 50%, #3c78ff4d, transparent 70%), linear-gradient(135deg, #2b7bbe 0%, #00437c 80%, #fb8f72 100%); - color: #fff !important; - .i-annc__title,.i-annc__postdate-wrap,.i-annc__category-wrap,.i-annc__subtitle,i{ - color: #fff !important; - } - } - } - } - .i-annc__content-wrap{ - margin-top: 0; - } - .i-annc__img-wrap{ - margin: 0 0.5em!important; - } -} .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0,0); diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 63f8d83..99a8a83 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -588,6 +588,7 @@ } .btn-warning{ background-color: $theme-color-second; + color: #fff; } .row{ @media(max-width:768px){ @@ -729,9 +730,12 @@ a.line-it-button{ margin-left: -2em; margin-right: -2em; } - @media(max-width:768px){ + @media(max-width:767px){ .col-sm-3{ padding: 0!important; } } +} +.flowcontent{ + display: none!important; } \ No newline at end of file diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 20a6dbe..26590d1 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -10,6 +10,9 @@ background: url(/assets/bgdark.png) repeat; background-size: contain; color: #fff; + @media(max-width:480px){ + background-size: cover; + } .widget-title{ color: #ffa9da; } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 1c1aed0..8f27a59 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -33,7 +33,6 @@ a[href="/en/sitemap"]{ z-index: 1; padding:0; padding-bottom: 5em; - top:0; } .nav_ul{ padding: 0; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index f44f084..8bc635b 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -8,6 +8,9 @@ // Widget // ## gerenral styles +.w-ba-banner { + position: relative; +} ul.button-mid{ margin:0; } @@ -228,7 +231,7 @@ ul.button-mid{ .ba-banner-widget-0 { .w-ba-banner__wrap{ .w-ad-banner__image{ - height: 95vh !important; + height: 86vh !important; position: relative; @media(max-width:768px){ height: 40vh !important; @@ -239,7 +242,7 @@ ul.button-mid{ } } @media(min-width:769px){ - height: 95vh !important; + height: 86vh !important; } z-index: 0; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 6eafe8b..fa93f8e 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -365,6 +365,9 @@ .w-annc__item{ padding: 0.5em; margin: 0!important; + @media(max-width:768px){ + width: 100%!important; + } } .w-annc__item_inner{ -webkit-transition: .3s all ease; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index fa5191e..607e387 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -383,6 +383,8 @@ &:hover { .modules-menu-level-1 { + overflow: auto; + max-height: 90vh; display: block; transition-duration: opacity 0.3s cubic-bezier(0.48, 0.01, 0.5, 0.99),visibility 0.1s linear; diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss index cbd1bb0..b21d034 100644 --- a/assets/stylesheets/template/modules/video.scss +++ b/assets/stylesheets/template/modules/video.scss @@ -551,7 +551,7 @@ .pager-controls{ position: absolute; right: 1em; - bottom: 1em; + bottom: 0; z-index: 100; width: auto; .prev-btn,.next-btn{ diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index cf8448d..e146bf5 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -56,13 +56,7 @@ input:hover { .container{ margin: auto; } -// .layout-content{ -// .response-container{ -// @media (min-width: 769px)and(max-width: 820px) { -// width: 768px!important; -// } -// } -// } + .internalfullwidth{ @media(min-width: 1280px){ transform: translateX(calc(-50vw + 685px)); @@ -120,95 +114,44 @@ input:hover { } .extra { clear: both; } -// .tab-content .tab-pane { - -// display: block !important; - -// height: 0; - -// overflow: hidden; - -// } -// .tab-content .tab-pane.active { - -// height: auto; - -// overflow: visible; - -// } -// .tab-content .tab-pane { - -// display: block !important; - -// height: 0; - -// overflow: hidden; - -// } -// .tab-content .tab-pane.active { - -// height: auto; - -// overflow: visible; - -// } //公告頁籤 -ul.tab_nav { +ul.tab_nav,.nav_tabs_filter { list-style-type: none; padding: 0; display: flex; flex-wrap: wrap; justify-content: center; font-family: $main-font; - width: 100%; li { - font-size: 1em; list-style: none; position: relative; - padding: 0.5em 1em; - margin: 0.2em; + padding:0.5em 1em; + margin: 0.5em; cursor: pointer; transition: all 0.5s; -moz-transition: all 0.5s; -webkit-transition: all 0.5s; -o-transition: all 0.5s; color: #5e5e5e; - background: none; - border-radius: 0; + box-shadow: 0px 6px 20px 0px #64646f33; + border-radius: 3em; border: none; @media(max-width:$screen-xs){ + width:40%; text-align: center; } - &:before, - &:after{ - content:''; - position:absolute; - top:0; - right:0; - height:2px; - width:0; - background: $theme-color-second; - transition: all 0.3s; - } - &:after{ - right:inherit; - top:inherit; - left:0; - bottom:2px; - } &:hover{ - color: $theme-color-second; - background: transparent; - box-shadow:none; + color: #fff; + background: $theme-color-third; &:after,&:before{ width:100%; transition: all 0.3s; } } &.active { - color: $theme-color-second; - background: none; + color: #fff; + background: $theme-color-third; &:before, &:after{ width:100%; @@ -439,16 +382,17 @@ ul.tab_nav { } } tr{ - @media(max-width: 1200px){ display: flex; flex-wrap: wrap; width: 100%!important; + @media(max-width: 1200px){ + } } td,th{ @media(max-width: 768px){ - width:50%!important; + width:100%!important; a{ padding: 0.5rem 1.25rem!important; flex-wrap: wrap; @@ -1342,4 +1286,12 @@ hr{ to { transform: translateX(-200%); } +} +.aa{ + #chatbot-box{ + padding: 0; + @media(min-width:769px){ + right: 3em; + } + } } \ No newline at end of file diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb index 4fd1ae4..6f9593d 100644 --- a/modules/web_resource/_web_res_widget2.html.erb +++ b/modules/web_resource/_web_res_widget2.html.erb @@ -9,10 +9,10 @@ {{img_description}}
- {{title}} {{status}} + {{title}}
diff --git a/modules/web_resource/_web_res_widget5.html.erb b/modules/web_resource/_web_res_widget5.html.erb index 4342338..003bb9d 100644 --- a/modules/web_resource/_web_res_widget5.html.erb +++ b/modules/web_resource/_web_res_widget5.html.erb @@ -1,6 +1,6 @@
-

+

{{widget-title}}

@@ -11,12 +11,14 @@ data-cycle-carousel-rwd-json="{768: 1}" data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
  • -
    - {{img_description}}
    +     + {{img_description}}
    +
    + {{title}} +
    +
    -
    {{title}}
    -
    • @@ -48,4 +50,15 @@ .widget-link.widget-5 .button-mid .fa{ cursor: pointer; } + .webtitle{ + display:none; + } + .widget-5{ + .prev-button{ + left: -0.5rem!important; + } + .next-button{ + right:-0.5rem!important; + } + } \ No newline at end of file diff --git a/modules/web_resource/_web_res_widget7.html.erb b/modules/web_resource/_web_res_widget7.html.erb index e4a72cc..15639dc 100644 --- a/modules/web_resource/_web_res_widget7.html.erb +++ b/modules/web_resource/_web_res_widget7.html.erb @@ -9,10 +9,10 @@ {{img_description}}
    - {{title}} {{status}} + {{title}}
    diff --git a/modules/web_resource/_web_res_widget8.html.erb b/modules/web_resource/_web_res_widget8.html.erb index 963f44c..36cd905 100644 --- a/modules/web_resource/_web_res_widget8.html.erb +++ b/modules/web_resource/_web_res_widget8.html.erb @@ -9,10 +9,10 @@ {{img_description}}
    - {{title}} {{status}} + {{title}}