From 1f093726d923695c74b33371a646b31382e6ac79 Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Fri, 17 Sep 2021 16:07:09 +0800
Subject: [PATCH] Updated

---
 assets/javascripts/app.js                       | 7 -------
 assets/stylesheets/template/layout/content.scss | 7 +------
 assets/stylesheets/template/modules/menu.scss   | 6 +++++-
 assets/stylesheets/template/template.scss       | 5 ++++-
 home/header.html.erb                            | 1 +
 home/index.html.erb                             | 1 -
 template.json                                   | 2 +-
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index 1891f9b..b479105 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -600,19 +600,12 @@ extendPanelWidget();
     function headerH() {
       if ($(window).width() < 769) {
       const navH = $('.layout-header .navbar-header').outerHeight();
-      $('.bottom').after($('.leftbanner'));
     }else{
-      $('.top').before($('.leftbanner'));
     }
     }
       headerH();
     $(window).resize(function() {
         headerH();
-        if ($(window).width() < 769) {
-        $('.bottom').after($('.leftbanner'));
-      }else{
-        $('.top').before($('.leftbanner'));
-      }
     })
 
     init();
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index 6f89aa3..7633597 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -10,12 +10,7 @@
   }
 }
 .leftbanner{
-  @media(min-width: 769px){
-    position: absolute!important;
-    width: 20%;
-    padding: 0 1em;
-    margin-top: 20.5em;
-  }
+clear: both;
 }
 .layout-content-box2 {
   padding-bottom: 0.5em;
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index 67aa144..1257820 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -93,6 +93,9 @@
         display: block;
         padding: 1.125em 0;
         font-family: $main-font;
+        width: 100%;
+        word-break: normal;
+        white-space: normal;
       }
 
       &:hover {
@@ -125,7 +128,6 @@
           margin-right: 0;
 
           .modules-menu-level-1 {
-            left: auto;
 
             &:before {
               right: 0.625em;
@@ -166,6 +168,8 @@
   .modules-menu-level-1 {
     display: none;
     min-width: 100%;
+    left: 100%;
+    top: 0;
     margin: 0;
     padding: 0;
     background-color: #144f4f;
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index c1cbbc3..a0b9bcd 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -107,7 +107,10 @@ ul.tab_nav {
       -moz-transition: all 0.5s;
       -webkit-transition: all 0.5s;
       -o-transition: all 0.5s;
-
+      color: #fff;
+      &:hover{
+        background: #19524b;
+      }
       &.active {
         background: #19524b;
         color: #fff;
diff --git a/home/header.html.erb b/home/header.html.erb
index 0c41151..db2ca9e 100644
--- a/home/header.html.erb
+++ b/home/header.html.erb
@@ -31,6 +31,7 @@
     <div class="collapse navbar-collapse modules-menu" id="layout-navigation">
     <a id="accesskey_menu" title="accesskey menu" accesskey="M" href="#" title="Main menu">:::</a>
       <%= render_menu %>
+      <div class="leftbanner" data-pp="23"></div>
     </div>
   </div>
 </header>
diff --git a/home/index.html.erb b/home/index.html.erb
index b8c592f..fbd289b 100644
--- a/home/index.html.erb
+++ b/home/index.html.erb
@@ -11,7 +11,6 @@
   <div class="layout-content">
   <a id="accesskey_content" accesskey="C" href="/<%= "#{locale.to_s}" %>/accesskey" title="Content">:::</a>
     <div class="layout-content-inner container">
-      <div class="leftbanner" data-pp="23"></div>
       <div class="top contentwrap">
         <section class="body-banner" data-pp="6"></section>
         <div class="row">
diff --git a/template.json b/template.json
index 19f3cb7..7a4dfc6 100644
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"key":"asia_kstyle5","title":"asia_Kstyle5","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file
+{"key":"asia_Kstyle5","title":"asia_Kstyle5","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file