diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 7bda678..42a5af9 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -2489,6 +2489,7 @@ $(function() { $('.i-annc__page-title').after($('.sitemenu-wrap2')); $('.i-archive-title').after($('.sitemenu-wrap2')); $('.page-module-title').after($('.sitemenu-wrap2')); + $('.show-member').before($('.sitemenu-wrap2')); $('.box-social-share').before($('.sitemenu-wrap3')); $('.box-social-share').before($('.sitemenu-wrap3')); $('.box-social-share').before($('.sitemenu-wrap3')); @@ -4156,128 +4157,128 @@ $(function() { }); }, 500); }); -//header選單太長 -$(function() { - function adjustMenuPosition() { - var headerHeight = ($('.layout-header').outerHeight() || 140) + ($('#orbit-bar').outerHeight() || 0); - var windowHeight = $(window).height(); - var windowWidth = $(window).width(); +// //header選單太長 +// $(function() { +// function adjustMenuPosition() { +// var headerHeight = ($('.layout-header').outerHeight() || 140) + ($('#orbit-bar').outerHeight() || 0); +// var windowHeight = $(window).height(); +// var windowWidth = $(window).width(); - // 處理 level-1 - $('.modules-menu-level-0 > li').on('mouseenter', function() { - var $level1 = $(this).find('> .modules-menu-level-1'); - if (!$level1.length) return; +// // 處理 level-1 +// $('.modules-menu-level-0 > li').on('mouseenter', function() { +// var $level1 = $(this).find('> .modules-menu-level-1'); +// if (!$level1.length) return; - $level1.css({ 'top': '', 'max-height': '', 'overflow-y': '', 'overflow-x': '' }); +// $level1.css({ 'top': '', 'max-height': '', 'overflow-y': '', 'overflow-x': '' }); - var menuTop = $level1.offset().top; - var menuHeight = $level1.outerHeight(); - var available = windowHeight - menuTop; +// var menuTop = $level1.offset().top; +// var menuHeight = $level1.outerHeight(); +// var available = windowHeight - menuTop; - if (menuHeight > available) { - var maxH = windowHeight - headerHeight; - $level1.css({ - 'top' : 'auto', - 'max-height': maxH + 'px', - 'overflow-y': 'auto', - 'overflow-x': 'visible' - }); +// if (menuHeight > available) { +// var maxH = windowHeight - headerHeight; +// $level1.css({ +// 'top' : 'auto', +// 'max-height': maxH + 'px', +// 'overflow-y': 'auto', +// 'overflow-x': 'visible' +// }); - // 判斷是否是最後一個 li（level-2 往左展開） - var $parentLi = $level1.closest('.modules-menu-level-0 > li'); - var isLastChild = $parentLi.is(':last-child') && windowWidth >= 769; +// // 判斷是否是最後一個 li（level-2 往左展開） +// var $parentLi = $level1.closest('.modules-menu-level-0 > li'); +// var isLastChild = $parentLi.is(':last-child') && windowWidth >= 769; - $level1.find('> li').on('mouseenter.level2fix', function() { - var $li = $(this); - var $level2 = $li.find('> .modules-menu-level-2'); - if (!$level2.length) return; +// $level1.find('> li').on('mouseenter.level2fix', function() { +// var $li = $(this); +// var $level2 = $li.find('> .modules-menu-level-2'); +// if (!$level2.length) return; - function updateLevel2Position() { - var liRect = $li[0].getBoundingClientRect(); - var orbitHeight = $('#orbit-bar').outerHeight() || 0; - var leftPos, rightPos; +// function updateLevel2Position() { +// var liRect = $li[0].getBoundingClientRect(); +// var orbitHeight = $('#orbit-bar').outerHeight() || 0; +// var leftPos, rightPos; - if (isLastChild) { - leftPos = 'auto'; - rightPos = (windowWidth - liRect.left) + 'px'; - } else { - leftPos = liRect.right + 'px'; - rightPos = 'auto'; - } +// if (isLastChild) { +// leftPos = 'auto'; +// rightPos = (windowWidth - liRect.left) + 'px'; +// } else { +// leftPos = liRect.right + 'px'; +// rightPos = 'auto'; +// } - $level2.css({ - 'position' : 'fixed', - 'top' : (liRect.top - orbitHeight) + 'px', // 減去 orbit-bar 高度 - 'left' : leftPos, - 'right' : rightPos, - 'max-height': (windowHeight - headerHeight) + 'px', - 'overflow-y': 'auto', - 'z-index' : 9999 - }); - } +// $level2.css({ +// 'position' : 'fixed', +// 'top' : (liRect.top - orbitHeight) + 'px', // 減去 orbit-bar 高度 +// 'left' : leftPos, +// 'right' : rightPos, +// 'max-height': (windowHeight - headerHeight) + 'px', +// 'overflow-y': 'auto', +// 'z-index' : 9999 +// }); +// } - // 初始定位 - updateLevel2Position(); +// // 初始定位 +// updateLevel2Position(); - // 監聽 level-1 捲動，即時更新 top - $level1.on('scroll.level2pos', function() { - updateLevel2Position(); - }); +// // 監聽 level-1 捲動，即時更新 top +// $level1.on('scroll.level2pos', function() { +// updateLevel2Position(); +// }); - }).on('mouseleave.level2fix', function() { - $(this).find('> .modules-menu-level-2').css({ - 'position' : '', - 'top' : '', - 'left' : '', - 'right' : '', - 'max-height': '', - 'overflow-y': '' - }); - $level1.off('scroll.level2pos'); - }); - } - }); +// }).on('mouseleave.level2fix', function() { +// $(this).find('> .modules-menu-level-2').css({ +// 'position' : '', +// 'top' : '', +// 'left' : '', +// 'right' : '', +// 'max-height': '', +// 'overflow-y': '' +// }); +// $level1.off('scroll.level2pos'); +// }); +// } +// }); - // 處理 level-2（level-1 不需要捲動時的一般情況） - $('.modules-menu-level-1 > li').on('mouseenter', function() { - var $li = $(this); - var $level2 = $li.find('> .modules-menu-level-2'); - if (!$level2.length) return; +// // 處理 level-2（level-1 不需要捲動時的一般情況） +// $('.modules-menu-level-1 > li').on('mouseenter', function() { +// var $li = $(this); +// var $level2 = $li.find('> .modules-menu-level-2'); +// if (!$level2.length) return; - var $level1 = $li.closest('.modules-menu-level-1'); - if ($level1.css('overflow-y') === 'auto') return; +// var $level1 = $li.closest('.modules-menu-level-1'); +// if ($level1.css('overflow-y') === 'auto') return; - // 重置 - $level2.css({ 'top': '', 'max-height': '', 'overflow-y': '' }); +// // 重置 +// $level2.css({ 'top': '', 'max-height': '', 'overflow-y': '' }); - // 加上 li 的 padding-top，讓 level-2 頂端對齊 li 文字 - var liPaddingTop = parseInt($li.css('padding-top')) || 0; - $level2.css('top', liPaddingTop + 'px'); +// // 加上 li 的 padding-top，讓 level-2 頂端對齊 li 文字 +// var liPaddingTop = parseInt($li.css('padding-top')) || 0; +// $level2.css('top', liPaddingTop + 'px'); - var menuTop = $level2.offset().top; - var menuHeight = $level2.outerHeight(); - var available = windowHeight - menuTop; +// var menuTop = $level2.offset().top; +// var menuHeight = $level2.outerHeight(); +// var available = windowHeight - menuTop; - if (menuHeight > available) { - var overflowAmount = menuHeight - available; - $level2.css({ - 'top' : (liPaddingTop - overflowAmount) + 'px', - 'max-height': (windowHeight - headerHeight) + 'px', - 'overflow-y': 'auto' - }); - } - }); - } +// if (menuHeight > available) { +// var overflowAmount = menuHeight - available; +// $level2.css({ +// 'top' : (liPaddingTop - overflowAmount) + 'px', +// 'max-height': (windowHeight - headerHeight) + 'px', +// 'overflow-y': 'auto' +// }); +// } +// }); +// } - adjustMenuPosition(); +// adjustMenuPosition(); - $(window).on('resize', function() { - $('.modules-menu-level-0 > li').off('mouseenter'); - $('.modules-menu-level-1 > li').off('mouseenter.level2fix mouseleave.level2fix'); - $('.modules-menu-level-1').off('scroll.level2pos'); - adjustMenuPosition(); - }); -}); +// $(window).on('resize', function() { +// $('.modules-menu-level-0 > li').off('mouseenter'); +// $('.modules-menu-level-1 > li').off('mouseenter.level2fix mouseleave.level2fix'); +// $('.modules-menu-level-1').off('scroll.level2pos'); +// adjustMenuPosition(); +// }); +// }); //ai須新增的function diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index c49b1e2..8fd2d4b 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -281,6 +281,7 @@ td { img { max-width: 100%; height: auto; + width: 100%; } input[type=checkbox]:focus { outline: 0.3125em auto -webkit-focus-ring-color; diff --git a/assets/stylesheets/template/base/_utilities.scss b/assets/stylesheets/template/base/_utilities.scss index 620d13a..4c46e11 100644 --- a/assets/stylesheets/template/base/_utilities.scss +++ b/assets/stylesheets/template/base/_utilities.scss @@ -59,7 +59,7 @@ color: #fff; font: 0.9375em/1.25em $main-font; .fa { - color: #666; + color: #fff; font-size: 1.125em; margin: 0 0.1875em 0 0; } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 2d079f7..55b7a6e 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -154,6 +154,7 @@ } .site-logo { + filter: brightness(0) invert(1); margin-right: 0.5em; float: left; height: 50px; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 23378ed..efaf2d3 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -38,8 +38,11 @@ .w-ba-banner .controlplay .resume-slide.active i { color: $theme-color-second!important; } -.w-ba-banner__caption h3 { + .w-ba-banner__caption h3 { font-size: 2em; + @media(max-width:768px){ + font-size: 1.8em; + } } ul.button-mid{ .prev-button{ diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 5295211..f914a2f 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -975,7 +975,7 @@ img.w-annc__img { width: 100%; } .w-annc__meta{ - background-color:#dfdfdf; + background: rgba(255, 255, 255, 0.1); display: flex; align-items: center; padding:0.5em 1em; diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 2e65b9a..97e7689 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -27,13 +27,11 @@ .i-archive{ tr{ border: 0.0625em solid #ddd!important; + background: transparent !important; } } .i-items{ - border: 1px solid #ccc; - @media(min-width: 768px){ - background-color: #fff; - } + border: 1px solid #ccc; } .w-archive__title{ font-weight: bold; @@ -115,7 +113,7 @@ -webkit-transition: all 0.5s; -o-transition: all 0.5s; &:hover { - background-color: darken($color: #f5f5f5, $amount: 10); + background: rgba(180, 180, 180, 0.1); } } .panel { @@ -259,7 +257,7 @@ -webkit-transition: all 0.5s; -o-transition: all 0.5s; &:hover { - background-color: darken($color: #f5f5f5, $amount: 10); + background: rgba(180, 180, 180, 0.1); } } .panel { diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss index 7bc90bd..5901933 100644 --- a/assets/stylesheets/template/modules/event_news.scss +++ b/assets/stylesheets/template/modules/event_news.scss @@ -565,7 +565,6 @@ th,td { .i-annc__list { display: flex; flex-wrap: wrap; - justify-content: center; } .i-annc__title { font-family: $main-font; diff --git a/assets/stylesheets/template/modules/gallery.scss b/assets/stylesheets/template/modules/gallery.scss index 01e1c45..7224931 100644 --- a/assets/stylesheets/template/modules/gallery.scss +++ b/assets/stylesheets/template/modules/gallery.scss @@ -30,6 +30,7 @@ padding: 0; .img-thumbnail{ width: 100%; + padding: 0; } &:hover{ img{ @@ -42,6 +43,9 @@ } } } +.gallery.card-group .card.card-flip.h-100{ + height: auto !important; +} // Gallery MODULES .widget-gallery { .widget-title { @@ -564,6 +568,14 @@ } } &.index8{ + .index-content-inner{ + background-color: rgba($theme-color-second, 0.1); + margin-bottom: 1em; + border-radius: 1em; + } + h4.index-content-title { + padding: 0 1em; + } .index-content-inner img{ padding: 0; border: 0; diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 88889c2..ef2418e 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -72,14 +72,17 @@ th.sorting_disabled { // } .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-pic-wrap{ + overflow: hidden; + .i-member-pic{ + transform: scale(1.05) !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; + } + } } } .search-member{ @@ -202,7 +205,7 @@ th.sorting_disabled { .i-member-item{ border-bottom: 1px solid #e2e2e2; &:nth-child(odd) { - background: #f3f3f3; + background: rgba(255, 255, 255, 0.1); } } .member-data-title-name{ @@ -269,7 +272,7 @@ th.sorting_disabled { margin: 0; } .i-member-item { - background: #f1f1f1 none repeat scroll 0 0; +background: rgba(255, 255, 255, 0.1); border-radius: 0.3125em; float: none; margin:0 0.5em 1em; @@ -381,7 +384,7 @@ th.sorting_disabled { clear: both; } .i-member-item-inner { - background: $theme-gray-lighter; + background: rgba(255, 255, 255, 0.1); } // RWD @media screen and (min-width: $screen-sm) { diff --git a/assets/stylesheets/template/widget/breadcrumb.scss b/assets/stylesheets/template/widget/breadcrumb.scss index df648a3..61a8ba8 100644 --- a/assets/stylesheets/template/widget/breadcrumb.scss +++ b/assets/stylesheets/template/widget/breadcrumb.scss @@ -14,10 +14,10 @@ margin-left: 0; margin-bottom: 0; background-color:transparent; - a:link, a:visited { color: $theme-color-main; } + a:link, a:visited { color: #fff; } } .breadcrumb>li+li:before { - color: $theme-color-main; + color: #fff; } .widget-breadcrumb { &.widget1 { @@ -28,7 +28,7 @@ &:last-child { a { - color: $theme-color-main; + color: #fff; pointer-events: none; } } diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index ec27e82..3b8eff6 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -146,7 +146,7 @@ .sitemenu-link { font-size: 1.2em; - color: #333333; + color: #fff; vertical-align: top; background-image: url(/assets/plan_icon01.png); background-position: 15px; @@ -156,7 +156,7 @@ text-overflow: ellipsis; position: relative; border-bottom: 1px solid #cacaca; - color: #333333; + color: #fff; border-radius: 4px; //behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #DDD; @@ -165,7 +165,7 @@ width: 100%; display: flex; &:hover{ - border: 2px solid #333333; + border: 2px solid #fff; color: $theme-color-second; background: #adb5bd33; } @@ -235,11 +235,11 @@ .sitemenu-link { font-size:1.2em; - color: #333333; + color: #fff; white-space: nowrap; text-overflow: ellipsis; position: relative; - color: #333333; + color: #fff; border-radius: 4px; //behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #DDD; @@ -248,7 +248,7 @@ width: 100%; display: flex; &:hover{ - border: 2px solid #333333; + border: 2px solid #fff; color: $theme-color-second; background: #adb5bd33; } diff --git a/modules/ad_banner/_ad_banner_widget0.html.erb b/modules/ad_banner/_ad_banner_widget0.html.erb index 70620a6..5a2d7f1 100644 --- a/modules/ad_banner/_ad_banner_widget0.html.erb +++ b/modules/ad_banner/_ad_banner_widget0.html.erb @@ -63,62 +63,7 @@ $('[data-subpart-id="{{subpart-id}}"] .prev-button').click(function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev"); }); - $(function() { - function updateBannerClip() { - $('.ba-banner-widget-0').each(function() { - var $banner = $(this); - var vpWidth = $(window).width(); - var vpHeight = $(window).height(); - - // --- 寬度：找比 viewport 窄的父層容器 --- - var $container = null; - $banner.parents().each(function() { - var $el = $(this); - if ($el.outerWidth() < vpWidth - 10) { - $container = $el; - return false; - } - }); - - var clipLeft = 0; - var clipRight = 0; - if ($container && $container.length > 0) { - clipLeft = Math.max(0, $container.offset().left); - clipRight = Math.max(0, vpWidth - $container.offset().left - $container.outerWidth()); - } - - // --- 高度：依 .w-ad-banner 自己區塊的上下邊界裁切 --- - var bannerTop = $banner.offset().top - $(window).scrollTop(); - var bannerBottom = vpHeight - bannerTop - $banner.outerHeight(); - - var clipTop = Math.max(0, bannerTop); - var clipBottom = Math.max(0, bannerBottom); - - var clipValue = 'inset(' - + clipTop + 'px ' - + clipRight + 'px ' - + clipBottom + 'px ' - + clipLeft + 'px)'; - - $banner.find('img.w-ba-banner__image').css('clip-path', clipValue); - }); - } - - // 初始執行 - setTimeout(updateBannerClip, 300); - - // 視窗縮放時重新計算 - var resizeTimer; - $(window).on('resize', function() { - clearTimeout(resizeTimer); - resizeTimer = setTimeout(updateBannerClip, 100); - }); - - // ✅ 滾動時也要更新，因為 bannerTop 會隨捲動改變 - $(window).on('scroll', function() { - updateBannerClip(); - }); - }); +