Skip to content

Commit d13d628

Browse files
author
Gianmarco Manni
committed
bug fixes
1 parent 4369c13 commit d13d628

5 files changed

Lines changed: 52 additions & 49 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
- `menuItems properties` are not locked by any states during the render process anymore. Changing externally the menu items will provide the correct menu
1919
- :boom: `topBarLeftCustomItems` and `topBarRigthCustomItems` renamed to `navbarLeftItems` and `navbarRightItems`
2020
- `navbarLeftItems` and `navbarRightItems` have not default margin by default
21-
- default sidebar `width` to `14rem`
21+
- default sidebar `width` to `16rem`
2222
- :boom: `UI elements` are now parameter of `SidebarLayout` and not of the context anymore
2323
- PanelItem Id type changed from `string` to being strongly typed
2424

src/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ export * from "./lib/Layout/AuthenticationLayout";
33
// Panel sidebar layout
44
export * from "./lib/Layout/PanelSideBarLayout/PanelSideBarLayout";
55
export * from "./lib/Layout/PanelSideBarLayout/PanelSideBar/Context/PanelSideBarContext";
6-
export * from "./lib/Layout/PanelSideBarLayout/PanelSideBar/Definitions/PanelItem";
6+
export * from "./lib/Layout/PanelSideBarLayout/PanelSideBar/Definitions/PanelItem";
7+
8+
export * from "./lib/Paging/Paging";

styles/Layout/_PanelSideBarLayout.scss

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,16 @@ section.content:first-of-type {
219219
color: $sidenav-dark-active-bg-color;
220220

221221
background-color: $sidenav-dark-bg;
222-
border:0px;
222+
border: 0px;
223223

224224
&.active {
225-
border: 1px solid $sidenav-dark-active-bg-color;
225+
border: 1px solid $sidenav-dark-active-bg-color;
226226
}
227227

228228
&:hover {
229229
background-color: $sidenav-dark-active-bg-color;
230230
border-color: $sidenav-dark-active-bg-color;
231-
color: $sidenav-dark-bg;
231+
color: $sidenav-dark-bg;
232232
}
233233
}
234234
}
@@ -286,14 +286,17 @@ section.content:first-of-type {
286286
background-color: $sidenav-blue-bg;
287287
.side-nav {
288288
&__tiles {
289+
background-color: $white;
289290
.tile {
290291
background-color: $sidenav-blue-bg;
292+
border: 0;
293+
border-radius: 0;
294+
color: $sidenav-blue-active-color;
291295

292296
&:hover,
293297
&.active {
294298
color: $sidenav-blue-active-color;
295299
background-color: $sidenav-blue-active-bg-color;
296-
border-color: $sidenav-blue-active-bg-color;
297300
}
298301
}
299302
}
@@ -323,10 +326,10 @@ section.content:first-of-type {
323326
color: white;
324327
}
325328

326-
&.active,
327-
.active {
328-
background-color: $sidenav-blue-active-bg-color;
329+
&:hover,
330+
&.active {
329331
color: $sidenav-blue-active-color;
332+
background-color: $sidenav-blue-active-bg-color;
330333
}
331334

332335
&.menu-open .nav-link.dropdown-toggle::after {
@@ -406,7 +409,6 @@ section.content:first-of-type {
406409
> #side-nav {
407410
transition: $sidebar-transition;
408411
width: $tile-size;
409-
display: none;
410412

411413
li.nav-item {
412414
&.active {
@@ -436,7 +438,7 @@ section.content:first-of-type {
436438
> #side-nav {
437439
transition: $sidebar-transition;
438440
width: 0px;
439-
441+
440442
li.nav-item {
441443
&.active {
442444
&:before {
@@ -486,37 +488,37 @@ $zindex-topnav: 1039 !default;
486488
@include media-breakpoint-up(lg) {
487489
box-shadow: 0 0 0.5rem 0.125rem rgba($color: $gray-500, $alpha: 0.75);
488490
}
489-
}
490491

491-
#main-content-body {
492-
position: relative;
493-
margin-left: 0;
494-
display: flex;
495-
flex-direction: column;
496-
justify-content: space-between;
497-
min-width: 0;
498-
flex-grow: 1;
499-
min-height: 100vh;
500-
}
501-
502-
&.toggled {
503-
#side-nav {
504-
transform: translateX(0);
505-
box-shadow: unset;
492+
#main-content-body {
493+
position: relative;
494+
margin-left: 0;
495+
display: flex;
496+
flex-direction: column;
497+
justify-content: space-between;
498+
min-width: 0;
499+
flex-grow: 1;
500+
min-height: 100vh;
506501
}
507502

508-
#main-content-body {
509-
&:before {
510-
content: "";
511-
display: block;
512-
position: absolute;
513-
top: 0;
514-
width: 100%;
515-
height: 100%;
516-
background: $black;
517-
z-index: $zindex-content;
518-
opacity: 0.5;
519-
transition: opacity 0.3s ease-in-out;
503+
&.toggled {
504+
#side-nav {
505+
transform: translateX(0);
506+
box-shadow: unset;
507+
}
508+
509+
#main-content-body {
510+
&:before {
511+
content: "";
512+
display: block;
513+
position: absolute;
514+
top: 0;
515+
width: 100%;
516+
height: 100%;
517+
background: $black;
518+
z-index: $zindex-content;
519+
opacity: 0.5;
520+
transition: opacity 0.3s ease-in-out;
521+
}
520522
}
521523
}
522524
}

styles/Layout/_PanelSideBarNavbar.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#sidebar-toggle {
1111
width: $toggle-btn-size;
12-
12+
1313
&:hover {
1414
color: $white !important;
1515
}
@@ -58,8 +58,8 @@
5858
background-color: $navbar-light-bg;
5959
}
6060
#sidebar-toggle {
61-
color: $topnav-light-toggler-color;
62-
}
61+
color: $topnav-light-toggler-color;
62+
}
6363
}
6464
}
6565
#nav-top.panel-layout.navbar-blue {

styles/Layout/variables.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ $primary: #007bc5;
77
$primary-hover: #0069a7;
88
$light: $white;
99

10-
// Color variables for the sidenav
1110
$topnav-base-height: 4rem;
1211
$navbar-padding-x: $navbar-padding-y;
1312
$usernav-base-height: calc(#{$topnav-base-height} - 1rem);
1413

15-
$tile-size: 3rem;
14+
$tile-size: 3.438rem;
1615
$sidebar-transition: 0.25s ease-in-out;
1716
$sidebar-items-transition: #{0.2s $sidebar-transition};
1817
$slim-scrollbar-base-width: 0.25rem;
1918

20-
$sidenav-base-width: 14rem; //remember to overwrite for your project to 18rem
21-
$sidenav-max-width: $sidenav-base-width; //remember to overwrite for your project to 18rem
19+
$sidenav-base-width: 16rem;
20+
$sidenav-max-width: $sidenav-base-width;
2221

2322
$toggle-base-width: 1rem; // used for toggle as bar
2423
$toggle-btn-size: 2.5rem; // used for toggle as button
@@ -48,9 +47,9 @@ $sidenav-blue-heading-color: fade-out(#0069a7, 0.75);
4847
$sidenav-blue-link-color: fade-out(#0069a7, 0.5);
4948
$sidenav-blue-icon-color: fade-out(#0069a7, 0.75);
5049
$sidenav-blue-footer-bg: #007bc5;
51-
$sidenav-blue-active-color: #0069a7;
50+
$sidenav-blue-active-color: $white;
5251
$sidenav-blue-active-bg-color: #0069a7;
53-
$sidenav-blue-active-border-color: $primary;
52+
$sidenav-blue-active-border-color: $white;
5453
$svg-blue-attributes: "fill='white' strike='white'";
5554

5655
// -- Sidenav Light
@@ -68,6 +67,6 @@ $sidenav-light-active-bg-color: $gray-100;
6867
$svg-light-attributes: "fill='dark' strike='dark'";
6968

7069
// Color variables for the topnav
71-
$topnav-dark-toggler-color: fade-out($white, 0.5); //define different
70+
$topnav-dark-toggler-color: fade-out($white, 0.5);
7271
$topnav-blue-toggler-color:#007bc5;
7372
$topnav-light-toggler-color: $gray-900;

0 commit comments

Comments
 (0)