From 398b40eb5ddbe09d63daee3bde4c5ed3b6db2a4f Mon Sep 17 00:00:00 2001
From: ken <poopooken11@gmail.com>
Date: Wed, 22 Jul 2026 16:10:18 +0800
Subject: [PATCH] update

---
 assets/stylesheets/template/base/_global.scss |  2 +-
 .../stylesheets/template/layout/content.scss  |  5 ++++
 .../template/modules/ad_banner.scss           |  8 ++++--
 .../template/modules/announcement.scss        | 11 ++++----
 modules/ad_banner/_ad_banner_widget2.html.erb |  4 ++-
 modules/member/member_index10.html.erb        | 28 +++++++++++++++++++
 6 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss
index d06cb07..bfcbc01 100644
--- a/assets/stylesheets/template/base/_global.scss
+++ b/assets/stylesheets/template/base/_global.scss
@@ -4,7 +4,7 @@
 @import "variables";
 
 .fa-classic, .fa-regular, .fa-solid, .far, .fas ,.fa{
-    font-family: var(--fa-style-family, "FontAwesome");
+    font-family: "FontAwesome";
 }
 #orbit-bar .orbit-bar-inner > label:focus, #orbit-bar .orbit-bar-inner > label.focus{
   .orbit-bar-search-sign-language{
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index c432d05..3692f5b 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -1,6 +1,11 @@
 @charset "utf-8";
 
 @import "../initial";
+.line-it-button{
+  .label{
+    color: #333!important;
+  }
+}
 .col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9{
   @media(max-width: $screen-xs){
     padding: 0;
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index 61df096..a03ecff 100644
--- a/assets/stylesheets/template/modules/ad_banner.scss
+++ b/assets/stylesheets/template/modules/ad_banner.scss
@@ -30,9 +30,11 @@ ul.button-mid{
     }
 	}
 }
-ul.button-mid{
-  margin:0;
-  z-index: 201;
+.button-mid {
+    position: absolute;
+    width: 100%;
+    height: 0;
+    top: 50%;
 }
 .banner-pager .active-slide button{
   background: $theme-color-second!important;
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index 3278cab..91ae5eb 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -2684,12 +2684,6 @@ a.w-annc__more.btn.btn-primary.pull-right {
   .i-annc__entry-title {
     margin-bottom: 0;
     margin-top: 0;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    // clear: both;
   }
 
   .i-annc__title {
@@ -2697,6 +2691,11 @@ a.w-annc__more.btn.btn-primary.pull-right {
     color: $theme-color-main;
     text-decoration: none;
     @extend .i-title;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    text-overflow: ellipsis;
+    overflow: hidden;
     &:hover {
       color:  $theme-color-second;
           text-decoration: underline;
diff --git a/modules/ad_banner/_ad_banner_widget2.html.erb b/modules/ad_banner/_ad_banner_widget2.html.erb
index e7c9f79..70ef492 100644
--- a/modules/ad_banner/_ad_banner_widget2.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2.html.erb
@@ -29,7 +29,9 @@
 
     </div>
   </div>
-  <ul class="w-ba-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></ul>
+    <div class="w-ad-banner__pager-2 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
+    <li><button title="Slide {{slide_number}}" aria-label="Pager"><span style="display: none;">Slide {{slide_number}}</span></button></li>
+  </div>
   <ul class="controlplay" role="radiogroup" aria-label="播放控制選項">
     <a role="radio" aria-checked="true" href="javascript:;" class="resume-slide active" title="繼續播放" aria-label="繼續播放" aria-live="assertive">
       <i aria-hidden="true"></i>
diff --git a/modules/member/member_index10.html.erb b/modules/member/member_index10.html.erb
index f6ac9b8..b8bf83e 100644
--- a/modules/member/member_index10.html.erb
+++ b/modules/member/member_index10.html.erb
@@ -31,8 +31,36 @@
       $('.i-member img').eq(i).parent().attr('title','noname');
 		}
 	}
+
+  $('.i-member-item').each(function() {
+    var $item     = $(this);
+    var $nameLink = $item.find('.member-data-value-name a');
+    var $engValue = $item.find('.member-data-value-0');
+    var $engItem  = $item.find('.i-member-profile-item:has(.member-data-title-0)');
+
+    if ($nameLink.length && $engValue.length) {
+      var engText = $engValue.text().trim();
+      if (engText) {
+        $nameLink.append('<span class="member-eng-name"> (' + engText + ')</span>');
+      }
+      $engItem.hide();
+    }
+  });
 </script>
 <style>
+.i-member-profile-item {
+      font-weight: bold;
+}
+.i-member-title{
+  &:before{
+    content:'‧';
+    position:relative;
+            padding-right: 0.2em;
+  }
+}
+span.member-eng-name {
+    font-size: 0.8em;
+}
 ul.i-member-profile-list {
     padding: 0;
 }