diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 7a54bfd..4f2892f 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -3216,6 +3216,68 @@ function fixYoutubeiframeTitle() { $(document).ready(function () { setTimeout(fixYoutubeiframeTitle, 500); +}); +$(function() { + function fixOrbitBarLabelToButton() { + setTimeout(function() { + var $label = $('label[for="open-orbit-nav"]'); + if ($label.length === 0) return; + + // ✅ 建立 button 取代 label + var $btn = $(''); + $btn.attr({ + 'type': 'button', + 'id': 'open-orbit-nav-btn', + 'aria-label': $label.attr('aria-label') || '全站搜尋及語言切換選單', + 'aria-haspopup': 'true', + 'aria-expanded': 'false', + 'aria-controls': 'orbit-bar-inner', + 'title': $label.attr('title') || '全站搜尋及語言切換選單', + 'tabindex': '0' + }); + $btn.html($label.html()); + $btn.addClass($label.attr('class') || ''); + + // ✅ 複製原本 label 的樣式 + $btn.attr('style', $label.attr('style') || ''); + + // ✅ 替換 label + $label.replaceWith($btn); + + // ✅ 取得 checkbox 狀態同步 aria-expanded + var $checkbox = $('#open-orbit-nav'); + + function syncAriaExpanded() { + var isChecked = $checkbox.prop('checked'); + $('#open-orbit-nav-btn').attr('aria-expanded', isChecked ? 'true' : 'false'); + } + + // ✅ button 點擊時觸發 checkbox toggle,並同步 aria-expanded + $(document).on('click', '#open-orbit-nav-btn', function() { + $checkbox.prop('checked', !$checkbox.prop('checked')); + syncAriaExpanded(); + }); + + // ✅ Enter / Space 鍵觸發 + $(document).on('keydown', '#open-orbit-nav-btn', function(e) { + if (e.which === 13 || e.which === 32) { + e.preventDefault(); + $(this).trigger('click'); + } + }); + + // ✅ 監聽 checkbox 變化(可能有其他地方觸發)同步狀態 + $checkbox.on('change', function() { + syncAriaExpanded(); + }); + + // ✅ 初始化同步 + syncAriaExpanded(); + + }, 500); + } + + fixOrbitBarLabelToButton(); }); // 執行 member等高計算,目前改用flexbox故mark掉 by ika 20160105 // $(window).load(function() { diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index f62cab1..0801304 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -1,6 +1,37 @@ @charset "utf-8"; @import "../initial"; +@media (max-width: 540px) { + body #orbit-bar .orbit-bar-inner>button { + border-color: #fff; + color: #fff; + } +} +@media (max-width: 767px) { + #orbit-bar .orbit-bar-inner>button { + display: block; + } +} +@media(max-width: 767px) { + #orbit-bar .orbit-bar-inner>button { + position: absolute!important; + float: none!important; + } +} +#orbit-bar .orbit-bar-inner>button { + background: transparent; + position: relative; + float: left; + width: 23px; + height: 23px; + margin-top: 7px; + padding: 0 1px 0 0; + color: #999999; + text-align: center; + border: 1px solid #999999; + border-radius: 3px; + cursor: pointer; +} .fc-cal-date-selected-fusion { font-size: 1em!important; } @@ -17,12 +48,12 @@ a { text-decoration: none; padding: 10px; - border: 1px solid #0a9a9a; - background: #0a9a9a; + border: 1px solid #047171; + background: #047171; color: #fff; margin-right: 1em; &:hover{ - color: #0a9a9a!important; + color: #047171!important; background: #fff; } } diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 6ce70aa..aefce66 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -148,7 +148,7 @@ @extend .unity-title; } .link { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ -.txt { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ +.txt { background-color: #2a7e31 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .xlsx { background-color: #9e3050 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .pdf { background-color: #2a7d36 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .docx { background-color: #5e46a0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ @@ -157,7 +157,7 @@ .jpg { background-color: #8f3333 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .zip { background-color: #8a6400 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .rar { background-color: #9e5000 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ -.xls { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ +.xls { background-color: #2a7e31 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .odt { background-color: #767676 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .table>caption+thead>tr:first-child>td, .table>caption+thead>tr:first-child>th, .table>colgroup+thead>tr:first-child>td, .table>colgroup+thead>tr:first-child>th, .table>thead:first-child>tr:first-child>td, .table>thead:first-child>tr:first-child>th{ // border-top: 0.0625em solid #ddd; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 38cf316..8dedaba 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -200,7 +200,7 @@ z-index: 1020; li { - padding: 1em; + padding: 0.5em; list-style: none; } .menu-drop.opened { diff --git a/modules/member/member_index3.html.erb b/modules/member/member_index3.html.erb index 9ce87f1..215f679 100644 --- a/modules/member/member_index3.html.erb +++ b/modules/member/member_index3.html.erb @@ -8,7 +8,7 @@