chiu
/
asia_Kstyle5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

This commit is contained in:
rulingcom 2021-10-04 10:08:12 +08:00
parent 65c9ac4ed3
commit 02ab528740
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/javascripts/app.js
View File

@ -592,7 +592,7 @@ extendPanelWidget();
} }
$('.extra-box').after($('.box'));
// 當文件物件模型(DOM)載入後，執行init函數 // 當文件物件模型(DOM)載入後，執行init函數
$(document).ready(function() { $(document).ready(function() {
@ -600,12 +600,19 @@ extendPanelWidget();
function headerH() { function headerH() {
if ($(window).width() < 769) { if ($(window).width() < 769) {
const navH = $('.layout-header .navbar-header').outerHeight(); const navH = $('.layout-header .navbar-header').outerHeight();
$('.layout-footer').before($('.leftbanner'));
}else{ }else{
$('.modules-menu-level-0').after($('.leftbanner'));
} }
} }
headerH(); headerH();
$(window).resize(function() { $(window).resize(function() {
headerH(); headerH();
if($(window).width()<769){
$('.layout-footer').before($('.leftbanner'));
}else{
$('.modules-menu-level-0').after($('.leftbanner'));
}
}) })
init(); init();

34
assets/stylesheets/template/layout/header.scss
View File

@ -2,15 +2,9 @@
@import "../initial"; @import "../initial";
.default_site_h1{ .default_site_h1{
display: contents;
@media (max-width: 480px){ @media (max-width: 480px){
display: grid; display: flex;
padding: 0 0 0 0.5em !important; align-items: center;
.site-logo{
margin-left: -0.8em;
width: 100% !important;
margin-top: 0;
}
} }
} }
.layout-header { .layout-header {
@ -59,7 +53,7 @@
.navbar-header { .navbar-header {
border-top: 8px solid #288E8E; border-top: 8px solid #288E8E;
padding: 0 0 1em; padding: 0;
width: 100%; width: 100%;
background-color: #e7e8ea; background-color: #e7e8ea;
margin: 0; margin: 0;
@ -68,34 +62,27 @@
} }
.navbar-brand { .navbar-brand {
height: unset; height: unset;
margin: 0.5em 0; margin: 1em;
padding-top: 0; padding: 0;
padding-bottom: 0; padding-bottom: 0;
line-height: 2.125em; line-height: 2.5em;
color: $theme-color-main; color: $theme-color-main;
font-size: 1.4em; font-size: 1.4em;
font-family: $main-font; font-family: $main-font;
@media (min-width: $screen-sm) { @media (min-width: $screen-sm) {
height: unset; height: unset;
margin: 0.5rem 0 0;
padding-left: 0; padding-left: 0;
line-height: 3.75em;
font-size: 1.5em; font-size: 1.5em;
} }
@media (max-width: 767px) {
height: 5em;
}
@media (max-width: 480px) { @media (max-width: 480px) {
margin: 0 0 0.5em 0; width: 75%;
padding: 0 0.5rem;
} }
.site-logo { .site-logo {
width: auto; width: auto;
height: 100%; height: 40px;
margin-right: 0.5em; margin-right: 0.5em !important;
float: left;
} }
} }
} }
@ -107,7 +94,8 @@
border-radius: 0.125em; border-radius: 0.125em;
border-width: 0.125em; border-width: 0.125em;
border-color: lighten($theme-color-main, 30%); border-color: lighten($theme-color-main, 30%);
position: absolute;
right: 0;
.icon-bar { .icon-bar {
background-color: lighten($theme-color-main, 30%); background-color: lighten($theme-color-main, 30%);
} }

2
assets/stylesheets/template/modules/menu.scss
View File

@ -6,7 +6,7 @@
width: 20%; width: 20%;
float: left; float: left;
position: absolute; position: absolute;
margin-top: 8.26em; margin-top: 6em;
} }
} }
.navbar-collapse.in { .navbar-collapse.in {