From 9d5a5cfac5c872ebbd20fcfee84660c94ce8f409 Mon Sep 17 00:00:00 2001
From: ken <poopooken11@gmail.com>
Date: Fri, 14 Apr 2023 22:02:27 +0800
Subject: [PATCH] =?UTF-8?q?'=E7=95=B0=E8=89=B2=E7=89=88'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/javascripts/app.js                             | 2 ++
 assets/stylesheets/template/base/_unity.scss          | 2 +-
 assets/stylesheets/template/base/_variables.scss      | 4 ++--
 assets/stylesheets/template/layout/content.scss       | 8 ++++++--
 assets/stylesheets/template/layout/footer.scss        | 2 +-
 assets/stylesheets/template/layout/header.scss        | 6 +++---
 assets/stylesheets/template/modules/announcement.scss | 1 +
 assets/stylesheets/template/modules/menu.scss         | 2 +-
 assets/stylesheets/template/modules/web_resource.scss | 4 ++--
 home/header.html.erb                                  | 5 ++++-
 home/index.html.erb                                   | 3 ++-
 home/page.html.erb                                    | 9 ++++++++-
 template.json                                         | 2 +-
 13 files changed, 34 insertions(+), 16 deletions(-)

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 @@
     </div>
     <section class="header-banner" data-pp="900"></section>
     <div class="collapse navbar-collapse modules-menu" id="layout-navigation">
-    <a id="accesskey_menu" title="accesskey menu" accesskey="M" href="#" title="Main menu">:::</a>
+      <a id="accesskey_menu" title="accesskey menu" accesskey="M" href="#" title="Main menu">:::</a>
       <%= render_menu %>
+      <div class="row">
+        <section class="layout-content-box col-sm-12" data-pp="666"></section>
+      </div>
     </div>
   </div>
 </header>
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 @@
         <section class="body-banner" data-pp="1"></section>
       </div>
     </div>
-    <section class="layout-slide no-print single-child-datapp" data-pp="301"></section>
+
 
     <div class="layout-content-inner content-inner container">
       <div class="floatwrap">
+        <section class="layout-slide no-print single-child-datapp" data-pp="301"></section>
         <div class="row">
           <section class="layout-content-box col-sm-8" data-pp="4"></section>
           <section class="layout-content-box col-sm-4" data-pp="5"></section>
diff --git a/home/page.html.erb b/home/page.html.erb
index 37b98b7..3e0d93e 100755
--- a/home/page.html.erb
+++ b/home/page.html.erb
@@ -7,7 +7,6 @@
   <%= render_orbit_bar %>
   <div class="background" data-pp="100"></div>
   <%= render_header %>
-  <section class="layout-slide no-print single-child-datapp" data-pp="300"></section>
 <div class="layout-contentwrap">
   <div class="layout-content">
     <div class="layout-content-inner content-inner container">
@@ -20,6 +19,14 @@
         <section class="page-content-box col-sm-3" data-pp="903"></section>
         </div>
         <div class="row">
+          <div class="addcontent">
+            <section class="page-content-box col-sm-6" data-pp="801"></section>
+            <section class="page-content-box col-sm-6" data-pp="802"></section>
+            <section class="page-content-box col-sm-8" data-pp="803"></section>
+            <section class="page-content-box col-sm-4" data-pp="804"></section>
+            <section class="page-content-box col-sm-4" data-pp="805"></section>
+            <section class="page-content-box col-sm-8" data-pp="806"></section>
+          </div>
           <section class="layout-content-box left-column col-sm-9">
           <div class="extra" data-pp="600"></div>
           <main id="main-content" class="main-content" data-content="true">
diff --git a/template.json b/template.json
index 569968d..669764b 100755
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"key":"t_culture1","title":"t_culture1","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file
+{"key":"t_culture1_2","title":"t_culture1_2","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file