diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 1d15af8..593c53a 100755 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -532,6 +532,8 @@ extendPanelWidget(); // 當文件物件模型(DOM)載入後,執行init函數 $(document).ready(function() { + $('.i-annc__page-title').after($('.addcontent')); + $('.page-module-title').after($('.addcontent')); //滾動出現效果 $(window).scroll(function() { var windowBottom = $(window).scrollTop() + $(window).innerHeight(); diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 58994b6..f7c89bd 100755 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -9,7 +9,7 @@ font-family: $main-font; font-size: $font-h1; color: $theme-color-main; - border-left: 3px solid #0268b7; + border-left: 3px solid #4ad295; padding-left: 6px; &:after{ height: 0; diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 1c28bbe..b16b5a2 100755 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -13,9 +13,9 @@ $theme-red: #d20001; $theme-blue: #003d7e; $theme-color-main: #333333; -$theme-color-second:#0268b7; +$theme-color-second:#4ad295; $theme-color-third: #ed4c43; -$theme-color-four: #0268b7; +$theme-color-four: #4ad295; $theme-color-green: #32D9C3; // Font stacks diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 6ffa2fa..e7ed944 100755 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -18,7 +18,7 @@ } .content-inner{ - background-color: #f4f4f4; + background-color: #eff3f6; } .clearfix{ padding-right: 1em; @@ -34,9 +34,13 @@ } } .floatwrapp{ - background-color:#0268b7; + background-color:#0b2239; @media(min-width: 769px){ width: 80%; float: right; } } +.addcontent{ + width: 100%; + position: relative; +} diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 652d52d..68ed2e5 100755 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -20,7 +20,7 @@ } } .layout-footer-inner{ - background:#f4f4f4; + background:#eff3f6; } .layout-footer-content{ padding: 2em; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 74ded59..a3b7659 100755 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -15,7 +15,7 @@ border: none; border-radius: 0; z-index: 1; - background: #0268b7; + background: #4ad295; .container { @extend .response-container; } @@ -32,7 +32,7 @@ } } .header-nav { - background: #0268b7; + background: #4ad295; padding: 0.5em 1em; color: #fff; font-family: $main-font; @@ -60,7 +60,7 @@ .navbar-header { padding: 0; @media(min-width: 769px){ - background: #0268b7; + background: #4ad295; width: 20%; position: absolute; padding-bottom: 10px; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 26fe982..ea0684b 100755 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -799,6 +799,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl display: flex; flex-wrap: wrap; justify-content: center; + width: 100%; } .i-annc__title { font-family: $main-font; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 29949b6..76b2cad 100755 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -5,7 +5,7 @@ @media(min-width: 769px){ display: block !important; width: 20%; - background: #f4f4f4; + background: #eff3f6; float: left; top:14.5vw; clear: both; diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index 6463847..d35ce03 100755 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -118,7 +118,7 @@ } } .widget-link__widget-title{ - border-left: 3px solid #0268b7; + border-left: 3px solid #4ad295; padding-left: 6px; span{ &:after{ @@ -133,7 +133,7 @@ } } .widget-link_wrapper{ - background: #f4f4f4; + background: #eff3f6; padding: 1em 0; } // .widget-gallery{ diff --git a/home/header.html.erb b/home/header.html.erb index 1ec9250..06f31fb 100755 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -36,8 +36,11 @@
diff --git a/home/index.html.erb b/home/index.html.erb index 699f9d8..a8efdc0 100755 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -15,10 +15,11 @@ - +