diff --git a/assets/images/SDGS1.png b/assets/images/SDGS1.png new file mode 100644 index 0000000..131ed42 Binary files /dev/null and b/assets/images/SDGS1.png differ diff --git a/assets/images/SDGS10.png b/assets/images/SDGS10.png new file mode 100644 index 0000000..df29146 Binary files /dev/null and b/assets/images/SDGS10.png differ diff --git a/assets/images/SDGS11.png b/assets/images/SDGS11.png new file mode 100644 index 0000000..07f9d48 Binary files /dev/null and b/assets/images/SDGS11.png differ diff --git a/assets/images/SDGS12.png b/assets/images/SDGS12.png new file mode 100644 index 0000000..929db43 Binary files /dev/null and b/assets/images/SDGS12.png differ diff --git a/assets/images/SDGS13.png b/assets/images/SDGS13.png new file mode 100644 index 0000000..289c715 Binary files /dev/null and b/assets/images/SDGS13.png differ diff --git a/assets/images/SDGS14.png b/assets/images/SDGS14.png new file mode 100644 index 0000000..435c377 Binary files /dev/null and b/assets/images/SDGS14.png differ diff --git a/assets/images/SDGS15.png b/assets/images/SDGS15.png new file mode 100644 index 0000000..9f90f84 Binary files /dev/null and b/assets/images/SDGS15.png differ diff --git a/assets/images/SDGS16.png b/assets/images/SDGS16.png new file mode 100644 index 0000000..690f54d Binary files /dev/null and b/assets/images/SDGS16.png differ diff --git a/assets/images/SDGS17.png b/assets/images/SDGS17.png new file mode 100644 index 0000000..4548302 Binary files /dev/null and b/assets/images/SDGS17.png differ diff --git a/assets/images/SDGS2.png b/assets/images/SDGS2.png new file mode 100644 index 0000000..91bb4ad Binary files /dev/null and b/assets/images/SDGS2.png differ diff --git a/assets/images/SDGS3.png b/assets/images/SDGS3.png new file mode 100644 index 0000000..3f6aa5a Binary files /dev/null and b/assets/images/SDGS3.png differ diff --git a/assets/images/SDGS4.png b/assets/images/SDGS4.png new file mode 100644 index 0000000..7222229 Binary files /dev/null and b/assets/images/SDGS4.png differ diff --git a/assets/images/SDGS5.png b/assets/images/SDGS5.png new file mode 100644 index 0000000..7e860bf Binary files /dev/null and b/assets/images/SDGS5.png differ diff --git a/assets/images/SDGS6.png b/assets/images/SDGS6.png new file mode 100644 index 0000000..8f1d428 Binary files /dev/null and b/assets/images/SDGS6.png differ diff --git a/assets/images/SDGS7.png b/assets/images/SDGS7.png new file mode 100644 index 0000000..f0ad71a Binary files /dev/null and b/assets/images/SDGS7.png differ diff --git a/assets/images/SDGS8.png b/assets/images/SDGS8.png new file mode 100644 index 0000000..fab0f97 Binary files /dev/null and b/assets/images/SDGS8.png differ diff --git a/assets/images/SDGS9.png b/assets/images/SDGS9.png new file mode 100644 index 0000000..cedd5d0 Binary files /dev/null and b/assets/images/SDGS9.png differ diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 3c2112a..a7e9698 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -3937,5 +3937,67 @@ $(function() { fixAnncFileTitleExt(); }); +//orbit-hash-tag加圖片 +$(document).ready(function() { + // 第一步：處理 .orbit-hash-tag 文字改成對應的圖片 + $('.orbit-hash-tag').each(function() { + var $a = $(this); + var text = $.trim($a.text()); // 取出文字，例如 "#SDAGHASHTAG3" + + // 用正則匹配 #SDGS 後面的數字 + var match = text.match(/^#SDGS(\d{1,2})$/); + if (match) { + var num = parseInt(match[1], 10); + + // 確保是 1~18 範圍內 + if (num >= 1 && num <= 18) { + var imgTag = $('', { + src: '/assets/SDGS' + num + '.png', + alt: 'SDGS' + num, + title: 'SDGS' + num + }); + + // 清空文字並插入圖片 + $a.empty().append(imgTag); + } + } + }); + + // 第二步：移除重複圖片的 .orbit-hash-tag + $('.orbit-hash-tag').each(function() { + var $orbit = $(this); + var orbitImgSrc = $orbit.find('img').attr('src'); + + // 檢查是否有相同 src 的 .s-annc__tag 圖片 + var hasDuplicate = $('.s-annc__tag img').filter(function() { + return $(this).attr('src') === orbitImgSrc; + }).length > 0; + + if (hasDuplicate) { + $orbit.remove(); + } + }); +}); +$(function() { + setTimeout(function() { + $('.orbit-hash-tag').each(function() { + var $tag = $(this); + var src = $tag.find('img').attr('src') || ''; + + if (src.indexOf('/assets/SDGS') !== -1) { + $tag.css({ + 'width' : '80px', + 'position' : 'relative', + 'display' : 'block', + 'padding' : '0', + 'margin-right' : '1em', + 'border-radius' : '0.5em', + 'overflow' : 'hidden', + 'margin-bottom' : '0.5em' + }); + } + }); + }, 500); +}); }(jQuery, window)); diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 7da7015..8f7a094 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -5,7 +5,7 @@ div#searchOverlay { display: none; } #orbit-bar .orbit-bar-title a { - color: #99163d !important; + color: #333 !important; } a[href="/zh_tw/sitemap"]{ padding: 0 1em; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index fe1a949..d269db7 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -22,6 +22,7 @@ ul.button-mid{ width: 100%; height: 0; top: 50%; + z-index: 201; } .next-button, .prev-button { cursor: pointer; diff --git a/assets/stylesheets/template/modules/hashtag.scss b/assets/stylesheets/template/modules/hashtag.scss index cfdd4c8..964eafc 100644 --- a/assets/stylesheets/template/modules/hashtag.scss +++ b/assets/stylesheets/template/modules/hashtag.scss @@ -8,6 +8,7 @@ p.s-annc__post-orbithashtags{ clear: both; } a.orbit-hash-tag { + float: left; list-style: none; background: #e0edff; color: #0a84ff; diff --git a/modules/announcement/_annc_widget30.html.erb b/modules/announcement/_annc_widget30.html.erb index f71977c..54bd5d3 100644 --- a/modules/announcement/_annc_widget30.html.erb +++ b/modules/announcement/_annc_widget30.html.erb @@ -21,9 +21,6 @@
- - {{status}} - {{postdate}} @@ -33,6 +30,9 @@ {{category}}
+ + {{status}} +

{{title}}

diff --git a/modules/universal_table/index5.html.erb b/modules/universal_table/index5.html.erb index a81b4c5..85cca05 100644 --- a/modules/universal_table/index5.html.erb +++ b/modules/universal_table/index5.html.erb @@ -48,11 +48,10 @@ white-space: nowrap; } .universal-th-text{ - white-space: pre!important; + white-space: pre; overflow: hidden; display: -webkit-box; -webkit-line-clamp: 2; - white-space: normal; } .universal-dropdown-menu { padding: 15px 18px; diff --git a/modules/universal_table/index6.html.erb b/modules/universal_table/index6.html.erb index 087deec..31fb573 100644 --- a/modules/universal_table/index6.html.erb +++ b/modules/universal_table/index6.html.erb @@ -48,11 +48,10 @@ white-space: nowrap; } .universal-th-text{ - white-space: pre!important; + white-space: pre; overflow: hidden; display: -webkit-box; -webkit-line-clamp: 2; - white-space: normal; } .universal-dropdown-menu { padding: 15px 18px;