diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 0a351f9..1daaad1 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')); diff --git a/assets/stylesheets/template/base/_accesskey.scss b/assets/stylesheets/template/base/_accesskey.scss index cd79f59..b8783da 100644 --- a/assets/stylesheets/template/base/_accesskey.scss +++ b/assets/stylesheets/template/base/_accesskey.scss @@ -1,9 +1,9 @@ @charset "utf-8"; a[accesskey] { - position: absolute !important; + position: absolute; margin-left: 0; - color: transparent; + color:#333; } #orbit-bar a[accesskey] { diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index bb5c617..812fed1 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -87,7 +87,7 @@ a[href="/en/sitemap"]{ margin: 0; font-size: unset; border-left: 0; - @media(min-width:769px){ + @media(min-width:768px){ float: left; .movelanguage{ float: right; @@ -277,6 +277,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/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 99c25c1..1a6e137 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -136,31 +136,34 @@ } } + @media (max-width: 768px){ + max-width: 270px; + } @media (max-width: 480px) { h1{ margin: 0; } - width: 80%; + width: 70%; padding: 0; margin: 0; white-space: normal; } .site-logo { - margin-right: 0.5em; + margin-right:0; float: left; - height: 50px; + height: auto; padding-right: 0.5em; - width: auto!important; - @media(min-width: 1024px){ - height: 50px; - } - @media(max-width: $screen-xs){ - height: 45px; - } - @media(max-width: 820px)and(min-width:$screen-xs ){ - height: 45px; - } + width: 100%!important; + // @media(min-width: 1024px){ + // height: 50px; + // } + // @media(max-width: $screen-xs){ + // height: 45px; + // } + // @media(max-width: 820px)and(min-width:$screen-xs ){ + // height: 45px; + // } } } } diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 3307a9c..c18a37b 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/archives.scss b/assets/stylesheets/template/modules/archives.scss index a4fc8b9..dae93f2 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -112,7 +112,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 { @@ -256,7 +256,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 5ee46c3..7c4ddc8 100644 --- a/assets/stylesheets/template/modules/event_news.scss +++ b/assets/stylesheets/template/modules/event_news.scss @@ -560,7 +560,6 @@ .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 b58af48..d07c5c9 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 1da6692..cb238e1 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{ diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index 290a692..1b2a071 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -90,6 +90,7 @@ border: 1px solid #6868688f; padding: 1em; background-color: #fff; + margin-bottom: 1em; .sitemenu-list { position: relative; float: none; 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(); - }); - }); +