diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index 1ffdc53..96393ac 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -435,8 +435,8 @@
$('.outdropdowns').before($('.header-nav'));
orbit.ClickMenuHandler();
}else{
- $('.outdropdowns').after($('.header-nav'));
- $('.navbar-header').before($('.modules-menu'));
+ $('.outdropdowns').before($('.header-nav'));
+ $('.navbar-header').after($('.modules-menu'));
}
// 自適應網頁使用,當使用者改變瀏覽器寬度時呼叫orbit.nav.setDropdown函數
@@ -455,12 +455,12 @@
},500 )} else {
resizeTimer = setTimeout(function(){
if( $('.mobile-menu .modules-menu').length > 0 ) {
- $('.navbar-header').before($('.modules-menu'));
+ $('.navbar-header').after($('.modules-menu'));
}
orbit.removeDropdown();
}, 500);
- $('.outdropdowns').after($('.header-nav'));
- $('.navbar-header').before($('.modules-menu'));
+ $('.outdropdowns').before($('.header-nav'));
+ $('.navbar-header').after($('.modules-menu'));
}
});
// if($(window).width()<769){
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index c2c8b53..9226046 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -503,7 +503,7 @@ body{
.internal-page{
background-color: #fff;
.kenjohn {
- flex-wrap:wrap-reverse;
+ //flex-wrap:wrap-reverse;
display: flex;
.navbar-header{
display: flex!important;
@@ -537,7 +537,7 @@ body{
@media(min-width: 769px){
.dropdowns{
display: flex;
- flex-direction: row-reverse;
+ //flex-direction: row-reverse;
}
}
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index 61d80b5..ab1e7c0 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -363,7 +363,8 @@ a#content{
top: 0;
}
.navFixed,.navRel {
- flex-wrap:wrap-reverse;
+ //flex-wrap:wrap-reverse;
+ flex-direction: column;
display: flex;
.navbar-header{
display: flex!important;
@@ -395,7 +396,7 @@ a#content{
@media(min-width: 769px){
.dropdowns{
display: flex;
- flex-direction: row-reverse;
+ //flex-direction: row-reverse;
}
}
diff --git a/home/header.html.erb b/home/header.html.erb
index fe895d1..ad7edbe 100644
--- a/home/header.html.erb
+++ b/home/header.html.erb
@@ -19,29 +19,29 @@