diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 840ed61..a0a74c4 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -421,6 +421,28 @@ } } +// Widget-17 +.widget-announcement-17 { + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 0.0625em dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0; + } + + .w-annc__postdate-wrap { + font-size: 0.8125em; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } +} + // Announcement index // ## General style for index pages .i-annc { @@ -730,6 +752,38 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl } } +// Index-17 +.index-announcement-17 { + .i-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 0.0625em dashed lighten($theme-gray, 65%); + } + .i-annc__title { + font-size: 0.95rem; + font-weight: 600; + &:before { + content: "•"; + color: #cccccc; + font-size: 1rem; + padding: 0 0.5em; + } + } + .i-annc__entry-title { + margin: 0; + } + + .i-annc__category-wrap, + .i-annc__postdate-wrap { + font-size: 0.8125rem; + color: #666666; + } + + .i-annc__status { + font-size: 0.8125rem; + display: inline-block; + } +} // Announcement show .s-annc { diff --git a/assets/stylesheets/template/modules/epaper.scss b/assets/stylesheets/template/modules/epaper.scss index d903467..cdebbef 100644 --- a/assets/stylesheets/template/modules/epaper.scss +++ b/assets/stylesheets/template/modules/epaper.scss @@ -1,60 +1,83 @@ @charset "utf-8"; - @import "../initial"; -.header-banner img[src*='epaper'] { - position: absolute; - top: 0; - transform: translateX(50%); - right: 50%; - top: 3em; -} -.row.epaper-container { - display: flex; - flex-wrap: wrap; - position: relative; -} -.criteria_list { - thead { - border-left: 6px solid rgb(105, 150, 171); - background: rgb(74, 42, 36); - color: rgb(255, 255, 255); - font-size: 14px; - font-family: 微軟正黑體; +//lastes-criteria +.epaper-index2 { + h3 { + margin: 50px -15px 0; + background: #96210f; + padding: 20px 10px; + text-align: center; + font-weight: 700; + border-radius: 10px 10px 0 0; + a { color: #fff; } } - tbody { - background-color: transparent; - tr { - border-bottom: 1px dotted #4a2a24; - padding: 5px 0; - } - td { - border-top: transparent; - } + div[data-list='topics'][data-level='1'] { + .epaper-index2-container { margin-top: 0; } } } - // slider-fullscreen .latest-fullslider { margin-bottom: 2em; + .epaper-container { + display: flex; + margin: 0; + align-items: center; + justify-content: center; + } .right-fullslider { white-space: normal; padding: 0 2em 2em; h3 { - font-size: 2em; + font-size: 1.8em; text-align: center; font-weight: 600; } } - .left-fullslider { padding-right: 0; text-align: center;} - .epaper-description { white-space: normal; } - .epaper-container { - min-height: 400px; + .left-fullslider { + padding-right: 0; + text-align: center; + display: flex; + margin: 0; + align-items: center; + justify-content: center; + @media(max-width: 800px) { + height: unset; + max-height: unset; + } } + .epaper-description { white-space: normal; } .banner-Container { background: #fff;} } +@media(min-width: 768px){ + .latest-fullslider{ + .right-fullslider{ + .right-box{ + h3,h4,div{ + text-align: center; + color: #333; + margin-top: 20px; + } + h3{ + font-size: 1.8rem; + } + h4{ + font-size: 1.2rem; + } + } + + } + .left-fullslider { + img { + width: 100%; + overflow: hidden; + } + + } + } +} @media(max-width: 768px){ .latest-fullslider{ .epaper-container{ @@ -64,35 +87,31 @@ position: absolute; bottom: 0; right: 0; - background-color: rgba(0, 0, 0, 0.5); - a { color: $theme-white; } + background-color: rgba(60, 16, 15, 0.8784313725490196); + .epaper-description { + color: #fff; + } + h3, h4 { + font-size: 1em; + color: #ffaa26; + &:hover { + color: lighten($color: #ffaa26, $amount: 10) + } + } } .left-fullslider{ + padding: 20px 0; img{ width: 100%; - max-height: 417px; overflow: hidden; + min-height: 250px; } } } } -//slider -.latest_slider { - display: flex; - flex-direction: column; - h3 { margin-bottom: 0; } - .banner-Container { background: #fff; min-height: 300px; padding: 0 1rem 2rem; } - .epaper-container { - white-space: normal; - flex-direction: column; - h4 { white-space: normal; } - img { width: 20em; } - .epaper-description { white-space: normal; padding-top: 1em;} - } - .e-paper.btn { font-size: 0.65rem; } -} + // epaper-show page @@ -142,9 +161,9 @@ } } -.epaper-rightContent{ - width: 50%; -} +// .epaper-rightContent{ +// width: 50%; +// } @media(min-width: 768px){ position: relative; @@ -162,7 +181,6 @@ } } // epaper-index2 - .epaper-index2-container{ border-style: solid; border-color: #ccc; @@ -171,15 +189,18 @@ border-bottom: 1px solid #ccc;//#e1e1e1; margin: 0; padding: 10px 0 10px 10px; - span{ - float:right; - margin-right:10px; - color: #0e5c92; - border: 1px solid #d1d1d1; - background: #f0f0f0; - padding: 4px 6px; - font-size: 14px; - margin-top:-3px; + > span { + float:right; + span { + margin-right:10px; + color: #0e5c92; + border: 1px solid #d1d1d1; + background: #f0f0f0; + padding: 4px 6px; + font-size: 14px; + margin-top:-3px; + } + } } margin-top: 15px; diff --git a/modules/announcement/_annc_widget17.html.erb b/modules/announcement/_annc_widget17.html.erb new file mode 100644 index 0000000..cb7b210 --- /dev/null +++ b/modules/announcement/_annc_widget17.html.erb @@ -0,0 +1,31 @@ +
+
+

Search

+
+

+ + +

+
+
+

+ {{widget-title}} +

+ +
+ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
+
\ No newline at end of file diff --git a/modules/announcement/annc_index17.html.erb b/modules/announcement/annc_index17.html.erb new file mode 100644 index 0000000..49ba5e4 --- /dev/null +++ b/modules/announcement/annc_index17.html.erb @@ -0,0 +1,27 @@ +
+

{{page-title}}

+ + + + + + + + + + + + + + + + + +
{{category-head}}{{title-head}}{{date-head}}{{department-head}}
{{category}} + + {{status}} + + {{title}} + {{department}}
+
+{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/info.json b/modules/announcement/info.json index 5666e86..4602b2e 100644 --- a/modules/announcement/info.json +++ b/modules/announcement/info.json @@ -127,6 +127,14 @@ "en" : "16. Table List including Links and attachments (widget-title, category, status, title, view-count)" }, "thumbnail" : "annc_index16_thumbs.png" + }, + { + "filename" : "annc_index17", + "name" : { + "zh_tw" : "17. 標準標題列表-1A ( 類別, 標題, 日期, 張貼人 )", + "en" : "1. Standard Title List-1 ( category, title, postdate, department)" + }, + "thumbnail" : "annc_index1_thumbs.png" } ], "widgets" : [ @@ -257,6 +265,14 @@ "en" : "16. Image + Text slide (widget-title, image, status, postdate, category, title)" }, "thumbnail" : "annc_widget1_thumbs.png" + }, + { + "filename" : "annc_widget17", + "name" : { + "zh_tw" : "17. 含搜尋功能之精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "17. Simple Title List-2 (widget-title, postdate, status, title), including search" + }, + "thumbnail" : "annc_widget11_thumbs.png" } ] } \ No newline at end of file diff --git a/modules/e_paper/_latest_criteria.html.erb b/modules/e_paper/_latest_criteria.html.erb index 73b3223..f4d86a1 100644 --- a/modules/e_paper/_latest_criteria.html.erb +++ b/modules/e_paper/_latest_criteria.html.erb @@ -1,10 +1,31 @@ -
+ + + +
+

{{category_title}}

+
+
+

+ {{title}} + {{category_title}} +

+ +
+ {{title}} +
+ +
+
\ No newline at end of file diff --git a/modules/e_paper/_latest_slider_aside.html.erb b/modules/e_paper/_latest_slider_aside.html.erb index 60eaeb5..967512e 100644 --- a/modules/e_paper/_latest_slider_aside.html.erb +++ b/modules/e_paper/_latest_slider_aside.html.erb @@ -1,46 +1,39 @@ -
-

- {{widget-title}} - <%= (I18n.locale.to_s =="zh_tw") ? "更多 +" : "More NEWS" %> -

- -
- -