Skip to content

Commit a4ba228

Browse files
authored
Merge pull request #26 from marcode24/dev
📦️ Update package-lock.json
2 parents d619e0b + 92126d6 commit a4ba228

21 files changed

+451
-191
lines changed

.eslintrc.json

+5
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@
7171
"group": "builtin",
7272
"position": "before"
7373
},
74+
{
75+
"pattern": "@customTypes/**",
76+
"group": "builtin",
77+
"position": "before"
78+
},
7479
{
7580
"pattern": "@services/**",
7681
"group": "builtin",

package-lock.json

+98-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/core/components/sidebar/sidebar.component.css

+38-42
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
nav {
22
position: fixed;
33
height: 100%;
4-
width: 250px;
5-
border-right: 1px solid #a5a5a5;
6-
padding: 6px 14px;
4+
border-right: var(--border);
75
z-index: 103;
86
transition: 0.5s ease;
9-
padding: 0 0.2rem;
7+
padding: 0 1rem;
108
display: flex;
119
flex-direction: column;
1210
align-items: flex-start;
13-
gap: 10px;
1411
}
1512

1613
nav .logo-details {
17-
height: 60px;
14+
height: 70px;
1815
width: 100%;
1916
display: flex;
2017
align-items: center;
@@ -52,12 +49,6 @@ nav.open .logo-details .toggled {
5249
position: initial;
5350
}
5451

55-
nav i {
56-
color: var(--bg-color-secondary);
57-
min-width: 60px;
58-
font-size: 28px;
59-
text-align: center;
60-
}
6152

6253
nav .nav-list {
6354
width: 100%;
@@ -77,22 +68,23 @@ nav li.mobile {
7768
}
7869

7970
nav li .tooltip {
80-
position: absolute;
81-
top: -20px;
82-
left: calc(100% + 15px);
83-
z-index: 3;
84-
color: var(--font-color-primary);
8571
background: var(--bg-color-card);
86-
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
87-
padding: 6px 12px;
8872
border-radius: 4px;
73+
border: var(--border);
74+
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
75+
color: var(--font-color-primary);
76+
display: none;
8977
font-size: 15px;
90-
font-weight: 400;
78+
font-weight: 500;
79+
left: calc(100% + 25px);
9180
opacity: 0;
92-
white-space: nowrap;
81+
padding: 6px 12px;
9382
pointer-events: none;
83+
position: absolute;
84+
top: -20px;
9485
transition: 0s;
95-
display: none;
86+
white-space: nowrap;
87+
z-index: 3;
9688
}
9789

9890
nav li:hover .tooltip {
@@ -104,32 +96,33 @@ nav li:hover .tooltip {
10496
}
10597

10698
nav li a {
107-
display: flex;
108-
height: 100%;
109-
width: 100%;
110-
border-radius: 40px;
11199
align-items: center;
112-
text-decoration: none;
113-
transition: 0.5s ease;
114100
background: transparent;
101+
border-radius: 40px;
102+
color: var(--font-color-secondary);
115103
cursor: pointer;
104+
display: flex;
105+
font-size: 18px;
106+
font-weight: 600;
107+
gap: 0.8rem;
108+
height: 100%;
109+
padding: 0;
110+
text-decoration: none;
111+
transition: 0.2s ease;
112+
width: 100%;
116113
}
117114

118115
nav li a:hover,
119-
.profile .profile-details:hover,
120-
.active {
121-
background: var(--bg-hover) !important;
116+
nav li a.active,
117+
.profile .profile-details:hover {
118+
color: var(--font-color-primary);
122119
}
123120

124121
nav li a .links_name {
125-
color: var(--font-color-primary);
126-
font-size: 19px;
127-
font-weight: 500;
128122
white-space: nowrap;
129123
opacity: 0;
130124
letter-spacing: 1px;
131125
pointer-events: none;
132-
transition: 0.4s;
133126
opacity: 1;
134127
}
135128

@@ -139,8 +132,9 @@ nav li a:hover i {
139132
}
140133

141134
nav li i {
142-
font-size: 30px;
135+
font-size: 32px;
143136
border-radius: 12px;
137+
min-width: fit-content;
144138
}
145139

146140
nav .profile {
@@ -220,6 +214,11 @@ nav .profile {
220214
@media (max-width: 1280px) {
221215
nav {
222216
width: 80px;
217+
align-items: center;
218+
}
219+
220+
nav .nav-list {
221+
width: fit-content;
223222
}
224223

225224
nav li .tooltip {
@@ -281,7 +280,7 @@ nav .profile {
281280
transition: none;
282281
background: var(--bg-color);
283282
border-right: none;
284-
border-top: 1px solid #a5a5a5;
283+
border-top: var(--border);
285284
}
286285

287286
nav .profile,
@@ -293,13 +292,10 @@ nav .profile {
293292
nav .nav-list {
294293
flex-direction: row;
295294
bottom: 0;
296-
justify-content: space-evenly;
295+
justify-content: center;
296+
gap: 4px;
297297
}
298298

299-
/* nav li {
300-
padding: 10px 0;
301-
} */
302-
303299
nav li .tooltip {
304300
display: none;
305301
}

0 commit comments

Comments
 (0)