diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index d9cb599..6e700ed 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -412,8 +412,8 @@ } },500 )} else { resizeTimer = setTimeout(function(){ - if( $('.mobile-menu .modules-menu').length > 0 ) { - $('.layout-header .container').append($('.modules-menu')); + if( $('.mobile-menu .modules-menu').length > 0 && $('.layout-content2').length != 0) { + $('.modules-menu').prependTo('.layout-content2'); } orbit.removeDropdown(); }, 500); 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/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/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 4f63215..fda5db9 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -189,6 +189,8 @@ @media (min-width: $screen-sm) { position: absolute; + left: 200px; + top: 0; & > li { padding-right: 2em; diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 5397eb5..fde3c3a 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -73,7 +73,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}}