標籤 (避免 display:none 的舊文字干擾無障礙檢測) $logoLink.find('p').remove(); @@ -2563,6 +2764,110 @@ $(function() { setTimeout(function() { fixLogoLinkToOfficial(); }, 500); +}); +$(document).ready(function () { + setTimeout(function () { + $('iframe.twitter-share-button, iframe.twitter-tweet-button').each(function () { + $(this).attr('title', '分享至 X 在新視窗開啟'); + }); + }, 1500); +}); +//orbitbarlogo無障礙 +$(function() { + var $logo = $('.orbit-bar-logo'); + var $inner = $logo.contents().not('p'); + + var $span = $('').addClass('orbit-bar-logo').append($inner); + $logo.replaceWith($span); +}); +//orbitbar登入無障礙 +$(function() { + var $loginWindow = $('.login-window'); + var $checkbox = $('#open-orbit-login'); + + // login-window 顯示時，焦點移到 label.close + $checkbox.on('change', function() { + if ($(this).is(':checked')) { + setTimeout(function() { + $('.login-window .login-header label.close').focus(); + }, 50); + } + }); + + // login-window 失去焦點時，關閉並還原焦點 + $loginWindow.on('focusout', function() { + var $thisWindow = $(this); + setTimeout(function() { + // document.hasFocus() 為 false 代表焦點移到瀏覽器外（開發者工具、右鍵選單等），不關閉 + if (!document.hasFocus()) return; + + if (!$thisWindow.is(':focus-within') && $checkbox.is(':checked')) { + $(".orbit-bar-logo").one("focusin", function() { + if (window.orbit_login_button) { + window.orbit_login_button.focus(); + } + }); + $checkbox.click(); + } + }, 500); + }); +}); +//gallery層級問題 +$(function() { + var target = document.getElementById('gallery-theater-stage'); + if (!target) return; + + var observer = new MutationObserver(function() { + var display = target.style.display; + if (display === 'block') { + $('.verticalhome').css('z-index', '2000'); + } else if (display === 'none') { + $('.verticalhome').css('z-index', 'auto'); + } + }); + + observer.observe(target, { + attributes : true, + attributeFilter: ['style'] + }); +}); +$(document).ready(function() { + + function removeFakeLinks() { + $('a.fake_link').remove(); + } + + // 初始執行一次 + removeFakeLinks(); + + // Shift+Tab 時也執行 + $(document).on('keydown', function(e) { + if (e.key === 'Tab' && e.shiftKey) { + removeFakeLinks(); + } + }); + + // MutationObserver 監聽 DOM 變化，fake_link 一出現就移除 + var observer = new MutationObserver(function(mutations) { + mutations.forEach(function(mutation) { + mutation.addedNodes.forEach(function(node) { + // 直接是 fake_link + if ($(node).is('a.fake_link')) { + $(node).remove(); + } + // 或其子元素內含 fake_link + if ($(node).find) { + $(node).find('a.fake_link').remove(); + } + }); + }); + }); + + observer.observe(document.body, { + childList: true, + subtree: true + }); + }); // 執行 member等高計算，目前改用flexbox故mark掉 by ika 20160105 // $(window).load(function() { diff --git a/assets/stylesheets/template/base/_accesskey.scss b/assets/stylesheets/template/base/_accesskey.scss index da97b15..b99bd43 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: #666666 !important; + color: #666666; margin-left: 0; position: relative; &:hover { diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 9c3bc91..f2bc0ca 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -2,8 +2,9 @@ @import "../initial"; @import "variables"; -#orbit-bar .orbit-bar-title a{ - color: #333!important; + +.fa-classic, .fa-regular, .fa-solid, .far, .fas ,.fa{ + font-family: var(--fa-style-family, "FontAwesome"); } #orbit-bar .orbit-bar-inner > label:focus, #orbit-bar .orbit-bar-inner > label.focus{ .orbit-bar-search-sign-language{ @@ -11,6 +12,48 @@ } } +.login-btn:focus { + outline: 0.3125em auto -webkit-focus-ring-color !important; + transition: all 0.2s ease-in-out!important; +} +.orbit-bar-inner{ + li.active { + @media(min-width:768px){ + padding: 0 !important; + } + } +} +label[for="open-orbit-login"] { + @media(max-width:768px){ + display: none!important; + } +} +[accesskey="U"],[accesskey="W"]{ + @media(max-width:768px){ + color: #666!important; + } +} +.orbit-bar-inner{ + [accesskey="U"]{ + height: 40px; + display: inline-block!important; + line-height: 40px; + float: left; + @media(min-width:769px){ + color: #fff!important; + } + } + [accesskey="W"]{ + height: 40px; + display: inline-block!important; + line-height: 40px; + float: left; + color: #fff!important; + @media(min-width:769px){ + color: #fff!important; + } + } +} .orbit-bar-search-sign-language{ @media(max-width:767px){ position: absolute !important; @@ -126,7 +169,7 @@ a.btn-primary { &:hover { color: #fff; // box-shadow:$theme-color-third 0 0px 0px 40px inset; - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00; } } .theadsearch2{ diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index c468af2..06dd565 100644 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -2,7 +2,7 @@ @import "variables"; .go-back-top-inner{ - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00; clip-path: polygon(25% 5.77%, 75% 5.77%, 100% 50%, 75% 94.23%, 25% 94.23%, 0% 50%); padding: 1em; } diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index ef8bd7b..d80ffa0 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -21,6 +21,9 @@ $theme-color-third: #ec6641; $theme-color-green: #ec6641; $theme-color-hover:#00437c; +.fa, .fa-classic, .fa-regular, .fa-solid, .far, .fas { + font-family: "Font Awesome 6 Free", FontAwesome; +} // Font stacks $main-font: "Noto Sans TC", sans-serif; $sub-font: "Noto Sans TC", sans-serif; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 5c59063..16b5f57 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -54,7 +54,7 @@ i.kenmenu-drop.fa-solid.fa-chevron-down { list-style: none; } a[accesskey] { - position: absolute; + position:relative; } .container { diff --git a/assets/stylesheets/template/layout/nfudesign.scss b/assets/stylesheets/template/layout/nfudesign.scss index 25f706f..96c8f1d 100644 --- a/assets/stylesheets/template/layout/nfudesign.scss +++ b/assets/stylesheets/template/layout/nfudesign.scss @@ -155,6 +155,6 @@ --bs-card-bg: transparent; } .card:before{ - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641!important; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00!important; } } \ No newline at end of file diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index ca3ad70..988b5d3 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -39,6 +39,15 @@ ul.button-mid{ .banner-pager .active-slide button{ background: $theme-color-second!important; } +.w-ba-banner .button-mid { + position: absolute; + width: 100%; + height: 0; + top: 50%; +} +.next-button, .prev-button { + cursor: pointer; +} iframe{ border: none; } @@ -349,8 +358,8 @@ ul.button-mid{ } .banner-overlay{ padding: 3.5em 5em; - background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); - -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000); + background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); + -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); behavior: url("/assets/ie_support/PIE2/PIE.htc"); position: absolute; z-index: 99; @@ -630,8 +639,8 @@ ul.button-mid{ .banner-overlay{ color: #fff; padding: 3.5em 5em; - background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); - -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000); + background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); + -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); behavior: url("/assets/ie_support/PIE2/PIE.htc"); .ad-overlay2{ margin: 0 3em; @@ -667,8 +676,8 @@ ul.button-mid{ .ba-banner-widget-10 { .w-ad-banner__caption{ padding: 2em 1em; - background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); - -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000); + background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); + -pie-background: linear-gradient(180deg, transparent 0, #00000066 40%, #000000a3); behavior: url("/assets/ie_support/PIE2/PIE.htc"); position: absolute; width: 100%; diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index ab7c006..e7e0c85 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -535,6 +535,7 @@ } li{ list-style: none; + margin-bottom: 0.5em; } } .index-archive-15{ diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index af22552..54e431a 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -84,18 +84,18 @@ tr.i-member-tr-head { .i-member-pic-wrap{ overflow: hidden; } -.i-member-item{ - &:hover{ - img{ - transform: scale(1.1) !important; - -webkit-transition: .3s ease-out; - -moz-transition: .3s ease-out; - -ms-transition: .3s ease-out; - -o-transition: .3s ease-out; - transition: .3s ease-out; - } - } -} +// .i-member-item{ +// &:hover{ +// img{ +// transform: scale(1.1) !important; +// -webkit-transition: .3s ease-out; +// -moz-transition: .3s ease-out; +// -ms-transition: .3s ease-out; +// -o-transition: .3s ease-out; +// transition: .3s ease-out; +// } +// } +// } // Index 1 .index-member-1 { .i-member__status-title { diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index c7a0d33..d7e4f38 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -437,7 +437,7 @@ } &:hover { - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00; @media(max-width: 769px){ a,i { color:#fff; @@ -557,13 +557,13 @@ } .navbar-toggle { position: absolute; - left: 0; + left: 1em; background: transparent; top: 40px; z-index: 1; - height: 100vh; + height: 93vh; margin: 0; - width: 20%; + width: 13%; border: 0; } .cover { diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index dbff8d8..fa9301a 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -481,7 +481,7 @@ color: #fff; } &:hover{ - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00; } & + .widget-content { diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index fb2db05..506338c 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -39,7 +39,7 @@ margin-right: 1%; margin-bottom: 0.5em; cursor: pointer; - background: radial-gradient(circle at 60% 90%, #dea797, transparent 60%), radial-gradient(circle at 10px 10px, #eb8467, transparent 25%), #ec6641; + background: radial-gradient(circle at 60% 90%, #ea8466, transparent 60%), radial-gradient(circle at 10px 10px, #e66c4a, transparent 25%), #cc3d00; border-radius: 2em; behavior: url("/assets/ie_support/PIE2/PIE.htc"); color: #fff; diff --git a/home/footer.html.erb b/home/footer.html.erb index 91297ee..e6b93f3 100644 --- a/home/footer.html.erb +++ b/home/footer.html.erb @@ -2,7 +2,7 @@ diff --git a/modules/ad_banner/_ad_banner_widget2.html.erb b/modules/ad_banner/_ad_banner_widget2.html.erb index aaae810..ac56ff4 100644 --- a/modules/ad_banner/_ad_banner_widget2.html.erb +++ b/modules/ad_banner/_ad_banner_widget2.html.erb @@ -41,10 +41,10 @@ <%= I18n.t("ad_banner.pause") %>
<%= I18n.t("ad_banner.pause") %>