diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss index d8f2364..e6fb6a8 100644 --- a/assets/stylesheets/bootstrap/_carousel.scss +++ b/assets/stylesheets/bootstrap/_carousel.scss @@ -214,7 +214,7 @@ height: 30px; margin-top: -15px; margin-left: -15px; - font-size: 30px; + font-size: 1.875em; } } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 83a9527..e3056d9 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -49,7 +49,7 @@ $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; -$font-size-base: 14px !default; +$font-size-base: 0.875em !default; $font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px $font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px @@ -84,17 +84,17 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default; // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -$padding-base-vertical: 6px !default; -$padding-base-horizontal: 12px !default; +$padding-base-vertical: 0.375em !default; +$padding-base-horizontal: 0.75em !default; -$padding-large-vertical: 10px !default; -$padding-large-horizontal: 16px !default; +$padding-large-vertical: 0.625em !default; +$padding-large-horizontal: 1em !default; -$padding-small-vertical: 5px !default; -$padding-small-horizontal: 10px !default; +$padding-small-vertical: 0.3125em !default; +$padding-small-horizontal: 0.625em !default; -$padding-xs-vertical: 1px !default; -$padding-xs-horizontal: 5px !default; +$padding-xs-vertical: 0.0625em !default; +$padding-xs-horizontal: 0.3125em !default; $line-height-large: 1.33 !default; $line-height-small: 1.5 !default; @@ -330,7 +330,7 @@ $container-lg: $container-large-desktop !default; //## // Basics of a navbar -$navbar-height: 50px !default; +$navbar-height: 3.125em !default; $navbar-margin-bottom: $line-height-computed !default; $navbar-border-radius: $border-radius-base !default; $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index ac1f167..0aae106 100644 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -11,7 +11,7 @@ cursor: pointer; display: none; color: $theme-white; - font-size: 12px; + font-size: 0.75em; border-radius: 2px; z-index: 1050; diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index c48bd21..bfc0902 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -195,7 +195,7 @@ .w-annc__title{ color: #274255; - font-size: 12pt; + font-size: 1em; } } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 404d9b6..fa8d86a 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -157,7 +157,7 @@ width: 100%; padding: 10px 20px 20px 20px; color: #999999; - font-size: 10pt; + font-size: 0.833em; margin-right: 60px; margin-top: -6em; margin-bottom: 1em; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 5f118cd..e3408c2 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -714,7 +714,7 @@ } .s-annc__social .print-button { color: #fff; - font-size: 11px; + font-size: 0.6875em; border-radius: 4px; padding: 2px 6px; background-color: $theme-color-main; diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 32fad86..dfbef8e 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -78,7 +78,7 @@ } .i-archive__category-item { - font-size: 13px; + font-size: 0.8125em; display: inline; font-size: .8125rem; } @@ -98,7 +98,7 @@ } .i-archive__file-name { - font-size: 12px; + font-size: 0.75em; font-size: 0.75rem; } } @@ -119,7 +119,7 @@ } .i-archive-files-item { - font-size: 13px; + font-size: 0.8125em; font-family: $main-font; } @@ -167,7 +167,7 @@ padding: 10px 12px; margin-right: 5px; border-radius: 4px; - font-size: 15px; + font-size: 0.9375em; &:hover { background-color: darken($theme-color-main, 7%); @@ -192,7 +192,7 @@ } .i-archive__archive-title { - font-size: 15px; + font-size: 0.9375em; } .tab-content { @@ -200,7 +200,7 @@ } .i-archive__file-name { - font-size: 13px; + font-size: 0.8125em; } .i-archive__file-wrap { diff --git a/assets/stylesheets/template/modules/archives_bk.scss b/assets/stylesheets/template/modules/archives_bk.scss index 1a1e59e..3736ea0 100644 --- a/assets/stylesheets/template/modules/archives_bk.scss +++ b/assets/stylesheets/template/modules/archives_bk.scss @@ -68,7 +68,7 @@ padding-bottom: 5px; } .i-archive__category-item { - font-size: 13px; + font-size: 0.8125em; display: inline-block; font-size: .8125rem; margin-bottom: 5px; @@ -85,7 +85,7 @@ border: 1px solid lighten($theme-gray-light, 10%); } .i-archive__file-name { - font-size: 12px; + font-size: 0.75em; font-size: 0.75rem; } .status-top { @@ -118,7 +118,7 @@ margin-bottom: 0; } .index-archives-files-item { - font-size: 13px; + font-size: 0.8125em; font-family: $main-font; } .index-archives-files-list { @@ -161,7 +161,7 @@ padding: 10px 12px; margin-right: 5px; border-radius: 4px; - font-size: 15px; + font-size: 0.9375em; &:hover { background-color: darken($theme-color-main, 7%); } @@ -184,7 +184,7 @@ } .i-archive__archive-title { - font-size: 15px; + font-size: 0.9375em; } .tab-content { @@ -202,7 +202,7 @@ } .i-archive__file-name { - font-size: 13px; + font-size: 0.8125em; } .i-archive__file-wrap { diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 80687c8..8178269 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -135,6 +135,50 @@ } } +// Index 4 +.index-member-4 { + .i-member-section { + max-width: 500px; + margin: auto; + } + + .i-member-status-title { + @extend .unity-title; + } + + .i-member-item-inner { + background: none; + border-radius: 0.25rem; + padding: 12px 1rem; + margin-bottom: 16px; + } + + .i-member-profile-list { + @include list-reset; + } + + .i-member-profile-item { + margin-bottom: 8px; + font-size: $font-13; + word-break: break-word; + } + + .i-member-item:nth-child(6n+1) { + clear: both; + } + + // RWD + @media screen and (min-width: $screen-sm) { + .i-member-section { + max-width: 100%; + } + + .i-member-item-inner { + background: $theme-gray-lighter; + } + } +} + // Show page .show-member { padding-top: 1em; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 0283465..beea1d0 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -187,7 +187,7 @@ display: block; padding: 17px 25px; font-family: $main-font; - font-size: 15px; + font-size: 0.9375em; } &:hover { background-color: darken(#6E5140, 10%); @@ -254,7 +254,7 @@ display: block; padding: 17px 25px; font-family: $main-font; - font-size: 15px; + font-size: 0.9375em; } &:hover { background-color: darken(#6E5140, 10%); diff --git a/assets/stylesheets/template/print.css b/assets/stylesheets/template/print.css index 7c91c22..c6649ee 100644 --- a/assets/stylesheets/template/print.css +++ b/assets/stylesheets/template/print.css @@ -6,7 +6,7 @@ body { color: #000; font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; line-height: 1.3; - font-size: 12pt; + font-size: 1em; } blockquote, diff --git a/assets/stylesheets/template/rss2/general.scss b/assets/stylesheets/template/rss2/general.scss index f2b13c5..6dbb09a 100644 --- a/assets/stylesheets/template/rss2/general.scss +++ b/assets/stylesheets/template/rss2/general.scss @@ -5,7 +5,7 @@ html { } body { font-family: Arial, Helvetica, sans-serif, 新細明體; - font-size: 13px; + font-size: 0.8125em; margin: 0; padding: 0; background: url(/assets/headerbg.png) center top repeat-x; @@ -128,7 +128,7 @@ a:hover { p {} h1, .h1 { - font-size: 16px; + font-size: 1em; font-weight: bold; color: #000; } @@ -193,7 +193,7 @@ acronym { padding-left: 14px; background: url(/assets/ar2.png) left center no-repeat; font-weight: bold; - font-size: 13px; + font-size: 0.8125em; } #submenu li a:hover {color: #666;} #submenu li a span { white-space: nowrap; } @@ -261,7 +261,7 @@ acronym { } #topmenu a { display: block; - font-size: 15px; + font-size: 0.9375em; font-weight: bold; color: #3F4450; padding-right: 14px; @@ -291,7 +291,7 @@ acronym { margin-top: 0; } #menu1 li a { - font-size: 15px; + font-size: 0.9375em; font-weight: bold; display: block; padding: 0 0 0 14px; @@ -316,7 +316,7 @@ acronym { padding: 8px 8px 8px 50px; background: #948C7C url(/assets/titlebg3.png) 16px center no-repeat; color: #fff; - font-size: 21px; + font-size: 1.3125em; line-height: 1; } #boxEvent ul { @@ -341,7 +341,7 @@ acronym { } #boxEvent .date { display: block; - font-size: 11px; + font-size: 0.6875em; font-weight: bold; color: #2C2923; padding-bottom: 6px; @@ -352,7 +352,7 @@ acronym { overflow: hidden; } #boxEvent .note a { - font-size: 13px; + font-size: 0.8125em; display: block; padding-left: 26px; height: 20px; @@ -436,7 +436,7 @@ fieldset { border: solid 1px #ddd; margin: 20px 0; } -legend { padding: 0 10px; font-size: 13px; font-weight: bold; } +legend { padding: 0 10px; font-size: 0.8125em; font-weight: bold; } input {} @@ -456,7 +456,7 @@ textarea { overflow: hidden; text-align : right; color : #ddd; - font-size: 12px; + font-size: 0.75em; } .PageList { display: inline-block; margin-left: 20px; } @@ -500,7 +500,7 @@ textarea { text-align : left; font-weight : bold; padding : 8px 0 8px 24px; - font-size: 15px; + font-size: 0.9375em; background : url(/assets/caption.gif) no-repeat 0 50%; } .ts_styled input { } @@ -538,7 +538,7 @@ textarea { text-align: left; font-weight: bold; padding: 8px 0 8px 24px; - font-size: 15px; + font-size: 0.9375em; background: url(/assets/caption.gif) no-repeat 0 50%; } @@ -569,7 +569,7 @@ textarea { text-align : left; font-weight : bold; padding : 8px 0 8px 24px; - font-size: 15px; + font-size: 0.9375em; background : url(/assets/caption.gif) no-repeat 0 50%; } .ts_rowsonly caption span { @@ -589,7 +589,7 @@ textarea { color: #fff; line-height: 30px; text-align: right; - font-size: 12px; + font-size: 0.75em; padding: 0 16px; } #corner a { @@ -623,7 +623,7 @@ textarea { #footer_logo { display: none; } #footer_address { margin-bottom: 18px; - font-size: 11px; + font-size: 0.6875em; line-height: 1.5em; } #footer_address a {} @@ -643,7 +643,7 @@ textarea { height: 20px; color: #000; font-weight: bold; - font-size: 18px; + font-size: 1.125em; line-height: 1; padding: 1px 0; font-family: "微軟正黑體"; @@ -689,7 +689,7 @@ a#accesskey_extralist { display:none; } letter-spacing:0; } #page_login #loginstyle #login_id, #page_login #loginstyle #login_pw { - font-size:12px; + font-size:0.75em; color:#000; width:130px; border:1px solid #ccc; diff --git a/assets/stylesheets/template/rss2/main.css b/assets/stylesheets/template/rss2/main.css index db620a1..0337959 100644 --- a/assets/stylesheets/template/rss2/main.css +++ b/assets/stylesheets/template/rss2/main.css @@ -22,7 +22,7 @@ } .newsdata h2 { background-image: url(/assets/titlebg1.png); - font-size: 21px; + font-size: 1.3125em; line-height: 1; color: #333; } @@ -34,13 +34,13 @@ background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFUlEQVQIW2M8c+bMfwYgMDExYQTRADU6BAJX0q/TAAAAAElFTkSuQmCC') left bottom repeat-x; } .newsdata li a { - font-size: 13px; + font-size: 0.8125em; color: #666; line-height: 20px; } .newsdata li .date { color: #999; - font-size: 12px; + font-size: 0.75em; font-weight: bold; display: block; margin-bottom: 4px; @@ -54,7 +54,7 @@ display: inline-block; height: 30px; line-height: 30px; - font-size: 15px; + font-size: 0.9375em; font-weight: bold; color: #666; } diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 86ff496..c5a1dfe 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -70,7 +70,7 @@ padding: 5px 10px; background: $theme-color-main; color:#fff; - font-size: 18px; + font-size: 1.125em; transition:.3s; &:hover{ background: $theme-color-second; diff --git a/home/header.html.erb b/home/header.html.erb index 04bc4a9..d0146e7 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -1,11 +1,4 @@
- diff --git a/modules/member/info.json b/modules/member/info.json index 205cc18..548597f 100644 --- a/modules/member/info.json +++ b/modules/member/info.json @@ -23,6 +23,14 @@ "en" : "3. Two Columns (category title, photo and customized profile data)" }, "thumbnail" : "member_index3_thumb.png" + }, + { + "filename" : "member_index4", + "name" : { + "zh_tw" : "4. 精簡名片式 ( 類別標題, 個人資料等自訂欄位 )", + "en" : "4. Simple Two Columns (category title, customized profile data)" + }, + "thumbnail" : "thumb.png" } ] } \ No newline at end of file diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb index c335399..249c6f6 100644 --- a/modules/member/member_index2.html.erb +++ b/modules/member/member_index2.html.erb @@ -14,8 +14,8 @@
diff --git a/modules/member/member_index3.html.erb b/modules/member/member_index3.html.erb index 54c8aac..6f5c67c 100644 --- a/modules/member/member_index3.html.erb +++ b/modules/member/member_index3.html.erb @@ -14,8 +14,8 @@
diff --git a/modules/member/member_index4.html.erb b/modules/member/member_index4.html.erb new file mode 100644 index 0000000..a82ba55 --- /dev/null +++ b/modules/member/member_index4.html.erb @@ -0,0 +1,24 @@ +
+
+
+
+

{{status-title}}

+
+
+
+
+
    +
  • + {{title}} : + {{value}} +
    • +
+
+
+
+
+
+
+
+
+{{pagination_goes_here}} \ No newline at end of file