diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 232c38d..ea94235 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -463,6 +463,8 @@ body{ } .w-event_news__list{ padding: 0; + display: flex; + flex-wrap: wrap; li{ width: 100%; float: left; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 6c1ce85..fdaa400 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -293,7 +293,7 @@ ul.button-mid{ } // Widget 6 .ba-banner-widget-6 { - height: 100%; + height: 100% !important; .w-ba-banner__wrap{ height: 100%; } diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 2cabb8d..e119bae 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -216,22 +216,18 @@ } } .w-annc__img-wrap { - height: 25em; - margin: 0.5em; - @media(max-width:$screen-xs){ - height:20em; - } - @media(min-width:1920px){ - height: 30em; - } img{ width: auto!important; + position: relative !important; + width: 100% !important; height: 100%!important; margin: 0 !important; max-width: fit-content; } } - .w + .w-annc__item{ + margin-bottom: 0em; + } .w-annc__title { font-family: $main-font; @@ -239,10 +235,18 @@ font-size: 1.2rem; } .w-annc__list{ - @media(min-width:$screen-xs){ + @media(min-width: $screen-sm){ display: grid; - grid-template: auto auto/repeat(12, 1fr); - grid-gap: 0 10px; + grid-template-areas: + "g1 g2 g3" + "g1 g4 g5"; + grid-gap: 2% 1%; + grid-template-columns: 35% 31.5% 31.5%; + } + @media(max-width: $screen-sm-max){ + .w-annc__item{ + margin-bottom: 1em; + } } li{ &:hover{ @@ -259,43 +263,35 @@ flex: 0 0 50%; } &:nth-child(1){ - grid-area: 1 / 1 / 3 / 5; + grid-area: g1; -ms-grid-row: 1; -ms-grid-column: 1; -ms-grid-row-span: 3; -ms-grid-column-span: 7; - .w-annc__img-wrap{ - height: 53em; - } - @media(max-width:$screen-xs){ - .w-annc__img-wrap{ - height: 40em; - } - } } &:nth-child(2){ - grid-area: 1 / 5 / 2 / 9; + grid-area: g2; -ms-grid-row: 1; -ms-grid-column: 9; -ms-grid-row-span: 1; -ms-grid-column-span: 7; } &:nth-child(3){ - grid-area: 1 / 9 / 2 / 13; + grid-area: g3; -ms-grid-row: 1; -ms-grid-column: 17; -ms-grid-row-span: 1; -ms-grid-column-span: 7; } &:nth-child(4){ - grid-area: 2 / 5 / 3 / 9; + grid-area: g4; -ms-grid-row: 3; -ms-grid-column: 9; -ms-grid-row-span: 1; -ms-grid-column-span: 7; } &:nth-child(5){ - grid-area: 2 / 9 / 3 / 13; + grid-area: g5; -ms-grid-row: 3; -ms-grid-column: 17; -ms-grid-row-span: 1; @@ -310,7 +306,6 @@ .card{ position: absolute; z-index: 2; - margin:0 0.5em; padding: 20px 25px; bottom: 0; left: 0; diff --git a/modules/archive/_archive_widget3.html.erb b/modules/archive/_archive_widget3.html.erb index 1978557..45ffc79 100644 --- a/modules/archive/_archive_widget3.html.erb +++ b/modules/archive/_archive_widget3.html.erb @@ -9,7 +9,7 @@ {{archive-title}} diff --git a/modules/archive/_archive_widget4.html.erb b/modules/archive/_archive_widget4.html.erb index 903a726..7791aee 100644 --- a/modules/archive/_archive_widget4.html.erb +++ b/modules/archive/_archive_widget4.html.erb @@ -25,7 +25,7 @@
- {{file-name}} + {{file-name}} {{file-type}}
diff --git a/modules/archive/archive_index1.html.erb b/modules/archive/archive_index1.html.erb index 6efc360..af52014 100644 --- a/modules/archive/archive_index1.html.erb +++ b/modules/archive/archive_index1.html.erb @@ -13,7 +13,7 @@
- {{file-name}} + {{file-name}} {{file-type}}
diff --git a/modules/archive/archive_index12.html.erb b/modules/archive/archive_index12.html.erb index a078919..32aaf84 100644 --- a/modules/archive/archive_index12.html.erb +++ b/modules/archive/archive_index12.html.erb @@ -1,4 +1,4 @@ -
+

{{page-title}}

@@ -25,7 +25,7 @@
- {{file-name}} + {{file-name}} {{file-type}}
@@ -35,4 +35,10 @@
{{link_to_edit}}
+ \ No newline at end of file diff --git a/modules/archive/archive_index13.html.erb b/modules/archive/archive_index13.html.erb index 9339ea5..42e6dc3 100644 --- a/modules/archive/archive_index13.html.erb +++ b/modules/archive/archive_index13.html.erb @@ -15,11 +15,11 @@ {{status}} - + {{archive-title}} - + {{file-type}} @@ -32,6 +32,9 @@ + \ No newline at end of file diff --git a/modules/archive/archive_index15.html.erb b/modules/archive/archive_index15.html.erb new file mode 100644 index 0000000..862df0c --- /dev/null +++ b/modules/archive/archive_index15.html.erb @@ -0,0 +1,41 @@ +
+

+ {{page-title}} +

+ +
+
+ + {{link_to_edit}} +
+
+
+ \ No newline at end of file diff --git a/modules/archive/archive_index2.html.erb b/modules/archive/archive_index2.html.erb index 70fe62e..454f049 100644 --- a/modules/archive/archive_index2.html.erb +++ b/modules/archive/archive_index2.html.erb @@ -12,19 +12,19 @@ -
+
-
+
{{archive-title}} {{status}}
-
+
- {{file-name}} - {{file-type}} + {{file-name}} + {{file-type}}
@@ -33,4 +33,11 @@
{{link_to_edit}}
+
\ No newline at end of file diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb index 21fb229..bbd7caf 100644 --- a/modules/archive/archive_index3.html.erb +++ b/modules/archive/archive_index3.html.erb @@ -12,7 +12,7 @@
- {{file-name}} + {{file-name}} {{file-type}}
diff --git a/modules/archive/archive_index4.html.erb b/modules/archive/archive_index4.html.erb index 48ebcf4..e4c39a4 100644 --- a/modules/archive/archive_index4.html.erb +++ b/modules/archive/archive_index4.html.erb @@ -3,7 +3,7 @@ {{page-title}}
-
+

-
+
@@ -21,14 +21,14 @@
- {{file-name}} - {{file-type}} + {{file-name}} + {{file-type}}
- {{link_to_edit}} + {{link_to_edit}}
\ No newline at end of file diff --git a/modules/archive/archive_index9.html.erb b/modules/archive/archive_index9.html.erb index 4dacf0e..02056ec 100644 --- a/modules/archive/archive_index9.html.erb +++ b/modules/archive/archive_index9.html.erb @@ -19,7 +19,7 @@ {{file-name}} - {{file-type}} + {{file-type}} diff --git a/modules/archive/info.json b/modules/archive/info.json index 860e236..b052589 100644 --- a/modules/archive/info.json +++ b/modules/archive/info.json @@ -99,8 +99,24 @@ { "filename": "archive_index13", "name": { - "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 檔案名稱, 下載連結, 描述 )", - "en": "13. Tab list (widget-title, category, title, filename, download link, description)" + "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 下載連結, 描述 )", + "en": "13. Tab list (widget-title, category, title, download link, description)" + }, + "thumbnail": "ar-tab1.png" + }, + { + "filename": "archive_index14", + "name": { + "zh_tw": "14. 手風琴式列表 - 有下拉 - 針對各筆資料 ( 模組標題, 標題, 檔案名稱, 下載連結 )", + "en": "14. Accordion list - with drop down - For every data (widget-title, title, filename, download link)" + }, + "thumbnail": "ar2.png" + }, + { + "filename": "archive_index15", + "name": { + "zh_tw": "15. 頁籤式 ( 模組標題, 類別標題, 標題, 完整檔案名稱, 下載連結, 描述 )", + "en": "15. Tab list (widget-title, category, title, full filename, download link, description)" }, "thumbnail": "ar-tab1.png" } diff --git a/modules/ask/_ask_widget_form.html.erb b/modules/ask/_ask_widget_form.html.erb index 539e507..55f4880 100644 --- a/modules/ask/_ask_widget_form.html.erb +++ b/modules/ask/_ask_widget_form.html.erb @@ -41,6 +41,9 @@ .ask-question .form-horizontal input[type="text"],.ask-question .form-horizontal select{ width: 97%; } + .ask-question .form-horizontal input[type="text"].hasDatepicker{ + width: auto; + } .ask-question .form-horizontal .form-actions{ position: relative; padding: 1em 0 0 0; diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb index 590cba5..5299a37 100644 --- a/modules/web_resource/_web_res_widget2.html.erb +++ b/modules/web_resource/_web_res_widget2.html.erb @@ -1,4 +1,4 @@ -
+

{{widget-title}}