From 9fc486f74c1a90a0fffcac16eb0deb9b14136a0a Mon Sep 17 00:00:00 2001 From: rulingcom Date: Mon, 1 Nov 2021 10:48:57 +0800 Subject: [PATCH] Fix menu and banner layout. --- .../stylesheets/template/layout/content.scss | 33 +++++++++++++------ assets/stylesheets/template/modules/menu.scss | 5 --- assets/stylesheets/template/template.scss | 4 ++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 979b30f..9d57950 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -22,15 +22,28 @@ background-color: #fff; } -.topbanner{ - @media (min-width: 1024px){ - width: 83%; - float: right; - .banner-responsive{ - height: 422px; - width: auto; - max-width: unset; - transform: scale(1.5); +@media (min-width: 1024px) { + .topbanner { + width: 80%; + padding: 0; + float: right; + height: 100%; + .banner-responsive { + height: 422px; + width: auto; + max-width: unset; + transform: scale(1.5); + } + } + + #layout-navigation { + width: 20%; + float: left; + position: absolute; + height: 100%; + #main-nav { + height: 100%; + margin-left: 0.9375em; + } } - } } diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 7fcb97b..ac7988f 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -8,11 +8,6 @@ @media (min-width: 768px) and (max-width: 1024px){ margin-top: 23.7em; } - @media(min-width:769px){ - width: 20%; - float: left; - position: absolute; - } } .navbar-collapse.in { overflow-y: unset; diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 2c4ee4d..e305425 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -23,7 +23,9 @@ //RWD @import "RWD"; - +.modules-menu{ + padding: 0; +} .dropdown-toggle:focus { // outline: 2px solid #43B5FC; outline: transparent;