diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 83a9527..0de8b05 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -49,14 +49,14 @@ $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-large: ceil(($font-size-base * 1.25)) !default; // ~18px +$font-size-base: 0.875em !default; +$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~10.5em $font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px $font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px $font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px $font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px -$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px +$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~10.5em $font-size-h5: $font-size-base !default; $font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px @@ -82,26 +82,26 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default; //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. Values based on 0.875em text and 1.428 line-height (~20px to start). -$padding-base-vertical: 6px !default; +$padding-base-vertical: 0.375em !default; $padding-base-horizontal: 12px !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; -$border-radius-base: 4px !default; -$border-radius-large: 6px !default; -$border-radius-small: 3px !default; +$border-radius-base: 0.25em !default; +$border-radius-large: 0.375em !default; +$border-radius-small: 0.1875em !default; //** Global color for active items (e.g., navs or dropdowns). $component-active-color: #fff !default; @@ -109,9 +109,9 @@ $component-active-color: #fff !default; $component-active-bg: $brand-primary !default; //** Width of the `border` for generating carets that indicator dropdowns. -$caret-width-base: 4px !default; +$caret-width-base: 0.25em !default; //** Carets increase slightly in size for larger components. -$caret-width-large: 5px !default; +$caret-width-large: 0.3125em !default; //== Tables @@ -119,9 +119,9 @@ $caret-width-large: 5px !default; //## Customizes the `.table` component with basic values, each used across all table variations. //** Padding for ``s and ``s. -$table-cell-padding: 8px !default; +$table-cell-padding: 0.5em !default; //** Padding for cells in `.table-condensed`. -$table-condensed-cell-padding: 5px !default; +$table-condensed-cell-padding: 0.3125em !default; //** Default background color used for all tables. $table-bg: transparent !default; @@ -268,7 +268,7 @@ $screen-phone: $screen-xs-min !default; // Small screen / tablet // Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1 -$screen-sm: 768px !default; +$screen-sm: 760.5em !default; $screen-sm-min: $screen-sm !default; $screen-tablet: $screen-sm-min !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; @@ -392,7 +392,7 @@ $navbar-inverse-toggle-border-color: #333 !default; //## //=== Shared nav styles -$nav-link-padding: 10px 15px !default; +$nav-link-padding: 0.625em 15px !default; $nav-link-hover-bg: $gray-lighter !default; $nav-disabled-link-color: $gray-light !default; @@ -500,7 +500,7 @@ $tooltip-bg: #000 !default; $tooltip-opacity: .9 !default; //** Tooltip arrow width -$tooltip-arrow-width: 5px !default; +$tooltip-arrow-width: 0.3125em !default; //** Tooltip arrow color $tooltip-arrow-color: $tooltip-bg !default; @@ -522,7 +522,7 @@ $popover-fallback-border-color: #ccc !default; $popover-title-bg: darken($popover-bg, 3%) !default; //** Popover arrow width -$popover-arrow-width: 10px !default; +$popover-arrow-width: 0.625em !default; //** Popover arrow color $popover-arrow-color: #fff !default; @@ -703,7 +703,7 @@ $panel-danger-heading-bg: $state-danger-bg !default; //## //** Padding around the thumbnail image -$thumbnail-padding: 4px !default; +$thumbnail-padding: 0.25em !default; //** Thumbnail background color $thumbnail-bg: $body-bg !default; //** Thumbnail border color @@ -741,14 +741,14 @@ $badge-active-bg: #fff !default; $badge-font-weight: bold !default; $badge-line-height: 1 !default; -$badge-border-radius: 10px !default; +$badge-border-radius: 0.625em !default; //== Breadcrumbs // //## -$breadcrumb-padding-vertical: 8px !default; +$breadcrumb-padding-vertical: 0.5em !default; $breadcrumb-padding-horizontal: 15px !default; //** Breadcrumb background color $breadcrumb-bg: #f5f5f5 !default; @@ -764,7 +764,7 @@ $breadcrumb-separator: "/" !default; // //## -$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; +$carousel-text-shadow: 0 0.0625em 2px rgba(0,0,0,.6) !default; $carousel-control-color: #fff !default; $carousel-control-width: 15% !default; @@ -783,7 +783,7 @@ $carousel-caption-color: #fff !default; $close-font-weight: bold !default; $close-color: #000 !default; -$close-text-shadow: 0 1px 0 #fff !default; +$close-text-shadow: 0 0.0625em 0 #fff !default; //== Code diff --git a/assets/stylesheets/template/modules/epaper.scss b/assets/stylesheets/template/modules/epaper.scss index b416e5c..917edd1 100644 --- a/assets/stylesheets/template/modules/epaper.scss +++ b/assets/stylesheets/template/modules/epaper.scss @@ -19,7 +19,7 @@ border-left: 6px solid rgb(105, 150, 171); background: rgb(74, 42, 36); color: rgb(255, 255, 255); - font-size: 14px; + font-size: 0.875em; font-family: 微軟正黑體; } tbody { @@ -178,7 +178,7 @@ border: 1px solid #d1d1d1; background: #f0f0f0; padding: 4px 6px; - font-size: 14px; + font-size: 0.875em; margin-top:-3px; } } diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 7cd2157..d85f070 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -74,7 +74,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/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb index bef4ea9..255a6b0 100644 --- a/modules/member/member_index2.html.erb +++ b/modules/member/member_index2.html.erb @@ -12,7 +12,7 @@
diff --git a/modules/member/member_index3.html.erb b/modules/member/member_index3.html.erb index 0454f5a..17848b3 100644 --- a/modules/member/member_index3.html.erb +++ b/modules/member/member_index3.html.erb @@ -12,7 +12,7 @@
diff --git a/modules/member/member_index4.html.erb b/modules/member/member_index4.html.erb index 2173460..25a580a 100644 --- a/modules/member/member_index4.html.erb +++ b/modules/member/member_index4.html.erb @@ -9,7 +9,7 @@
  • - {{title}} + {{title}} : {{value}}
diff --git a/modules/member/member_index5.html.erb b/modules/member/member_index5.html.erb index 999678b..41f169c 100644 --- a/modules/member/member_index5.html.erb +++ b/modules/member/member_index5.html.erb @@ -12,7 +12,7 @@
  • - {{title}} + {{title}} : {{value}}