diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index b479105..b4c1c0f 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -592,7 +592,7 @@ extendPanelWidget(); } - + $('.extra-box').after($('.box')); // 當文件物件模型(DOM)載入後,執行init函數 $(document).ready(function() { @@ -600,12 +600,19 @@ extendPanelWidget(); function headerH() { if ($(window).width() < 769) { const navH = $('.layout-header .navbar-header').outerHeight(); + $('.layout-footer').before($('.leftbanner')); }else{ + $('.modules-menu-level-0').after($('.leftbanner')); } } headerH(); $(window).resize(function() { headerH(); + if($(window).width()<769){ + $('.layout-footer').before($('.leftbanner')); + }else{ + $('.modules-menu-level-0').after($('.leftbanner')); + } }) init(); diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 48f5dde..ee899fe 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -2,15 +2,9 @@ @import "../initial"; .default_site_h1{ - display: contents; @media (max-width: 480px){ - display: grid; - padding: 0 0 0 0.5em !important; - .site-logo{ - margin-left: -0.8em; - width: 100% !important; - margin-top: 0; - } + display: flex; + align-items: center; } } .layout-header { @@ -59,7 +53,7 @@ .navbar-header { border-top: 8px solid #288E8E; - padding: 0 0 1em; + padding: 0; width: 100%; background-color: #e7e8ea; margin: 0; @@ -68,34 +62,27 @@ } .navbar-brand { height: unset; - margin: 0.5em 0; - padding-top: 0; + margin: 1em; + padding: 0; padding-bottom: 0; - line-height: 2.125em; + line-height: 2.5em; color: $theme-color-main; font-size: 1.4em; font-family: $main-font; @media (min-width: $screen-sm) { height: unset; - margin: 0.5rem 0 0; padding-left: 0; - line-height: 3.75em; font-size: 1.5em; } - @media (max-width: 767px) { - height: 5em; - } @media (max-width: 480px) { - margin: 0 0 0.5em 0; - padding: 0 0.5rem; + width: 75%; } .site-logo { width: auto; - height: 100%; - margin-right: 0.5em; - float: left; + height: 40px; + margin-right: 0.5em !important; } } } @@ -107,7 +94,8 @@ border-radius: 0.125em; border-width: 0.125em; border-color: lighten($theme-color-main, 30%); - + position: absolute; + right: 0; .icon-bar { background-color: lighten($theme-color-main, 30%); } diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 1257820..f419b4c 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -6,7 +6,7 @@ width: 20%; float: left; position: absolute; - margin-top: 8.26em; + margin-top: 6em; } } .navbar-collapse.in {