diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 6f8022a..3bbb458 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -600,16 +600,20 @@ extendPanelWidget(); if ($(window).width() < 768) { const navH = $('.layout-header .navbar-header').outerHeight(); $('.header-nav').after($('.navbar-header')); + $('.layout-footer').before($('.box')); }else{ $('.modules-menu-level-0').before($('.navbar-header')); + $('.modules-menu-level-0').after($('.box')); } } headerH(); $(window).resize(function() { if ($(window).width() < 768) { $('.header-nav').after($('.navbar-header')); + $('.layout-footer').before($('.box')); }else{ $('.modules-menu-level-0').before($('.navbar-header')); + $('.modules-menu-level-0').after($('.box')); } headerH(); }) diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 5c6022f..fcb94d1 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -15,3 +15,6 @@ .layout-content-box2{ background-color: #72bcad; } +section.box{ + clear: both; +} diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index d0757ba..8a37724 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -12,7 +12,8 @@ @media (min-width: 480px){ font-size: 0.9em!important; .site-logo{ - width: 100px!important; + width: 120px!important; + margin-bottom: 0.5em; } } @media (max-width: 480px){ @@ -107,7 +108,6 @@ font-family: $main-font; @media (min-width: $screen-sm) { - width: 150px; height: unset; margin: 0.5rem 0 0; padding-left: 0; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index bcd92c8..bb49956 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -123,7 +123,7 @@ margin-right: 0; .modules-menu-level-1 { - left: auto; + &:before { right: 0.625em; @@ -171,7 +171,8 @@ background-color: #477b70; list-style: none; z-index: 1; - + left: 100%; + top:0; & > li { position: relative; & + li { @@ -184,6 +185,8 @@ font-family: $main-font; font-size: 0.938em; color: #fff; + word-break: normal; + white-space: normal; } &:hover { diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index b41047d..7794dd6 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -23,12 +23,7 @@ //RWD @import "RWD"; -.navbar-brand .default_site_h1{ - height: auto; -} -section.box { - clear: both; -} + .dropdown-toggle:focus { // outline: 2px solid #43B5FC; outline: transparent; diff --git a/home/header.html.erb b/home/header.html.erb index 354cfa2..79fdf09 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -36,7 +36,7 @@ ::: <%= render_menu %> -
+
diff --git a/template.json b/template.json index 7fbd116..45de986 100644 --- a/template.json +++ b/template.json @@ -1 +1 @@ -{"key":"asia_kstyle3","title":"asia_Kstyle3","author":"kenlee","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file +{"key":"asia_Kstyle3","title":"asia_Kstyle3","author":"kenlee","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file