diff --git a/assets/stylesheets/bootstrap/_mixins.scss b/assets/stylesheets/bootstrap/_mixins.scss index 74ccf9f..cbbafd9 100644 --- a/assets/stylesheets/bootstrap/_mixins.scss +++ b/assets/stylesheets/bootstrap/_mixins.scss @@ -303,6 +303,8 @@ @mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down } @@ -314,6 +316,8 @@ @mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down } @@ -322,16 +326,22 @@ background-repeat: repeat-x; background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + -pie-background: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback } @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); + -pie-background: linear-gradient($start-color, $mid-color $color-stop, $end-color); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback } @@ -343,6 +353,8 @@ @mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) { background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); + -pie-background: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } // Reset filters for IE diff --git a/assets/stylesheets/template/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss index fbafbbe..19851f3 100644 --- a/assets/stylesheets/template/layout/slide.scss +++ b/assets/stylesheets/template/layout/slide.scss @@ -7,7 +7,7 @@ z-index: 0; .w-ad-banner { - max-width: 75em; + //max-width: 75em; margin: auto; } -} \ No newline at end of file +} diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 20b43a6..7839c5e 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -37,6 +37,8 @@ width: 100%; bottom: 0; background-image: linear-gradient(180deg,transparent 0,rgba(0,0,0,.7) 40%,#000); + -pie-background: linear-gradient(180deg,transparent 0,rgba(0,0,0,.7) 40%,#000); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); padding: 1.5em 1em; h3 { margin: 0; @@ -85,6 +87,7 @@ width: 0.8em; height: 0.8em; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); opacity: .5; cursor:pointer; border:0; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index a0a74c4..e5ff769 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -927,6 +927,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl text-align: center; background-color: #aab2bd; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -947,6 +948,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl background-color: #4fc1e9; border: 4px solid #f5f7fa; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 50%; -moz-border-radius: 50% } @@ -968,6 +970,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl margin-top: 31px; background-color: #CCC; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -1021,6 +1024,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .VivaTimeline dl dd .events .events-footer ol li { background: #32b487; border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); margin: 10px; display: inline-block; width: 10px; diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 0e719e8..0dac435 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -264,6 +264,7 @@ @media(max-width:580px) { overflow: hidden; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); height: 14em; width: 14em; margin: 1.5em auto 1em auto; diff --git a/modules/active/active_index.html.erb b/modules/active/active_index.html.erb index 5bda937..3bb4e90 100644 --- a/modules/active/active_index.html.erb +++ b/modules/active/active_index.html.erb @@ -14,10 +14,15 @@ {{category}} - {{act_start_date}} ~
{{act_end_date}} - {{title}} - {{sign_start_date}} ~
{{sign_end_date}} - {{sign_up}} + {{act_duration_date}} + + + {{status}} + + {{title}} + + {{sign_duration_date}} + {{sign_up}} diff --git a/modules/active/active_index1.html.erb b/modules/active/active_index1.html.erb new file mode 100644 index 0000000..49fe82a --- /dev/null +++ b/modules/active/active_index1.html.erb @@ -0,0 +1,25 @@ +
+

{{page-title}}

+ + + + + + + + + + + + + + + +
{{th_act_time_range}}{{th_title}}{{th_sign_up}}
{{act_duration_date}} + + {{status}} + + {{title}} + {{sign_up}}
+
+{{pagination_goes_here}} diff --git a/modules/active/active_index2.html.erb b/modules/active/active_index2.html.erb new file mode 100644 index 0000000..99f9a19 --- /dev/null +++ b/modules/active/active_index2.html.erb @@ -0,0 +1,32 @@ +
+

{{page-title}}

+ +
+{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/active/info.json b/modules/active/info.json index 97cd820..aa5f20c 100644 --- a/modules/active/info.json +++ b/modules/active/info.json @@ -3,10 +3,26 @@ { "filename" : "active_index", "name" : { - "zh_tw" : "1. 列表", - "en" : "1. List" - }, + "zh_tw" : "1. 列表 (類別, 活動期間, 狀態, 活動標題, 報名期間, 線上報名)", + "en" : "1. List (Category, Event Period, status, Event Title, Registration Period, Register)" + }, "thumbnail" : "thumb.png" + }, + { + "filename" : "active_index1", + "name" : { + "zh_tw" : "2. 精簡表格列表-2 ( 模組標題, 活動期間, 狀態, 標題, 線上報名)", + "en" : "2. Simple Table List (widget-title, Event Period, status, title, Register)" + }, + "thumbnail" : "active_index1_thumbs.png" + }, + { + "filename" : "active_index2", + "name" : { + "zh_tw" : "3. 三欄圖文 ( 模組標題, 圖片, 狀態, 活動期間, 類別, 標題, 副標題, 線上報名)", + "en" : "3. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle, Register)" + }, + "thumbnail" : "active_index2_thumbs.png" } ] } \ No newline at end of file diff --git a/modules/active/thumbs/active_index1_thumbs.png b/modules/active/thumbs/active_index1_thumbs.png new file mode 100644 index 0000000..0a58044 Binary files /dev/null and b/modules/active/thumbs/active_index1_thumbs.png differ diff --git a/modules/active/thumbs/active_index2_thumbs.png b/modules/active/thumbs/active_index2_thumbs.png new file mode 100644 index 0000000..b69abd9 Binary files /dev/null and b/modules/active/thumbs/active_index2_thumbs.png differ diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb index 1f18ada..8c32071 100644 --- a/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,5 +1,5 @@ -
-
+ -
- +
+ -