From 25a6ca268490a472a3507315f1a98ad661a8127a Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 12 Jul 2018 09:25:56 +0300 Subject: [PATCH] (Navbar) Added classes to the navbar containing fuse-sidebar's to contain their custom styles --- .../vertical/style-1/style-1.component.scss | 75 ++++++++++--------- .../vertical/style-2/style-2.component.scss | 23 +++--- .../layout-1/layout-1.component.html | 2 +- .../vertical/layout-1/layout-1.component.html | 4 +- .../vertical/layout-2/layout-2.component.html | 4 +- .../vertical/layout-3/layout-3.component.html | 4 +- 6 files changed, 59 insertions(+), 53 deletions(-) diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss index 4099e475..147859a9 100644 --- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss +++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss @@ -1,60 +1,63 @@ @import "src/@fuse/scss/fuse"; fuse-sidebar { - overflow: hidden; - &.folded:not(.unfolded) { + &.navbar-fuse-sidebar { + overflow: hidden; - navbar { + &.folded:not(.unfolded) { - navbar-vertical-style-1 { + navbar { - .navbar-top { - padding: 12px 0; - justify-content: center; + navbar-vertical-style-1 { - .buttons { - display: none; - } + .navbar-top { + padding: 12px 0; + justify-content: center; - .logo { - - .logo-icon { - width: 32px; - height: 32px; - } - - .logo-text { + .buttons { display: none; } + + .logo { + + .logo-icon { + width: 32px; + height: 32px; + } + + .logo-text { + display: none; + } + } } - } - .navbar-scroll-container { + .navbar-scroll-container { - .user { - padding: 12px 0; + .user { + padding: 12px 0; - .avatar-container { - position: relative; - top: auto; - padding: 0; + .avatar-container { + position: relative; + top: auto; + padding: 0; - .avatar { - width: 40px; - height: 40px; + .avatar { + width: 40px; + height: 40px; + } + } + + .username, + .email { + display: none; } } - .username, - .email { - display: none; + .navbar-content { + margin-top: 0; } } - - .navbar-content { - margin-top: 0; - } } } } diff --git a/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss b/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss index d150731e..37c14128 100644 --- a/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss +++ b/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss @@ -1,22 +1,25 @@ @import "src/@fuse/scss/fuse"; fuse-sidebar { - overflow: hidden; - &.folded:not(.unfolded) { + &.navbar-fuse-sidebar { + overflow: hidden; - navbar { + &.folded:not(.unfolded) { - navbar-vertical-style-2 { + navbar { - .navbar-header { - padding: 0 13px; + navbar-vertical-style-2 { - .logo { + .navbar-header { + padding: 0 13px; - .logo-text { - opacity: 0; - transition: opacity 200ms ease; + .logo { + + .logo-text { + opacity: 0; + transition: opacity 200ms ease; + } } } } diff --git a/src/app/layout/horizontal/layout-1/layout-1.component.html b/src/app/layout/horizontal/layout-1/layout-1.component.html index 355985eb..504a8b19 100644 --- a/src/app/layout/horizontal/layout-1/layout-1.component.html +++ b/src/app/layout/horizontal/layout-1/layout-1.component.html @@ -99,7 +99,7 @@ - - @@ -113,7 +113,7 @@ - diff --git a/src/app/layout/vertical/layout-2/layout-2.component.html b/src/app/layout/vertical/layout-2/layout-2.component.html index 46ccb007..3b3714bf 100644 --- a/src/app/layout/vertical/layout-2/layout-2.component.html +++ b/src/app/layout/vertical/layout-2/layout-2.component.html @@ -101,7 +101,7 @@ - @@ -113,7 +113,7 @@ - diff --git a/src/app/layout/vertical/layout-3/layout-3.component.html b/src/app/layout/vertical/layout-3/layout-3.component.html index 2229d5dc..f133a812 100644 --- a/src/app/layout/vertical/layout-3/layout-3.component.html +++ b/src/app/layout/vertical/layout-3/layout-3.component.html @@ -87,7 +87,7 @@ - @@ -99,7 +99,7 @@ -