From 7e522e4a5dd093659aef7399d28c83fc3410af54 Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Sun, 29 Jan 2023 18:33:49 +0530 Subject: [PATCH] scss bugs fix --- src/scss/_brand-container.scss | 2 -- src/scss/_layout-fixed.scss | 2 +- src/scss/_layout-mobile.scss | 2 +- src/scss/_main-sidebar.scss | 4 ++-- src/scss/_nav-sidebar.scss | 2 +- src/scss/_sidebar-collapse.scss | 8 ++++---- src/scss/_wrapper.scss | 3 ++- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/scss/_brand-container.scss b/src/scss/_brand-container.scss index 31c25248c..4c58c7853 100644 --- a/src/scss/_brand-container.scss +++ b/src/scss/_brand-container.scss @@ -2,8 +2,6 @@ // Core: Brand // -// @include brand-variant($lte-sidebar-dark-bg, $lte-sidebar-dark-color); - .brand-container { display: grid; grid-template-areas: "brand-link pushmenu"; diff --git a/src/scss/_layout-fixed.scss b/src/scss/_layout-fixed.scss index e1ec71653..861158a7a 100644 --- a/src/scss/_layout-fixed.scss +++ b/src/scss/_layout-fixed.scss @@ -15,7 +15,7 @@ .main-header, .content-wrapper, .main-footer { - margin-left: $lte-sidebar-width; + margin-left: var(--#{$lte-prefix}sidebar-width); @include transition($lte-transition-speed $lte-transition-fn); } diff --git a/src/scss/_layout-mobile.scss b/src/scss/_layout-mobile.scss index 1b8c9ce80..2be14abb7 100644 --- a/src/scss/_layout-mobile.scss +++ b/src/scss/_layout-mobile.scss @@ -5,7 +5,7 @@ top: 0; bottom: 0; min-height: 100vh; - margin-left: -#{$lte-sidebar-width}; + margin-left: calc(var(--#{$lte-prefix}sidebar-width) * -1); // stylelint-disable-line function-disallowed-list .sidebar { overflow-x: hidden; diff --git a/src/scss/_main-sidebar.scss b/src/scss/_main-sidebar.scss index 5130604c8..38be37398 100644 --- a/src/scss/_main-sidebar.scss +++ b/src/scss/_main-sidebar.scss @@ -44,8 +44,8 @@ @include transition($lte-sidebar-transition); z-index: $lte-zindex-sidebar; grid-area: main-sidebar; - min-width: $lte-sidebar-width; - max-width: $lte-sidebar-width; + min-width: var(--#{$lte-prefix}sidebar-width); + max-width: var(--#{$lte-prefix}sidebar-width); .nav-sidebar > .nav-item { > .nav-link.active { diff --git a/src/scss/_nav-sidebar.scss b/src/scss/_nav-sidebar.scss index 99fc6dcc9..c6b39481a 100644 --- a/src/scss/_nav-sidebar.scss +++ b/src/scss/_nav-sidebar.scss @@ -22,7 +22,7 @@ .nav-link { position: relative; - width: subtract($lte-sidebar-width, $lte-sidebar-padding-x * 2); + width: subtract(var(--#{$lte-prefix}sidebar-width), $lte-sidebar-padding-x * 2); @include transition(width $lte-transition-fn $lte-transition-speed); p { diff --git a/src/scss/_sidebar-collapse.scss b/src/scss/_sidebar-collapse.scss index 93645d857..58ecf0d32 100644 --- a/src/scss/_sidebar-collapse.scss +++ b/src/scss/_sidebar-collapse.scss @@ -42,8 +42,8 @@ &.sidebar-is-hover { .main-sidebar { - min-width: $lte-sidebar-width; - max-width: $lte-sidebar-width; + min-width: var(--#{$lte-prefix}sidebar-width); + max-width: var(--#{$lte-prefix}sidebar-width); } .nav-sidebar .nav-header { @@ -51,7 +51,7 @@ } .nav-sidebar .nav-link { - width: subtract($lte-sidebar-width, $lte-sidebar-padding-x * 2); + width: subtract(var(--#{$lte-prefix}sidebar-width), $lte-sidebar-padding-x * 2); } .nav-sidebar .nav-link p, @@ -83,7 +83,7 @@ // visibility: visible; // display: inline-block; // position: absolute; -// width: $lte-sidebar-width; +// width: var(--#{$lte-prefix}sidebar-width); // left: $lte-sidebar-mini-width; // top: 0; // background-color: inherit; diff --git a/src/scss/_wrapper.scss b/src/scss/_wrapper.scss index 347cd68d5..da5fed0d7 100644 --- a/src/scss/_wrapper.scss +++ b/src/scss/_wrapper.scss @@ -10,9 +10,10 @@ "main-sidebar content-wrapper" "main-sidebar main-footer"; grid-template-rows: min-content 1fr min-content; - grid-template-columns: auto minmax(100%, max-content); + grid-template-columns: auto 1fr; grid-gap: 0; align-content: stretch; align-items: stretch; + max-width: 100vw; min-height: 100vh; }