From 5c005f3198dc81644630524e99670c2c2792bcac Mon Sep 17 00:00:00 2001 From: ken Date: Fri, 11 Sep 2026 13:39:07 +0800 Subject: [PATCH] update --- .../{template.scss => base/_body-styles.scss} | 63 ++++++------------- assets/stylesheets/template/base/_unity.scss | 9 +++ .../template/modules/announcement.scss | 25 ++------ .../stylesheets/template/template-base.scss | 10 +++ .../stylesheets/template/template-layout.scss | 2 + .../template/template-modules.scss | 5 ++ modules/announcement/_annc_widget1.html.erb | 28 +++++---- modules/announcement/_annc_widget24.html.erb | 6 +- .../_annc_widget15.html.erb | 6 +- .../_annc_widget4.html.erb | 6 +- 10 files changed, 74 insertions(+), 86 deletions(-) rename assets/stylesheets/template/{template.scss => base/_body-styles.scss} (96%) create mode 100644 assets/stylesheets/template/template-base.scss create mode 100644 assets/stylesheets/template/template-layout.scss create mode 100644 assets/stylesheets/template/template-modules.scss diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/base/_body-styles.scss similarity index 96% rename from assets/stylesheets/template/template.scss rename to assets/stylesheets/template/base/_body-styles.scss index 1a8e3b4..cf839d4 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/base/_body-styles.scss @@ -1,26 +1,3 @@ - -// Base -@import "base/orbitbar-override"; -@import "base/sitemap-override"; -@import "base/global"; -@import "base/unity"; -@import "base/utilities"; -@import "base/pagination"; -@import "base/accesskey"; -@import "base/go_back_top"; -@import "base/ckeditor-reset"; - -// Layout -@import "layout/*"; - -// Modules -@import "modules/*"; - -// Widget -@import "widget/*"; - -//RWD -@import "RWD"; .list-unstyled::after { content: ""; display: table; @@ -76,26 +53,6 @@ input:hover { } } // container setting -.response-container { - position: relative; - margin:auto; - z-index: 1; - @media (max-width: $screen-xs) { - width: 100%; - } - @media (min-width: $screen-sm) { - width: 100%; - - } - @media (min-width: $screen-md) { - width: 80%; - } - - @media (min-width: $screen-lg) { - max-width: 1700px; - padding: 0; - } -} .dropdowns{ @media (min-width: $screen-md) { margin: auto; @@ -136,6 +93,7 @@ ul.tab_nav,.nav_tabs_filter { color: #5e5e5e; box-shadow: 0px 6px 20px 0px #64646f33; border-radius: 3em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: none; @media(max-width:$screen-xs){ width:40%; @@ -217,6 +175,7 @@ ul.tab_nav,.nav_tabs_filter { } .black-screen-social-window.reactable .content-social .social_wrap > div:hover, .black-screen-social-window.reactable .content-social .social_wrap > div.hover-class{ border-radius: 30px 0 0 30px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background: #fff; } .hide_sharer_button{ @@ -261,6 +220,7 @@ ul.tab_nav,.nav_tabs_filter { background: #c0155a; color: #fff; border-radius: 8px 0 0 8px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); display: flex; flex-direction: column; align-items: center; @@ -278,6 +238,7 @@ ul.tab_nav,.nav_tabs_filter { outline: 3px solid #fff; outline-offset: -3px; border-radius: 8px 0 0 8px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } } @@ -300,6 +261,7 @@ ul.tab_nav,.nav_tabs_filter { background: transparent; border: none; border-radius: 8px 0 0 8px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } /* hover 或 focus-within 時自動展開 */ @@ -538,6 +500,7 @@ ul.tab_nav,.nav_tabs_filter { position: absolute; padding: 0.1em 1.5em; border-radius: 1em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #f5c346; color: #333; left: 36%; @@ -568,6 +531,7 @@ ul.tab_nav,.nav_tabs_filter { position: absolute; padding: 0.1em 1.5em; border-radius: 1em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #5a89f5; color: #333; left: 36%; @@ -598,6 +562,7 @@ ul.tab_nav,.nav_tabs_filter { position: absolute; padding: 0.1em 1.5em; border-radius: 1em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #464063; color: #333; left: 36%; @@ -628,6 +593,7 @@ ul.tab_nav,.nav_tabs_filter { position: absolute; padding: 0.1em 1.5em; border-radius: 1em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #ed7b77; color: #333; left: 36%; @@ -658,6 +624,7 @@ ul.tab_nav,.nav_tabs_filter { position: absolute; padding: 0.1em 1.5em; border-radius: 1em; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 2px solid #afaac8; color: #333; left: 36%; @@ -758,6 +725,7 @@ table.dataTable>tbody>tr.child{ .modal-content{ box-shadow: 0 24px 38px 3px #00000024, 0 9px 46px 8px #0000001f, 0 11px 15px -7px #00000033; border-radius: 8px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 0; } .fc .fc-daygrid-day.fc-day-today{ @@ -1037,6 +1005,7 @@ a.ui-state-default{ letter-spacing: 2px; outline: none; border-radius: 25px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); transition: all .5s ease-in-out; background:none; padding-right: 40px; @@ -1093,6 +1062,7 @@ a.ui-state-default{ outline: none; cursor: pointer; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); position: absolute; right: 0px; color:#333; @@ -1105,6 +1075,7 @@ a.ui-state-default{ .btn-search:focus ~ .input-search{ width: 150px; border-radius: 0px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-color: transparent; border-bottom:1px solid rgba(255,255,255,.5); transition: all 500ms cubic-bezier(0, 0.110, 0.35, 2); @@ -1113,6 +1084,7 @@ a.ui-state-default{ .input-search:focus{ width: 150px; border-radius: 0px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-color: transparent; border-bottom:1px solid rgba(255,255,255,.5); transition: all 500ms cubic-bezier(0, 0.110, 0.35, 2); @@ -1132,6 +1104,7 @@ a.ui-state-default{ .btn-search-trigger:focus { outline: 2px solid #1a1a1a; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } /* overlay 全螢幕 */ @@ -1165,6 +1138,7 @@ a.ui-state-default{ line-height: 1; padding: 0.25rem 0.5rem; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); transition: color 0.2s; } @@ -1195,6 +1169,7 @@ a.ui-state-default{ align-items: center; border: 2px solid #1a1a1a; border-radius: 50px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); overflow: hidden; padding: 0 0.5rem 0 1.5rem; } @@ -1294,4 +1269,4 @@ hr{ right: 3em; } } -} \ No newline at end of file +} diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index eeb65f3..2daaf1b 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -148,6 +148,15 @@ color: $theme-white; } } +.btn-warning{ + background-color: $theme-color-second; + color: #fff; + &:hover{ + background-color: $theme-color-second; + color: #fff; + opacity: .8; + } +} ol, ul{ padding-left: 1.6em; text-align: left; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 3a9123f..f626ccb 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -201,6 +201,9 @@ position: relative !important; } } + .w-annc__content-wrap{ + padding: 1em; + } .w-annc__item{ background-color: #fff; border: 1px solid #dedcdc; @@ -214,7 +217,6 @@ } } .w-annc__entry-title{ - display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; @@ -225,12 +227,6 @@ padding: 1em; display: none; } - .w-annc__subtitle{ - padding:1em; - } - .w-annc__entry-title{ - padding: 0 1em; - } } // Widget-2 @@ -1051,11 +1047,6 @@ -webkit-box-orient: vertical; } } - .clearfix{ - // text-align: center; - // display: flex; - // justify-content: center; - } .w-annc__subtitle { display: -webkit-box; -webkit-line-clamp: 2; @@ -1065,6 +1056,7 @@ } .w-annc__content-wrap { display: inline-block; + color: #fff; &:after { content: ''; display: block; @@ -1108,14 +1100,6 @@ box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033; -webkit-box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033; } - img{ - // transform: scale(1.2)!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; - } .transitionfade{ height: inherit; position: absolute; @@ -1405,6 +1389,7 @@ left: 0; background: linear-gradient(180deg, rgba(255, 255, 255, 0) 2%, rgba(0, 0, 0, 0.501961) 89%); width: 100%; + color: #fff; } .card:before{ content: ""; diff --git a/assets/stylesheets/template/template-base.scss b/assets/stylesheets/template/template-base.scss new file mode 100644 index 0000000..ed30e78 --- /dev/null +++ b/assets/stylesheets/template/template-base.scss @@ -0,0 +1,10 @@ +@import "base/orbitbar-override"; +@import "base/sitemap-override"; +@import "base/global"; +@import "base/unity"; +@import "base/utilities"; +@import "base/pagination"; +@import "base/accesskey"; +@import "base/go_back_top"; +@import "base/ckeditor-reset"; +@import "base/response-container"; diff --git a/assets/stylesheets/template/template-layout.scss b/assets/stylesheets/template/template-layout.scss new file mode 100644 index 0000000..40aeef1 --- /dev/null +++ b/assets/stylesheets/template/template-layout.scss @@ -0,0 +1,2 @@ +@import "base/response-container"; +@import "layout/*"; diff --git a/assets/stylesheets/template/template-modules.scss b/assets/stylesheets/template/template-modules.scss new file mode 100644 index 0000000..56886da --- /dev/null +++ b/assets/stylesheets/template/template-modules.scss @@ -0,0 +1,5 @@ +@import "base/unity"; +@import "modules/*"; +@import "widget/*"; +@import "RWD"; +@import "base/body-styles"; diff --git a/modules/announcement/_annc_widget1.html.erb b/modules/announcement/_annc_widget1.html.erb index 39f6e89..aa3aa9b 100644 --- a/modules/announcement/_annc_widget1.html.erb +++ b/modules/announcement/_annc_widget1.html.erb @@ -8,21 +8,23 @@
{{img_description}}
-
- - {{postdate}} - - - {{category}} +
+
+ + {{postdate}} + + + {{category}} + +
+ + {{status}} +

+ {{title}} +

+

{{subtitle}}

- - {{status}} - -

- {{title}} -

-

{{subtitle}}

diff --git a/modules/announcement/_annc_widget24.html.erb b/modules/announcement/_annc_widget24.html.erb index d3db771..9fa6351 100644 --- a/modules/announcement/_annc_widget24.html.erb +++ b/modules/announcement/_annc_widget24.html.erb @@ -14,9 +14,6 @@
- - {{status}} - {{postdate}} @@ -26,6 +23,9 @@ {{category}}
+ + {{status}} +

{{title}}

diff --git a/modules/custom_announcement/_annc_widget15.html.erb b/modules/custom_announcement/_annc_widget15.html.erb index 05172c6..241740f 100644 --- a/modules/custom_announcement/_annc_widget15.html.erb +++ b/modules/custom_announcement/_annc_widget15.html.erb @@ -16,9 +16,6 @@
- - {{status}} - {{postdate}} @@ -28,6 +25,9 @@ {{category}}
+ + {{status}} +

{{title}}

diff --git a/modules/custom_announcement/_annc_widget4.html.erb b/modules/custom_announcement/_annc_widget4.html.erb index 5b2ae74..5a4b7da 100644 --- a/modules/custom_announcement/_annc_widget4.html.erb +++ b/modules/custom_announcement/_annc_widget4.html.erb @@ -12,9 +12,6 @@
- - {{status}} - {{postdate}} @@ -24,6 +21,9 @@ {{category}}
+ + {{status}} +

{{title}}