diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 69682c4..7eca15a 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -7,6 +7,15 @@ // // Widget // ## gerenral styles +.i-archive{ + dd{ + margin-bottom: 0.5em; + width: 100%; + } +} +.i-archive__file-wrap{ + font-size: 1.2em; +} .i-archive__list{ .date-thead{ min-width: 4em; @@ -18,6 +27,7 @@ } } .i-items{ + border: 1px solid #ccc; @media(min-width: 768px){ background-color: #fff; } @@ -42,9 +52,6 @@ @extend .unity-title; } } -.i-archive-item-title{ - font-weight: normal; -} .panel-title{ @extend .i-title; } @@ -144,6 +151,7 @@ .i-archive-title { @extend .unity-title; } +/* 2. 對應的檔案顏色 (轉為 iOS 半透明色調) */ .link { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .txt { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .xlsx { background-color: #9e3050 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ @@ -156,18 +164,17 @@ .rar { background-color: #9e5000 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .xls { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ .odt { background-color: #767676 !important; margin-left: 0.5em; } /* 對比 4.6:1 */ -.table>caption+thead>tr:first-child>td, .table>caption+thead>tr:first-child>th, .table>colgroup+thead>tr:first-child>td, .table>colgroup+thead>tr:first-child>th, .table>thead:first-child>tr:first-child>td, .table>thead:first-child>tr:first-child>th{ - // border-top: 0.0625em solid #ddd; -} // Archive index 1 .index-archive-1 { font-family: $main-font; .i-archive__item-wrap{ - border: 1px solid #ccc; - margin-bottom: 20px; - box-shadow: 0 1px 1px rgba(0, 0, 0, .05); - padding: 15px; + border-bottom: 1px solid #ccc; + padding-bottom: 1em; + padding-top: 1em; + &:last-child{ + border-bottom: 0; + } } .i-archive__archive-title { @@ -187,7 +194,6 @@ list-style: none; } - .i-archive__category-list {} .i-archive__category-title { padding-bottom: 0.3125em; @@ -199,13 +205,12 @@ } .i-archive__file-list { - display: block; margin-bottom: 0; } .i-archive__file-wrap { margin:0; - padding:0.5em 0 0; + padding:0 0 0.5em 0; border-radius: 0.125em; } @@ -343,23 +348,11 @@ } .i-archive__file-name { - font-size: 1.2em; + font-size: 1em; } .i-archive__file-wrap { margin-bottom: 0.625em; - background: #eaecf0; - padding: 5px; - box-sizing: border-box; - transition: all 0.5s ease; - border: 0; - border-radius: 0; - display: flex; - align-items: center; - justify-content: space-between; - .label{ - line-height: unset; - } } .i-archive__item-wrap { @@ -415,7 +408,6 @@ margin-bottom: 1.5em; position: relative; background: #fff; - border-radius: 5px; } .head{ @media(min-width: 821px){ @@ -547,7 +539,6 @@ } li{ list-style: none; - margin-bottom: 0.5em; } } .index-archive-15{ diff --git a/modules/archive/_archive_widget2.html.erb b/modules/archive/_archive_widget2.html.erb index 3bdcf62..2a6cd4d 100644 --- a/modules/archive/_archive_widget2.html.erb +++ b/modules/archive/_archive_widget2.html.erb @@ -6,7 +6,7 @@

-

diff --git a/modules/archive/_archive_widget3.html.erb b/modules/archive/_archive_widget3.html.erb index 275e169..7eaaadf 100644 --- a/modules/archive/_archive_widget3.html.erb +++ b/modules/archive/_archive_widget3.html.erb @@ -10,7 +10,7 @@ diff --git a/modules/archive/_archive_widget4.html.erb b/modules/archive/_archive_widget4.html.erb index 4c5436c..f322849 100644 --- a/modules/archive/_archive_widget4.html.erb +++ b/modules/archive/_archive_widget4.html.erb @@ -7,7 +7,7 @@

- diff --git a/modules/archive/archive_index1.html.erb b/modules/archive/archive_index1.html.erb index a43b4ec..39c0a75 100644 --- a/modules/archive/archive_index1.html.erb +++ b/modules/archive/archive_index1.html.erb @@ -18,7 +18,7 @@
{{file-name}} - {{file-type}} + {{file-type}}

@@ -26,3 +26,19 @@
+ \ No newline at end of file diff --git a/modules/archive/archive_index10.html.erb b/modules/archive/archive_index10.html.erb index fc47cef..5a1a3d9 100644 --- a/modules/archive/archive_index10.html.erb +++ b/modules/archive/archive_index10.html.erb @@ -16,13 +16,14 @@ {{idx}} - {{archive-title}} + {{archive-title}} {{status}} - + + {{description}} - {{file-type}} + {{file-type}} @@ -30,3 +31,23 @@
+ \ No newline at end of file diff --git a/modules/archive/archive_index11.html.erb b/modules/archive/archive_index11.html.erb index f93edd1..8b7ab7c 100644 --- a/modules/archive/archive_index11.html.erb +++ b/modules/archive/archive_index11.html.erb @@ -1,4 +1,4 @@ -
+

{{page-title}}

@@ -8,7 +8,7 @@ {{serial_number-head}} - {{title-head}} + {{title-head}} {{file-head}} @@ -19,11 +19,11 @@ {{serial_number}} - + {{file-name}} - {{file-type}} + {{file-type}} @@ -33,8 +33,22 @@
\ No newline at end of file diff --git a/modules/archive/archive_index12.html.erb b/modules/archive/archive_index12.html.erb index d6f9ca9..7bcbec6 100644 --- a/modules/archive/archive_index12.html.erb +++ b/modules/archive/archive_index12.html.erb @@ -1,44 +1,69 @@ -
+

{{page-title}}

-
+

- - -

-
-
- {{archive-title}} +
+
+
+ {{archive-title}} {{status}} -
-
+ {{description}} +
+
{{file-name}} - {{file-type}} + {{file-type}}
- - +
+
+
{{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 42e6dc3..7aeabe0 100644 --- a/modules/archive/archive_index13.html.erb +++ b/modules/archive/archive_index13.html.erb @@ -11,20 +11,20 @@
{{link_to_edit}} @@ -32,9 +32,34 @@
\ No newline at end of file diff --git a/modules/archive/archive_index16.html.erb b/modules/archive/archive_index16.html.erb index 69ffe02..17640c9 100644 --- a/modules/archive/archive_index16.html.erb +++ b/modules/archive/archive_index16.html.erb @@ -8,7 +8,7 @@

{{created_at}}
- diff --git a/modules/archive/archive_index17.html.erb b/modules/archive/archive_index17.html.erb new file mode 100644 index 0000000..8cdec44 --- /dev/null +++ b/modules/archive/archive_index17.html.erb @@ -0,0 +1,47 @@ +
+

+ {{page-title}} +

+ +
+ \ No newline at end of file diff --git a/modules/archive/archive_index2.html.erb b/modules/archive/archive_index2.html.erb index c66ae1c..ed5dfca 100644 --- a/modules/archive/archive_index2.html.erb +++ b/modules/archive/archive_index2.html.erb @@ -6,37 +6,56 @@

-

-
-
+
+
+
{{archive-title}} {{status}} -
-
+ {{description}} +
+
{{file-name}} - {{file-type}} + {{file-type}}
- - +
+
+
{{link_to_edit}} diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb index 228f4a1..e2c4138 100644 --- a/modules/archive/archive_index3.html.erb +++ b/modules/archive/archive_index3.html.erb @@ -11,15 +11,29 @@ {{status}} + {{description}}
{{file-name}} - {{file-type}} + {{file-type}}
- \ No newline at end of file + + \ No newline at end of file diff --git a/modules/archive/archive_index4.html.erb b/modules/archive/archive_index4.html.erb index 6d6095f..dab0713 100644 --- a/modules/archive/archive_index4.html.erb +++ b/modules/archive/archive_index4.html.erb @@ -6,29 +6,54 @@

-

-
-
+
+
+
{{status}} -
-
+ {{description}}
{{file-name}} - {{file-type}} + {{file-type}}
-
-
+
+
+
- {{link_to_edit}} + {{link_to_edit}} - \ No newline at end of file + + diff --git a/modules/archive/archive_index5.html.erb b/modules/archive/archive_index5.html.erb index 5263026..4195a4b 100644 --- a/modules/archive/archive_index5.html.erb +++ b/modules/archive/archive_index5.html.erb @@ -15,13 +15,14 @@
{{created_at}}
- {{archive-title}} + {{archive-title}} - {{status}} - + {{status}} + + {{description}}
- {{file-type}} + {{file-type}}
@@ -37,4 +38,22 @@ if( window.location.href.indexOf('/en/') > -1 ) { $('.title-thead').replaceWith('
Title
') $('.file-thead').replaceWith('
Download file
') } - \ No newline at end of file + + \ No newline at end of file diff --git a/modules/archive/archive_index6.html.erb b/modules/archive/archive_index6.html.erb index 2c46edf..79fb38e 100644 --- a/modules/archive/archive_index6.html.erb +++ b/modules/archive/archive_index6.html.erb @@ -1,46 +1,48 @@ -
-

+
+

{{page-title}}

-
-

{{category-title}}

-
-
-
上傳日期
-
標題
-
檔案下載
-
-
-
-
-
{{created_at}}
-
-
-
- {{file-name}} - - {{status}} - -
-
-
-
-
- {{file-type}} -
-
-
-
+
    +
  • +

    {{category-title}}

    +
    +
    +
    +
    {{created_at}}
    + {{archive-title}} + + {{status}} + +
    + {{description}} +
    +
    + + {{file-name}} + {{file-type}} +
    +
    -
-
-
+ + +
- - \ No newline at end of file +.index-archive-1{ + .date { + font-size: 1.2rem; + font-weight: normal; + } +} + .i-archive__item-wrap { + background: #eaeef0; + } + + \ No newline at end of file diff --git a/modules/archive/archive_index7.html.erb b/modules/archive/archive_index7.html.erb index e4216af..d69e936 100644 --- a/modules/archive/archive_index7.html.erb +++ b/modules/archive/archive_index7.html.erb @@ -1,54 +1,51 @@ -
+

{{page-title}}

-
-

{{category-title}}

- - - - - - - - - - - - - - - - {{status}} - - - - - -
{{date-head}}{{title-head}}{{description-head}}{{file-head}}
{{created_at}}{{archive-title}}{{description}} - {{file-type}} -
+ +
+

{{category-title}}

+
+
+

+ +

+
+
+
+ +
+
+
+ {{link_to_edit}}
+
- - - diff --git a/modules/archive/archive_index8.html.erb b/modules/archive/archive_index8.html.erb index f6e3cc6..db0d78b 100644 --- a/modules/archive/archive_index8.html.erb +++ b/modules/archive/archive_index8.html.erb @@ -1,40 +1,48 @@ -
-

+
+

{{page-title}}

-
-

{{category-title}}

-
-
-
{{date-head}}
-
{{title-head}}
-
{{description-head}}
-
{{file-head}}
-
-
-
-
-
{{created_at}}
-
-
-
- {{file-name}} - - {{status}} - -
-
-
-
{{description}}
-
-
- {{file-type}} -
-
-
-
+
    +
  • +

    {{category-title}}

    +
    +
    +
    + {{archive-title}} + + {{status}} + + {{description}} +
    +
    +
    + {{file-type}} +
    +
    -
-
-
-
\ No newline at end of file + + + +

+ \ No newline at end of file diff --git a/modules/archive/archive_index9.html.erb b/modules/archive/archive_index9.html.erb index b92f33c..2b036d8 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}} @@ -28,3 +28,20 @@
+ \ No newline at end of file diff --git a/modules/archive/info.json b/modules/archive/info.json index a1dd43e..082794a 100644 --- a/modules/archive/info.json +++ b/modules/archive/info.json @@ -1,73 +1,97 @@ { "frontend": [ - { - "filename": "archive_index1", - "name": { - "zh_tw": "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en": "1. List (widget-title, category, filename, download link)" - }, - "thumbnail": "ar1.png" - }, { "filename": "archive_index2", "name": { - "zh_tw": "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", + "zh_tw": "A1. 手風琴式列表 ( 類別折疊,（左）檔案室標題與說明,（右）檔名及Icon)", "en": "2. Accordion list (widget-title, category, filename, download link)" }, "thumbnail": "ar2.png" - }, + }, { - "filename": "archive_index3", + "filename": "archive_index12", "name": { - "zh_tw": "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )", - "en": "3. List(no filename) (widget-title, category, download link)" + "zh_tw": "A1-1. 手風琴式列表 ( 類別折疊,（上）檔案室標題與說明,（下）檔名及Icon)", + "en": "12. Accordion list - with drop down (widget-title, category, filename, download link)" }, - "thumbnail": "ar3.png" + "force_cover": "true", + "thumbnail": "ar12.png" }, { "filename": "archive_index4", "name": { - "zh_tw": "4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )", + "zh_tw": "A2. 手風琴式列表 ( 類別折疊, 檔案室說明, 檔名Icon)", "en": "4. Accordion list(no filename) (widget-title, category, download link)" }, "thumbnail": "ar4.png" }, { - "filename": "archive_index5", + "filename": "archive_index14", "name": { - "zh_tw": "5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en": "5. Table list (widget-title, category, filename, download link)" + "zh_tw": "A3. 手風琴式列表 ( 類別折疊, 檔案室說明, 檔名Icon)", + "en": "14. Accordion list - with drop down - For every data (widget-title, title, filename, download link)" }, - "thumbnail": "ar5.png" - }, - { - "filename": "archive_index6", - "name": { - "zh_tw": "6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )", - "en": "6. Table list (widget-title, filename, download link)" - }, - "thumbnail": "ar5.png" - }, + "force_cover": "true", + "thumbnail": "ar14.png" + }, { "filename": "archive_index7", "name": { - "zh_tw": "7. 表格列表 ( 模組標題, 類別標題, 上傳日期, 檔案名稱, 檔案簡介, 下載連結 )", + "zh_tw": "A4. 手風琴式列表 ( 類別區塊, 檔案室標題折疊, 檔案室說明, 檔名Icon)", "en": "7. Table list (widget-title, category, Updated At, filename, download link)" }, - "thumbnail": "ar5.png" + "thumbnail": "ar7.png" + }, + + + + { + "filename": "archive_index1", + "name": { + "zh_tw": "L1. 條列式列表 ( 類別區塊, 檔案室標題, 檔案室說明, 檔名Icon )", + "en": "1. List (widget-title, category, filename, download link)" + }, + "thumbnail": "ar1.png" + }, + { + "filename": "archive_index3", + "name": { + "zh_tw": "L2. 條列式列表 ( 類別區塊, 檔案室說明, 檔名Icon )", + "en": "3. List(no filename) (widget-title, category, download link)" + }, + "thumbnail": "ar3.png" }, { "filename": "archive_index8", "name": { - "zh_tw": "8. 表格列表 ( 模組標題, 上傳日期, 檔案名稱, 檔案簡介, 下載連結 )", + "zh_tw": "L3. 條列式列表 ( 類別區塊, 檔案室標題及說明, Icon)", "en": "8. Table list (widget-title, Updated At, filename, download link)" }, + "thumbnail": "ar8.png" + }, + { + "filename": "archive_index6", + "name": { + "zh_tw": "L4. 條列式列表 ( 類別區塊, 檔案室日期, 檔名Icon檔案室說明)", + "en": "6. Table list (widget-title, filename, download link)" + }, + "thumbnail": "ar6.png" + }, + + + + { + "filename": "archive_index5", + "name": { + "zh_tw": "G1. 表格式列表 ( 類別區塊, 檔案室日期, 檔案室標題, 檔案室說明, Icon)", + "en": "5. Table list (widget-title, category, filename, download link)" + }, "thumbnail": "ar5.png" }, { "filename": "archive_index9", "name": { - "zh_tw": "9. 表格列表 - 簡約 ( 模組標題, 檔案名稱, 下載連結 )", + "zh_tw": "G2. 表格式列表 ( 類別區塊, 檔名, Icon )", "en": "9. Table list - Simple (widget-title, filename, download link)" }, "force_cover": "true", @@ -76,32 +100,25 @@ { "filename": "archive_index10", "name": { - "zh_tw": "10. 表格列表 ( 模組標題, 類別標題, 編號, 檔案名稱, 下載連結 )", + "zh_tw": "G3. 表格式列表 ( 類別區塊, 編號, 檔案室標題, 檔案室說明, Icon)", "en": "10. Table list (widget-title, category, Serial Number, filename, download link)" }, - "thumbnail": "ar5.png" + "thumbnail": "ar10.png" }, { "filename": "archive_index11", "name": { - "zh_tw": "11. 表格列表 - 簡約 - 展開檔案 ( 模組標題, 類別標題, 編號, 檔案名稱, 下載連結 )", + "zh_tw": "G4. 表格式列表 ( 類別區塊, 編號, 檔名, Icon)", "en": "11. Table list - Simple - Unfold Files (widget-title, category, Serial Number, filename, download link)" }, - "thumbnail": "ar9.png" - }, - { - "filename": "archive_index12", - "name": { - "zh_tw": "12. 手風琴式列表 - 有下拉 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en": "12. Accordion list - with drop down (widget-title, category, filename, download link)" - }, - "force_cover": "true", - "thumbnail": "ar2.png" + "thumbnail": "ar11.png" }, + + { "filename": "archive_index13", "name": { - "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 下載連結, 描述 )", + "zh_tw": "T1. 頁籤式 ( 類別頁籤, 檔案室標題, 檔案室說明, Icon)", "en": "13. Tab list (widget-title, category, title, download link, description)" }, "old_name": { @@ -109,34 +126,16 @@ "en": "13. Tab list (widget-title, category, title, filename, download link, description)" }, "force_cover": "true", - "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)" - }, - "force_cover": "true", - "thumbnail": "ar2.png" + "thumbnail": "ar13.png" }, { "filename": "archive_index15", "name": { - "zh_tw": "15. 頁籤式 ( 模組標題, 類別標題, 標題, 完整檔案名稱, 下載連結, 描述 )", + "zh_tw": "T2. 頁籤式 ( 類別頁籤, 檔案室標題, 檔案室說明, 檔名Icon)", "en": "15. Tab list (widget-title, category, title, full filename, download link, description)" }, "force_cover": "true", - "thumbnail": "ar-tab1.png" - }, - { - "filename": "archive_index16", - "name": { - "zh_tw": "16. 手風琴式列表 - 有下拉 - 針對各筆資料 ( 模組標題, 標題, 檔案名稱, 下載連結 )", - "en": "16. Accordion list - with drop down - For every data (date,widget-title, title, filename, download link)" - }, - "force_cover": "true", - "thumbnail": "ar2.png" + "thumbnail": "ar15.png" } ], "widgets": [ diff --git a/modules/archive/thumbs/ar1.png b/modules/archive/thumbs/ar1.png index e7cc100..6ee5487 100644 Binary files a/modules/archive/thumbs/ar1.png and b/modules/archive/thumbs/ar1.png differ diff --git a/modules/archive/thumbs/ar10.png b/modules/archive/thumbs/ar10.png new file mode 100644 index 0000000..169fe95 Binary files /dev/null and b/modules/archive/thumbs/ar10.png differ diff --git a/modules/archive/thumbs/ar11.png b/modules/archive/thumbs/ar11.png new file mode 100644 index 0000000..c811477 Binary files /dev/null and b/modules/archive/thumbs/ar11.png differ diff --git a/modules/archive/thumbs/ar12.png b/modules/archive/thumbs/ar12.png new file mode 100644 index 0000000..5a34814 Binary files /dev/null and b/modules/archive/thumbs/ar12.png differ diff --git a/modules/archive/thumbs/ar13.png b/modules/archive/thumbs/ar13.png new file mode 100644 index 0000000..b5bc8ce Binary files /dev/null and b/modules/archive/thumbs/ar13.png differ diff --git a/modules/archive/thumbs/ar14.png b/modules/archive/thumbs/ar14.png new file mode 100644 index 0000000..d7d0271 Binary files /dev/null and b/modules/archive/thumbs/ar14.png differ diff --git a/modules/archive/thumbs/ar15.png b/modules/archive/thumbs/ar15.png new file mode 100644 index 0000000..5c3b6f0 Binary files /dev/null and b/modules/archive/thumbs/ar15.png differ diff --git a/modules/archive/thumbs/ar2.png b/modules/archive/thumbs/ar2.png index 751fed2..03c113e 100644 Binary files a/modules/archive/thumbs/ar2.png and b/modules/archive/thumbs/ar2.png differ diff --git a/modules/archive/thumbs/ar3.png b/modules/archive/thumbs/ar3.png index 723ba3a..e36ff57 100644 Binary files a/modules/archive/thumbs/ar3.png and b/modules/archive/thumbs/ar3.png differ diff --git a/modules/archive/thumbs/ar4.png b/modules/archive/thumbs/ar4.png index 2a7c106..a3307e5 100644 Binary files a/modules/archive/thumbs/ar4.png and b/modules/archive/thumbs/ar4.png differ diff --git a/modules/archive/thumbs/ar5.png b/modules/archive/thumbs/ar5.png index 1790944..d5c5eee 100644 Binary files a/modules/archive/thumbs/ar5.png and b/modules/archive/thumbs/ar5.png differ diff --git a/modules/archive/thumbs/ar6.png b/modules/archive/thumbs/ar6.png new file mode 100644 index 0000000..7368c8c Binary files /dev/null and b/modules/archive/thumbs/ar6.png differ diff --git a/modules/archive/thumbs/ar7.png b/modules/archive/thumbs/ar7.png new file mode 100644 index 0000000..d4fe6c6 Binary files /dev/null and b/modules/archive/thumbs/ar7.png differ diff --git a/modules/archive/thumbs/ar8.png b/modules/archive/thumbs/ar8.png new file mode 100644 index 0000000..9dac30c Binary files /dev/null and b/modules/archive/thumbs/ar8.png differ diff --git a/modules/archive/thumbs/ar9.png b/modules/archive/thumbs/ar9.png index 8b11bb7..72d67fc 100644 Binary files a/modules/archive/thumbs/ar9.png and b/modules/archive/thumbs/ar9.png differ