Skip to content

Commit

Permalink
Merge pull request #26 from marcode24/dev
Browse files Browse the repository at this point in the history
📦️ Update package-lock.json
  • Loading branch information
marcode24 authored Jul 17, 2024
2 parents d619e0b + 92126d6 commit a4ba228
Show file tree
Hide file tree
Showing 21 changed files with 451 additions and 191 deletions.
5 changes: 5 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
"group": "builtin",
"position": "before"
},
{
"pattern": "@customTypes/**",
"group": "builtin",
"position": "before"
},
{
"pattern": "@services/**",
"group": "builtin",
Expand Down
123 changes: 98 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 38 additions & 42 deletions src/app/core/components/sidebar/sidebar.component.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
nav {
position: fixed;
height: 100%;
width: 250px;
border-right: 1px solid #a5a5a5;
padding: 6px 14px;
border-right: var(--border);
z-index: 103;
transition: 0.5s ease;
padding: 0 0.2rem;
padding: 0 1rem;
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 10px;
}

nav .logo-details {
height: 60px;
height: 70px;
width: 100%;
display: flex;
align-items: center;
Expand Down Expand Up @@ -52,12 +49,6 @@ nav.open .logo-details .toggled {
position: initial;
}

nav i {
color: var(--bg-color-secondary);
min-width: 60px;
font-size: 28px;
text-align: center;
}

nav .nav-list {
width: 100%;
Expand All @@ -77,22 +68,23 @@ nav li.mobile {
}

nav li .tooltip {
position: absolute;
top: -20px;
left: calc(100% + 15px);
z-index: 3;
color: var(--font-color-primary);
background: var(--bg-color-card);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
padding: 6px 12px;
border-radius: 4px;
border: var(--border);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
color: var(--font-color-primary);
display: none;
font-size: 15px;
font-weight: 400;
font-weight: 500;
left: calc(100% + 25px);
opacity: 0;
white-space: nowrap;
padding: 6px 12px;
pointer-events: none;
position: absolute;
top: -20px;
transition: 0s;
display: none;
white-space: nowrap;
z-index: 3;
}

nav li:hover .tooltip {
Expand All @@ -104,32 +96,33 @@ nav li:hover .tooltip {
}

nav li a {
display: flex;
height: 100%;
width: 100%;
border-radius: 40px;
align-items: center;
text-decoration: none;
transition: 0.5s ease;
background: transparent;
border-radius: 40px;
color: var(--font-color-secondary);
cursor: pointer;
display: flex;
font-size: 18px;
font-weight: 600;
gap: 0.8rem;
height: 100%;
padding: 0;
text-decoration: none;
transition: 0.2s ease;
width: 100%;
}

nav li a:hover,
.profile .profile-details:hover,
.active {
background: var(--bg-hover) !important;
nav li a.active,
.profile .profile-details:hover {
color: var(--font-color-primary);
}

nav li a .links_name {
color: var(--font-color-primary);
font-size: 19px;
font-weight: 500;
white-space: nowrap;
opacity: 0;
letter-spacing: 1px;
pointer-events: none;
transition: 0.4s;
opacity: 1;
}

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

nav li i {
font-size: 30px;
font-size: 32px;
border-radius: 12px;
min-width: fit-content;
}

nav .profile {
Expand Down Expand Up @@ -220,6 +214,11 @@ nav .profile {
@media (max-width: 1280px) {
nav {
width: 80px;
align-items: center;
}

nav .nav-list {
width: fit-content;
}

nav li .tooltip {
Expand Down Expand Up @@ -281,7 +280,7 @@ nav .profile {
transition: none;
background: var(--bg-color);
border-right: none;
border-top: 1px solid #a5a5a5;
border-top: var(--border);
}

nav .profile,
Expand All @@ -293,13 +292,10 @@ nav .profile {
nav .nav-list {
flex-direction: row;
bottom: 0;
justify-content: space-evenly;
justify-content: center;
gap: 4px;
}

/* nav li {
padding: 10px 0;
} */

nav li .tooltip {
display: none;
}
Expand Down
Loading

0 comments on commit a4ba228

Please sign in to comment.