diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index b238806..d226da7 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -964,7 +964,7 @@ $(this).append('網路資源標題'); } }); - $('input').each(function() { + $('input.input-search, .search-container input, .search-box input, #search input').each(function() { var $this = $(this); if (!$this.attr('title') || $this.attr('title').trim() === '') { $this.attr('title', '網內搜尋'); @@ -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 () { @@ -3075,11 +3097,6 @@ $(document).ready(function() { // 執行修復功能 fixVideoPosterAlt(); }); -//網站導覽換icon -// $(document).ready(function() { -// $('a[href="/zh_tw/sitemap"]').html(''); -// $('a[href="/en/sitemap"]').html('') -// }); //#tdstylesp表格樣式 $(function () { $('#tdstylesp').each(function () { @@ -3114,11 +3131,6 @@ function fixCarouselBtnA11y() { $('.carousel_images .w-ba-banner ~ div .button-mid').remove(); }, 500); } -$(document).ready(function () { - setTimeout(function () { - $('.dtr-control').removeAttr('tabindex'); - }, 500); -}); //cycle2無障礙 $(document).ready(function() { // 取得頁面上所有的 Cycle2 輪播圖 @@ -3357,6 +3369,7 @@ $(function() { attributeFilter: ['style'] }); }); +//fake_link問題 $(document).ready(function() { function removeFakeLinks() { @@ -3435,7 +3448,7 @@ function fixSortLinkA11y() { }); } function fixSearchInputA11y() { - $('input[type="search"], input[type="text"]').each(function () { + $('input[type="search"], input.input-search, .search-container input, .search-box input').each(function () { var $input = $(this); // 已有對應 label 就跳過 @@ -3675,7 +3688,6 @@ function fixGalleryViewLinkA11y() { $a.find('i, svg').attr('aria-hidden', 'true'); }); } - $(document).ready(function () { // 比 fixAccessibilityAll 的 800ms 晚，確保最後執行 setTimeout(fixGalleryViewLinkA11y, 2000); diff --git a/assets/stylesheets/template/base/_ckeditor-reset.scss b/assets/stylesheets/template/base/_ckeditor-reset.scss index 7254379..0c6ea3c 100644 --- a/assets/stylesheets/template/base/_ckeditor-reset.scss +++ b/assets/stylesheets/template/base/_ckeditor-reset.scss @@ -29,7 +29,8 @@ body[data-module="page_content"] { } table { - border-collapse: collapse; + // border-collapse: collapse; + border-collapse: unset; width: 100%; } diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index af1b877..d2d1a5f 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -241,4 +241,5 @@ iframe{ aspect-ratio: 16 / 9; height: auto !important; } -} \ No newline at end of file +} + diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index f534fe9..2ac8261 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -124,8 +124,12 @@ ol, ul{ padding-left: 1.6em; text-align: left; } +ul{ + li { + list-style: disc; + } +} ol{ padding-left: 1.6em; - display: inline-block; text-align: left; } diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 10236af..982052d 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -27,7 +27,6 @@ $sub-font: "Noto Sans TC", sans-serif; // $main-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; // $sub-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; -@font-face {font-family: "IndustryW00-Medium"; src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot"); src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff") format("woff"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.svg#IndustryW00-Medium") format("svg"); } // Font sizes $font-15: 0.9375rem; diff --git a/assets/stylesheets/template/layout/bo5.scss b/assets/stylesheets/template/layout/bo5.scss index c407107..9e96402 100644 --- a/assets/stylesheets/template/layout/bo5.scss +++ b/assets/stylesheets/template/layout/bo5.scss @@ -308,7 +308,6 @@ a { } .i-annc__content-wrap{ padding: 0.5em; - height: 100%; } .index-announcement-7{ .i-annc__item{ diff --git a/assets/stylesheets/template/layout/pagestyle.scss b/assets/stylesheets/template/layout/pagestyle.scss new file mode 100644 index 0000000..c23552c --- /dev/null +++ b/assets/stylesheets/template/layout/pagestyle.scss @@ -0,0 +1,111 @@ +@charset "utf-8"; + +@import "../initial"; +.pagestyle2 { + .pbanner { + position: relative; + overflow: hidden; + + .pbanner-img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; + z-index: 1; + } + + .pbanner-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.35); + z-index: 2; + } + + .pbanner-content { + position: relative; + z-index: 3; + min-height: 25em; + padding-top: 4em; + padding-bottom: 4em; + color: #fff; + } + } + + @media (max-width: 768px) { + .rwdtext { + width: 100% !important; + } + + .rwdimg { + height: 67vh; + width: auto !important; + max-width: unset; + } + } +} +.pagestyle3 { + .gridwrapper { + heigh: 50em; + } + + .txtgrid { + --heightA: 50em; + height: calc(var(--heightA) * 0.35 - 1rem); + overflow: hidden; + } + + .imggrid { + --heightA: 50em; + height: calc(var(--heightA) * 0.65 - 1rem); + overflow: hidden; + } + + .pbanner { + position: relative; + overflow: hidden; + + .pbanner-img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; + z-index: 1; + } + + .pbanner-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: linear-gradient(0deg, rgba(200, 200, 200, 0.8), rgba(200, 200, 200, 0.8)); + z-index: 2; + } + + .pbanner-content { + position: relative; + z-index: 3; + } + } + + @media (max-width: 768px) { + .imggrid img { + width: 100% !important; + max-width: 100%; + height: auto !important; + } + + .col-sm-4, + .col-sm-6, + .col-sm-8 { + width: 100% !important; + } + } +} diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 8ec186e..1f4eb5b 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -37,7 +37,7 @@ ul.button-mid{ .banner-pager .active-slide button{ background: $theme-color-second!important; } -.w-ba-banner .button-mid { +.button-mid { position: absolute; width: 100%; height: 0; @@ -410,6 +410,9 @@ ul.button-mid{ //Widget 5 .ba-banner-widget-5 { margin: 1em 0; + .w-ba-banner__wrap{ + display: flex; + } .slide-img { padding: 0; } diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 860cf74..0206c29 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -235,6 +235,10 @@ // Widget-2 .widget-announcement-2 { + .widget-title-a-inner{ + display: block; + padding-top: 0.2em; + } // @media(min-width: 768px){ // .col-sm-4{ // width: 33.33333333%; @@ -247,9 +251,8 @@ // } .w-annc__item{ margin-bottom: 1em; - padding: 0; + padding: 0.2em; overflow: hidden; - padding-bottom: 0; &:hover{ transition: all .3s; transform: translate(-5px, -10px); @@ -259,7 +262,6 @@ } .w-annc__img-wrap { padding: 0; - aspect-ratio: 16 / 9; } .w-annc__content-wrap { @media(max-width: $screen-xs){ @@ -269,6 +271,8 @@ } .w-annc__img-wrap { margin:0; + border-radius: 0.5em; + overflow: hidden; } .w-annc__title { @@ -1250,298 +1254,6 @@ transition: height .6s; } } -//widget-25 -.widget-announcement-25 { - .w-annc__widget-title{ - span{ - display: block; - } - } - .w-annc__more-wrap{ - display: flex; - justify-content: center; - } - .btn-right,.btn-left{ - &:hover{ - background: #e5e5e5!important; - } - } - @media(min-width:1024px){ - .prevnext{ - width: 8% !important; - left: 10%; - } - display: flex; - flex-wrap: wrap; - .w-annc__more-wrap{ - width:29%; - display: flex; - justify-content: center; - } - .w-annc__list{ - width:71%; - } - } - .w-annc__item{ - padding: 0; - margin-right: 1em; - overflow: hidden; - position: relative !important; - @media(min-width: 1600px){ - height: 28em; - .w-annc__img-wrap{ - height: 28em; - } - } - @media(min-width: $screen-xs)and(max-width: 1599px){ - height: 20em; - .w-annc__img-wrap{ - height: 20em; - } - } - @media(max-width: $screen-xs){ - height: 20em; - .w-annc__img-wrap{ - height: 20em; - } - } - } - .w-annc__item{ - box-shadow:none!important; - -webkit-box-shadow:none!important; - } - .w-annc__entry-title{ - margin: 0; - width: 100%; - } - .w-annc__meta i{ - color: #fff!important; - } - .w-annc__list{ - display: flex; - justify-content: center; - } - .w-annc__postdate-wrap{ - color: #fff!important; - } - .w-annc__status-wrap{ - color: #fff!important; - } - .w-annc__category-wrap{ - color: #fff!important; - } - - .w-annc__title{ - color: #fff; - } - .w-annc__title { - font-family: $main-font; - white-space: normal; - } - .w-annc__widget-title { text-align: center; } - .w-annc__more { margin-top: 1.5em; } - .w-annc__list > .w-annc__item:nth-child(3n+1) { - clear: both; - } - - .w-annc__img-wrap { - margin:0; - height: auto; - } - .w-annc__content-wrap{ - padding: 1.5em; - div{ - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - } - } - .clearfix{ - // text-align: center; - // display: flex; - // justify-content: center; - } - .w-annc__subtitle { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - .w-annc__content-wrap { - display: inline-block; - &:after { - content: ''; - display: block; - margin-top: 5px; - height: 4px; - width: 0; - background: transparent; - transition: width .5s ease, background-color .5s ease; - } - } - .w-annc__item{ - padding: 0.5em; - margin: 0!important; - } - .w-annc__item_inner{ - background: #fff; - -webkit-transition: .3s all ease; - -o-transition: .3s all ease; - transition: .3s all ease; - -webkit-box-shadow:none!important; - box-shadow:none!important; - margin: 0; - margin-bottom: 1em; - overflow: hidden; - } - .w-annc__item_inner{ - &:hover{ - -webkit-transform: translateY(-6px); - -ms-transform: translateY(-6px); - transform: translateY(-6px); - img{ - // transform: scale(1.2)!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; - } - .transitionfade{ - height: inherit; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - background-color: rgba(0,0,0,.4); - -webkit-transition: .3s ease-out; - -moz-transition: .3s ease-out; - -ms-transition: .3s ease-out; - -o-transition: .3s ease-out; - transition: .3s ease-out; - } - } - } - .w-annc__item{ - &:hover{ - -webkit-transform: translateY(-6px); - -ms-transform: translateY(-6px); - transform: translateY(-6px); - .card{ - top: 0; - display: flex; - align-items: end; - flex-wrap: wrap; - } - img{ - transform: scale(1.2)!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; - } - .transitionfade{ - height: inherit; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - background-color: rgba(0,0,0,.4); - -webkit-transition: .3s ease-out; - -moz-transition: .3s ease-out; - -ms-transition: .3s ease-out; - -o-transition: .3s ease-out; - transition: .3s ease-out; - } - } - } - .w-annc__subtitle{ - color: #fff; - font-size: 1rem; - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - max-height: 0; - opacity: 0; - -webkit-transition: max-height .6s,opacity .6s; - transition: max-height .6s,opacity .6s; - @media(min-width:1920px){ - font-size: 1.2em; - } - } - .w-annc__item{ - margin-right: 1em; - overflow: hidden; - position: relative !important; - @media(min-width: 1600px){ - height: 28em; - .w-annc__img-wrap{ - height: 28em; - } - } - @media(min-width: $screen-xs)and(max-width: 1599px){ - height: 20em; - .w-annc__img-wrap{ - height: 20em; - } - } - @media(max-width: $screen-xs){ - height: 20em; - .w-annc__img-wrap{ - height: 20em; - } - } - } - li{ - &:hover{ - .card:before{ - height:100%; - } - .w-annc__subtitle{ - max-height: 100px; - opacity: 1; - } - } - position: relative; - } - .card{ - position: absolute; - z-index:0; - padding: 30px 25px; - bottom: 0; - left: 0; - background-color: transparent; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(32%, #ffffff00), color-stop(89%, #00000080)); - background-image: linear-gradient( - 180deg - , #ffffff00 2%, #00000080 89%); - width: 100%; - } - .card:before{ - content: ""; - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: 8px; - background-color: #00356aab; - z-index: -1; - -webkit-transition: height .6s; - transition: height .6s; - } -} // Widget-26 .widget-announcement-26 { .w-annc__item{ @@ -1676,10 +1388,7 @@ padding: 30px 25px; bottom: 0; left: 0; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(32%, #ffffff00), color-stop(89%, #00000080)); - background-image: linear-gradient( - 180deg - , #ffffff00 2%, #00000080 89%); + background: linear-gradient(180deg, rgba(255, 255, 255, 0) 2%, rgba(0, 0, 0, 0.501961) 89%); width: 100%; } .card:before{ @@ -3422,30 +3131,30 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl transition-timing-function: ease; transition-duration: 1s; } - //類別變色 - .全部{ - background-color: #cb804b; - border: 3px solid #cb804b!important; - } - .公告{ - background-color: #ddc080; - border: 3px solid #ddc080!important; + // 類別變色（白色文字對比比 4.5:1，符合 WCAG AA） + .全部 { + background-color: #9e5a28 !important; + border: 3px solid #9e5a28 !important; } - .公告1{ - background-color: #94506e; - border: 3px solid #94506e!important; + .公告 { + background-color: #8a6d1a !important; + border: 3px solid #8a6d1a !important; } - .公告2{ - background-color: #599cf6; - border: 3px solid #599cf6!important; + .公告1 { + background-color: #7a2d52 !important; + border: 3px solid #7a2d52 !important; } - .公告3{ - background-color: #80b885; - border: 3px solid #80b885!important; + .公告2 { + background-color: #1a5ec2 !important; + border: 3px solid #1a5ec2 !important; } - .公告4{ - background-color: #6e4626; - border: 3px solid #4b2c12!important; + .公告3 { + background-color: #3a7a40 !important; + border: 3px solid #3a7a40 !important; + } + .公告4 { + background-color: #4b2c12 !important; + border: 3px solid #4b2c12 !important; } @@ -3460,6 +3169,8 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl transition: all 0.3s; width: calc( 100%/5 - 1.5em); margin-bottom: 1em; + background-color: $theme-color-second; + border: 3px solid $theme-color-second; &:hover{ box-shadow: 2px 2px 7px 2px rgba(0, 0, 0, 0.5); transform: translateY(-5px); @@ -3487,12 +3198,12 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl padding: 0 0.5em; } .i-annc__item{ - padding: 0; + padding: 0.5em; } .i-annc__img-wrap { overflow: hidden; // height: 14.5em; - margin: 1em 0.5em; + margin-bottom: 1em; @media (max-width:$screen-xs) { height: 7em; } diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index cdf598b..a4fc8b9 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -152,18 +152,31 @@ @extend .unity-title; } /* 2. 對應的檔案顏色 (轉為 iOS 半透明色調) */ -.link { background-color: rgba(18, 115, 235, 0.6) !important; } /* iOS Blue */ -.txt { background-color: rgba(109, 187, 115, 0.6) !important; } /* iOS Green */ -.xlsx { background-color: rgba(187, 109, 127, 0.6) !important; } /* iOS Pink/Red */ -.pdf { background-color: rgba(59, 131, 71, 0.7) !important; } /* 深一點的 Green */ -.docx { background-color: rgba(132, 109, 187, 0.6) !important; } /* iOS Purple */ -.doc { background-color: rgba(18, 115, 235, 0.6)!important; } -.pptx { background-color: rgba(109, 119, 187, 0.6) !important; } /* iOS Indigo */ -.jpg { background-color: rgba(187, 109, 109, 0.6) !important; } /* iOS Red */ -.zip { background-color: rgba(220, 185, 87, 0.6) !important; } /* iOS Yellow/Orange */ -.rar { background-color: rgba(230, 149, 0, 0.6) !important; } /* iOS Orange (與 zip 區隔，更偏橘) */ -.xls { background-color: rgba(109, 187, 115, 0.6) !important; } /* 沿用 iOS Green (試算表系列) */ -.odt { background-color: rgba(100, 100, 100, 0.6) !important; } /* iOS Gray (通用文件/系統灰色) */ +// .link { background-color: rgba(18, 115, 235, 0.6) !important; } /* iOS Blue */ +// .txt { background-color: rgba(109, 187, 115, 0.6) !important; } /* iOS Green */ +// .xlsx { background-color: rgba(187, 109, 127, 0.6) !important; } /* iOS Pink/Red */ +// .pdf { background-color: rgba(59, 131, 71, 0.7) !important; } /* 深一點的 Green */ +// .docx { background-color: rgba(132, 109, 187, 0.6) !important; } /* iOS Purple */ +// .doc { background-color: rgba(18, 115, 235, 0.6)!important; } +// .pptx { background-color: rgba(109, 119, 187, 0.6) !important; } /* iOS Indigo */ +// .jpg { background-color: rgba(187, 109, 109, 0.6) !important; } /* iOS Red */ +// .zip { background-color: rgba(220, 185, 87, 0.6) !important; } /* iOS Yellow/Orange */ +// .rar { background-color: rgba(230, 149, 0, 0.6) !important; } /* iOS Orange (與 zip 區隔，更偏橘) */ +// .xls { background-color: rgba(109, 187, 115, 0.6) !important; } /* 沿用 iOS Green (試算表系列) */ +// .odt { background-color: rgba(100, 100, 100, 0.6) !important; } /* iOS Gray (通用文件/系統灰色) */ + +.link { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ +.txt { background-color: #3a8a40 !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 */ +.doc { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ +.pptx { background-color: #3d4aa0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ +.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 */ +.odt { background-color: #767676 !important; margin-left: 0.5em; } /* 對比 4.6:1 */// Archive index 1 // Archive index 1 .index-archive-1 { font-family: $main-font; diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index db4c05b..f31fdbd 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -150,6 +150,7 @@ } li{ background-color: transparent; + margin-bottom: 1em; @media(max-width: $screen-xs){ width: 25%; } @@ -356,7 +357,6 @@ z-index: 2; display: flex; align-items: center; - justify-content: center; flex-wrap: wrap; height: 100%; width: 100%; diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index b2d77c2..178ed93 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -65,7 +65,7 @@ input:hover { // } .internalfullwidth{ @media(min-width: 1280px){ - transform: translateX(calc(-50vw + 625px)); + transform: translateX(calc(-50vw + 685px)); width: 100vw; } @media(max-width:1279px)and(min-width:1025px){ @@ -313,7 +313,7 @@ ul.tab_nav { } } } -//td有rwd跳色 +//td有rwd跳色，寬度占滿100% #tdstyle1{ tr{ &:nth-child(even){ @@ -339,6 +339,54 @@ ul.tab_nav { } } } +//td無rwd，寬度不變 +#tdstyle2{ + table td{ + border: 1px solid #ddd!important; + @media (max-width: 480px) { + width: auto; + } + } + td,th{ + @media(max-width: $screen-xs){ + width: auto ; + } + } + tr{ + display: table-row; + } +} +//td有rwd灰色底，寬度占滿100% +#tdstyle3{ + tr{ + background: #efefef !important; + margin-bottom: 10px; + border: 1px solid #ccc; + } + td{ + border-bottom: #cacaca 1px solid !important; + } +} +//td無rwd跳色，寬度不變 +#tdstyle4{ + table td{ + border: 1px solid #ddd!important; + @media (max-width: 480px) { + width: auto!important; + } + } + td,th{ + @media(max-width: $screen-xs){ + width: auto!important; + } + } + tr{ + display: table-row; + &:nth-child(odd){ + background-color:#f2f2f2; + } + } +} //td有rwd #tdstyle5{ margin-top: 1.5em; @@ -522,57 +570,7 @@ ul.tab_nav { } } } -//td無rwd -#tdstyle2{ - table td{ - border: 1px solid #ddd!important; - @media (max-width: 480px) { - width: auto; - } - } - td,th{ - @media(max-width: $screen-xs){ - width: auto ; - } - } - tr{ - display: table-row; - } -} -//td有rwd灰底色 -#tdstyle3{ - tr{ - background: #efefef !important; - margin-bottom: 10px; - border: 1px solid #ccc; - } - td{ - border-bottom: #cacaca 1px solid !important; - } -} -//td無rwd跳色 -#tdstyle4{ - table td{ - border: 1px solid #ddd!important; - @media (max-width: 480px) { - width: auto!important; - text-align: center; - } - } - td,th{ - @media(max-width: $screen-xs){ - width: auto!important; - text-align: center; - } - } - - - tr{ - &:nth-child(odd){ - background-color:#f2f2f2; - } - } -} +//rwd時標題在表格資料的左側 #tdstylesp{ @media (max-width: 480px) { thead, diff --git a/modules/ad_banner/_ad_banner_widget5.html.erb b/modules/ad_banner/_ad_banner_widget5.html.erb index 08e3644..244d6ff 100644 --- a/modules/ad_banner/_ad_banner_widget5.html.erb +++ b/modules/ad_banner/_ad_banner_widget5.html.erb @@ -80,5 +80,9 @@ }); }); }); - + .ba-banner-widget-5{ + .banner-pager{ + position: relative; + } + } diff --git a/modules/announcement/_annc_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb index d8aa1a6..3998a1e 100644 --- a/modules/announcement/_annc_widget18.html.erb +++ b/modules/announcement/_annc_widget18.html.erb @@ -7,17 +7,17 @@ diff --git a/modules/announcement/_annc_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb index eac1008..46b6cb1 100644 --- a/modules/announcement/_annc_widget19.html.erb +++ b/modules/announcement/_annc_widget19.html.erb @@ -38,14 +38,138 @@ {{category}} - - +

{{title}}

{{subtitle}}

+ + diff --git a/modules/announcement/_annc_widget2.html.erb b/modules/announcement/_annc_widget2.html.erb index a52bd31..5db3eab 100644 --- a/modules/announcement/_annc_widget2.html.erb +++ b/modules/announcement/_annc_widget2.html.erb @@ -5,25 +5,27 @@