diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 27af18d..a79bac6 100755 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -528,6 +528,24 @@ // 當文件物件模型(DOM)載入後，執行init函數 $(document).ready(function(){ + $(".popup-btn").click(function() { + var href = $(this).attr("href") + $(href).fadeIn(250); + $(href).children$("popup-box").removeClass("transform-out").addClass("transform-in"); + e.preventDefault(); + }); + + $(".popup-close").click(function() { + closeWindow(); + }); + // $(".popup-wrap").click(function(){ + // closeWindow(); + // }) + function closeWindow(){ + $(".popup-wrap").fadeOut(200); + $(".popup-box").removeClass("transform-in").addClass("transform-out"); + event.preventDefault(); + } //RWD 自動縮放headerbannner function headerH() { if ($(window).width() < 769) { diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index dde51c1..cc5d2e5 100755 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -239,3 +239,84 @@ margin-top: 10px; transform: translateY(0) translateZ(0); } } +//// +.wrap { + text-align: center; + padding-top: 20%; +} +.btn { + background-color: #FFB80C; + text-decoration: none; + color: #1e1e1e; + padding: 16px; + border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); +} + +.popup-wrap { + width: 100%; + height: 100%; + display: block; + position: fixed; + top: 0px; + left: 0px; + content: ''; + background: rgba(0, 0, 0, 0.85); + z-index: 10; +} + +.popup-box { + width:80%; + padding: 50px 75px; + transform: translate(-50%, -50%) scale(0.5); + position: absolute; + top: 50%; + left: 50%; + box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.5); + border-radius: 3px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); + background: #fff; + text-align: center; +} + +h3 { + font-size: 2em; + color: #333; + font-weight: bold; + letter-spacing: 3px; + text-align: initial; + line-height: 1.5em; +} + +.close-btn { + width: 50px; + height: 50px; + display: inline-block; + position: absolute; + top: 10px; + right: 10px; + border-radius: 100%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); + background: #d75f70; + font-weight: bold; + text-decoration: none; + color: #fff; + line-height: 40px; + font-size: 32px; +} + +.transform-in, .transform-out { + display: block; + -webkit-transition: all ease 0.5s; + transition: all ease 0.5s; +} + +.transform-in { + -webkit-transform: translate(-50%, -50%) scale(1); + transform: translate(-50%, -50%) scale(1); +} + +.transform-out { + -webkit-transform: translate(-50%, -50%) scale(0.5); + transform: translate(-50%, -50%) scale(0.5); +} diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 19ea321..3965e6c 100755 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -110,9 +110,11 @@ // Widget-4 .widget-announcement-4 { .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; + + color: #fccc27; + font-size: 1.1rem; + font-weight: 600; + letter-spacing: 0; } .w-annc__widget-title { float: left; } .w-annc__more { margin-top: 1.5em; } @@ -125,7 +127,27 @@ margin: 0 0 1em 0; } } - +// Widget-21 +.widget-announcement-21 { + .w-annc__title{ + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + .w-annc__subtitle{ + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + .w-annc__img-wrap{ + height: 10.5em; + margin: 0; + } +} // Widget-5 .widget-announcement-5 { .w-annc__title { diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index d803c1a..72e7060 100755 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -121,4 +121,46 @@ line-height: 2.5; } } + &.index3 { + .list-unstyled { + display: flex; + flex-wrap: wrap; + } + .index-content { + padding: 1em; + } + .status-top { + line-height: 2.5; + } + .borderwhite{ + border: 1px solid #ffffff4d; + padding: 10px; + position: relative; + } + .index-content-title{ + h4{ + color: #fff; + font-size: 1.15rem; + font-weight: 500; + letter-spacing: 2px; + } + .index-context{ + color: #ffbd19; + font-weight: 300; + font-size: .95rem; + } + } + .link-img-wrap{ + margin: 0; + display: block; + height: auto!important; + img{ + width: 100%; + } + } + .link-title{ + color: #fff!important; + font-size: 1.15rem!important; + } + } } diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 06d16e8..ba9d193 100755 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -197,22 +197,35 @@ ul.tab_nav { font-family: $main-font; li { - padding: 0.5em 1em; - background: $theme-color-green; - margin: 0.2em; + width: 16%; + background: #2f3132; + padding: 12px; + text-align: center; + font-size: 1.1rem; + letter-spacing: 2px; + color: #eee; + margin-bottom: 8px; cursor: pointer; transition: all 0.5s; -moz-transition: all 0.5s; -webkit-transition: all 0.5s; -o-transition: all 0.5s; - + font-weight: 600; &.active { - background: #19524b; - color: #fff; + color: #333; + background: #ccc; } } } - +.tab_ken{ + background: #222; + margin-top: 5px; + padding: 30px 15px; + img{ + border: 1px solid #aaa; + padding: 5px; + } +} .noscroll { overflow: hidden; position: fixed; } //覆蓋bootstrap 設定 diff --git a/modules/announcement/_annc_widget21.html.erb b/modules/announcement/_annc_widget21.html.erb new file mode 100644 index 0000000..4daeea0 --- /dev/null +++ b/modules/announcement/_annc_widget21.html.erb @@ -0,0 +1,121 @@ +
+
+

+ {{widget-title}} +

+ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
+ +
+ + diff --git a/modules/announcement/_annc_widget4.0.html.erb b/modules/announcement/_annc_widget4.0.html.erb new file mode 100644 index 0000000..3398df8 --- /dev/null +++ b/modules/announcement/_annc_widget4.0.html.erb @@ -0,0 +1,124 @@ +
+
+

+ {{widget-title}} +

+ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
+ +
+ + diff --git a/modules/announcement/annc_index18.html.erb b/modules/announcement/annc_index18.html.erb new file mode 100644 index 0000000..1628f70 --- /dev/null +++ b/modules/announcement/annc_index18.html.erb @@ -0,0 +1,29 @@ +
+

{{page-title}}

+ +
+{{pagination_goes_here}} diff --git a/modules/announcement/annc_index7.5.html.erb b/modules/announcement/annc_index7.5.html.erb new file mode 100644 index 0000000..75287b0 --- /dev/null +++ b/modules/announcement/annc_index7.5.html.erb @@ -0,0 +1,29 @@ +
+

{{page-title}}

+ +
+{{pagination_goes_here}} diff --git a/modules/announcement/info.json b/modules/announcement/info.json index e922bff..c3b5ea8 100755 --- a/modules/announcement/info.json +++ b/modules/announcement/info.json @@ -56,6 +56,14 @@ }, "thumbnail": "annc_index7_thumbs.png" }, + { + "filename": "annc_index18", + "name": { + "zh_tw": "7.5. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "7.5. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index7_thumbs.png" + }, { "filename": "annc_index8", "name": { @@ -170,6 +178,14 @@ }, "thumbnail": "annc_widget3_thumbs.png" }, + { + "filename": "annc_widget21", + "name": { + "zh_tw": "21. 內頁三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "21. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, { "filename": "annc_widget4", "name": { @@ -307,4 +323,4 @@ "thumbnail": "annc_index20_thumbs.png" } ] -} \ No newline at end of file +} diff --git a/modules/web_resource/info.json b/modules/web_resource/info.json index 74b6852..366331a 100755 --- a/modules/web_resource/info.json +++ b/modules/web_resource/info.json @@ -15,6 +15,14 @@ "en" : "2. 3 column List (widget-title, link, link description)" }, "thumbnail" : "thumb.png" + }, + { + "filename" : "web_res_index3", + "name" : { + "zh_tw" : "3. 內頁三欄式列表 ( 模組標題, 連結, 連結說明 )", + "en" : "3. 3 column List (widget-title, link, link description)" + }, + "thumbnail" : "thumb.png" } ], "widgets" : [ diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb index f21f8fc..cf680a1 100755 --- a/modules/web_resource/web_res_index2.html.erb +++ b/modules/web_resource/web_res_index2.html.erb @@ -8,7 +8,7 @@
{{img_description}}
-

+

{{title}} @@ -21,4 +21,4 @@ -{{pagination_goes_here}} \ No newline at end of file +{{pagination_goes_here}} diff --git a/modules/web_resource/web_res_index3.html.erb b/modules/web_resource/web_res_index3.html.erb new file mode 100644 index 0000000..4444358 --- /dev/null +++ b/modules/web_resource/web_res_index3.html.erb @@ -0,0 +1,27 @@ +
+

+ {{page-title}} +

+ +
+{{pagination_goes_here}}