Skip to content

Commit 5c66474

Browse files
authored
Merge pull request #9 from fullstack-devops/bugfix/new-nav-style
new nav button style
2 parents e16e795 + 91478d2 commit 5c66474

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

projects/ng-mat-components/_theming.scss

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,24 @@
3535
border-top: 1px solid mat-color($foreground, divider);
3636
}
3737

38-
.sidebar .nav-links li .active {
39-
border-left: 4px mat-color($primary, default) inset;
40-
background-color: rgba($color: mat-color($primary, default), $alpha: 0.1);
41-
}
42-
43-
.sidebar .nav-links li button:not(.active) {
44-
border-left: 4px transparent inset;
45-
// background-color: rgba($color: mat-color($primary, default), $alpha: 0.1);
38+
.sidebar .nav-links li .active::after {
39+
content: "";
40+
background-color: mat-color($primary, default);
41+
border-radius: 8px;
42+
width: calc(100% - 8px);
43+
height: 56px;
44+
position: absolute;
45+
top: 4px;
46+
left: 4px;
47+
z-index: -1;
4648
}
4749

4850
.fs-ui-frame-content {
4951
color: mat-color($foreground, text);
50-
background-color: lighten($color: mat-color($background, background), $amount: 3%);
52+
background-color: lighten(
53+
$color: mat-color($background, background),
54+
$amount: 3%
55+
);
5156
}
5257

5358
// Use mat-color to extract individual colors from a palette as necessary.

projects/ng-mat-components/src/lib/fs-ui-frame/fs-ui-frame.component.scss

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ $toolbar-width-opened: 264px;
2020
transition: all 0.3s ease-in-out;
2121
right: 0;
2222
height: $toolbar-height;
23-
box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14),
24-
0px 1px 10px 0px rgba(0, 0, 0, 0.12);
23+
box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2),
24+
0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12);
2525
}
2626

2727
::ng-deep .fs-ui-frame-content.opened,
@@ -93,7 +93,8 @@ $toolbar-width-opened: 264px;
9393
bottom: 0;
9494
width: $toolbar-width-closed;
9595
transition: all 0.3s ease-in-out;
96-
box-shadow: 5px 2px 4px -1px rgba(0, 0, 0, 0.2), 4px 4px 5px 0px rgba(0, 0, 0, 0.14);
96+
box-shadow: 5px 2px 4px -1px rgba(0, 0, 0, 0.2),
97+
4px 4px 5px 0px rgba(0, 0, 0, 0.14);
9798
}
9899

99100
.sidebar .nav-links {
@@ -153,7 +154,6 @@ $toolbar-width-opened: 264px;
153154
.nav-links li button {
154155
width: 100%;
155156
height: 64px;
156-
border-radius: unset;
157157
}
158158

159159
.nav-links li button {
@@ -162,17 +162,8 @@ $toolbar-width-opened: 264px;
162162
align-items: center;
163163
}
164164

165-
.custom-list-button {
166-
padding: 0 6px 0 6px;
167-
margin: 6px 8px 6px 8px;
168-
min-width: 88px;
169-
border-radius: 3px;
170-
font-size: 14px;
171-
text-align: center;
172-
text-transform: uppercase;
173-
text-decoration: none;
174-
border: none;
175-
outline: none;
165+
.nav-links li button .material-icons {
166+
padding-left: 4px;
176167
}
177168

178169
.nav-links li button .link-name {

0 commit comments

Comments
 (0)