diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index a4e1947..debe859 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/_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/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 383ddf3..2a4e653 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/announcement/_annc_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb index 871c332..70b58dd 100644 --- a/modules/announcement/_annc_widget19.html.erb +++ b/modules/announcement/_annc_widget19.html.erb @@ -2,9 +2,7 @@

{{widget-title}}

-
- <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> -
+
+ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
- diff --git a/modules/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb index f6851ee..301ffd3 100644 --- a/modules/gallery/_gallery_widget3.html.erb +++ b/modules/gallery/_gallery_widget3.html.erb @@ -12,10 +12,6 @@
{{image_description}}
-
-
-
-