diff --git a/assets/images/coin.png b/assets/images/coin.png new file mode 100644 index 0000000..a4d026b Binary files /dev/null and b/assets/images/coin.png differ diff --git a/assets/images/紋路.png b/assets/images/紋路.png new file mode 100644 index 0000000..2f3e9fe Binary files /dev/null and b/assets/images/紋路.png differ diff --git a/assets/images/花紋.png b/assets/images/花紋.png new file mode 100644 index 0000000..6190743 Binary files /dev/null and b/assets/images/花紋.png differ 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/_global.scss b/assets/stylesheets/template/base/_global.scss index ddf4f8c..6384a21 100755 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -11,8 +11,10 @@ body { font-family: $sub-font; font-size: inherit; margin-top: 2.5em; - background:#bfbfbf; + background:#f4f4f4; overflow-x: hidden; + background: url(/assets/紋路.png) repeat #f4f4f4; + background-size: 50%; } a:link, diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index 5600bc3..96aea9c 100755 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -3,7 +3,6 @@ @import "variables"; .go-back-top { - background: rgba($theme-color-four, 0.9); text-align: center; padding: 0.625em 0.75em; position: fixed; @@ -11,12 +10,18 @@ right: 0.9375em; cursor: pointer; display: none; - color: $theme-white; + color: transparent; font-size: 0.750em; border-radius: 0.125em; z-index: 1050; - + background: url(/assets/coin.png) bottom no-repeat; + background-size: contain; &:hover { - background: rgba($theme-color-four, 1); + transform: scale(1.5); + -webkit-transition: .3s ease-out; + -moz-transition: .3s ease-out; + -ms-transition: .3s ease-out; + -o-transition: .3s ease-out; + transition: .3s ease-out; } } diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 58994b6..f88524a 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 $theme-color-second; padding-left: 6px; &:after{ height: 0; diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 1c28bbe..269828e 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:#ad081b; $theme-color-third: #ed4c43; -$theme-color-four: #0268b7; +$theme-color-four: #ad081b; $theme-color-green: #32D9C3; // Font stacks diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 6ffa2fa..9cd40aa 100755 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -16,9 +16,12 @@ @extend .response-container; } } - -.content-inner{ - background-color: #f4f4f4; +.floatwrap1{ + position: relative; + background: url(/assets/花紋.png) top right no-repeat; + background-size: 30%; + -webkit-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; } .clearfix{ padding-right: 1em; @@ -34,9 +37,23 @@ } } .floatwrapp{ - background-color:#0268b7; + background-color:$theme-color-second; @media(min-width: 769px){ width: 80%; float: right; } } +.addcontent{ + width: 100%; + position: relative; +} +.internal-page{ + .floatwrap{ + position: relative; + background: url(/assets/花紋.png) top right no-repeat #fff; + background-size: 30%; + background-position-y: -5%; + -webkit-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + } +} diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 652d52d..c968f67 100755 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -15,13 +15,10 @@ color: #fff; &:hover, &:focus { - color: lighten($theme-color-main, 10%); + color: lighten($theme-color-second, 10%); } } } -.layout-footer-inner{ - background:#f4f4f4; -} .layout-footer-content{ padding: 2em; } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 74ded59..13b8788 100755 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -15,7 +15,6 @@ border: none; border-radius: 0; z-index: 1; - background: #0268b7; .container { @extend .response-container; } @@ -32,7 +31,7 @@ } } .header-nav { - background: #0268b7; + background: $theme-color-second; padding: 0.5em 1em; color: #fff; font-family: $main-font; @@ -60,7 +59,7 @@ .navbar-header { padding: 0; @media(min-width: 769px){ - background: #0268b7; + background: $theme-color-second; 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..31cef3e 100755 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -199,7 +199,7 @@ } .w-annc__item { - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; padding-bottom: 1em; margin-bottom: 1em; } @@ -211,7 +211,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -244,7 +244,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -285,7 +285,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -322,7 +322,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -359,7 +359,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -393,7 +393,7 @@ margin-bottom: 0; padding-bottom: 0.8em; padding-top: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; &:hover{ -webkit-transition: .3s ease-out; -moz-transition: .3s ease-out; @@ -485,7 +485,7 @@ .w-annc__item { margin-bottom: 0.8em; padding-bottom: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; } .w-annc__entry-title { @@ -558,7 +558,7 @@ .w-annc__item { margin-bottom: 0.8em; padding-bottom: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; } .w-annc__entry-title { @@ -714,7 +714,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .i-annc__item { margin-bottom: 0.8em; padding-bottom: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; } .i-annc__title { font-size: 0.95rem; @@ -749,7 +749,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .i-annc__item { margin-bottom: 0.8em; padding-bottom: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; } .i-annc__title { font-size: 0.95rem; @@ -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; @@ -902,7 +903,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .i-annc__item { margin-bottom: 0.8em; padding-bottom: 0.8em; - border-bottom: 0.0625em dashed #e4e4e4; + border-bottom: none; } .i-annc__title { font-size: 0.95rem; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 29949b6..d8737dd 100755 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -5,7 +5,6 @@ @media(min-width: 769px){ display: block !important; width: 20%; - background: #f4f4f4; 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..3d8f557 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 $theme-color-second; padding-left: 6px; span{ &:after{ diff --git a/assets/stylesheets/template/widget/breadcrumb.scss b/assets/stylesheets/template/widget/breadcrumb.scss index 8d585ca..3eb9646 100755 --- a/assets/stylesheets/template/widget/breadcrumb.scss +++ b/assets/stylesheets/template/widget/breadcrumb.scss @@ -2,7 +2,7 @@ @import "../initial"; .breadcrumb { - background-color: #fff; + background: none; a:link, a:visited { color: $theme-color-main; } } .breadcrumb>li+li:before { 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..9532839 100755 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -11,14 +11,15 @@ /accesskey" title="Content">:::