Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Layout fixes #494

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Layout fixes #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1496f90
The layout fix (footer not stretched to the bottom)
peterjurco Nov 19, 2024
3057501
History icon fix
peterjurco Nov 19, 2024
423022b
Add menu hover & active states
peterjurco Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/layout/layout.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
background: linear-gradient(334deg, #fafafa -0.91%, #ebf0ff 48.81%, #fafafa 99.52%);
min-height: 100vh;
position: relative;
display: flex;
flex-direction: column;
}

.content {
display: flex;
flex-grow: 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

}

.main {
Expand Down
4 changes: 2 additions & 2 deletions src/components/menu/history-icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const HistoryIcon = () => (
<path
d="M15.875 7.375L15.875 15.8765L21.875 17.875"
stroke="currentColor"
stroke-width="1.25"
stroke-linejoin="round"
strokeWidth="1.25"
strokeLinejoin="round"
/>
<path
d="M4.08234 11.8341C5.12706 8.84542 7.25653 6.35839 10.0487 4.86592C12.8408 3.37346 16.0917 2.98452 19.1571 3.77618C22.2225 4.56785 24.8786 6.48235 26.5989 9.14018C28.3191 11.798 28.978 15.0052 28.4449 18.1259C27.9118 21.2467 26.2256 24.0533 23.7206 25.9893C21.2156 27.9254 18.0747 28.8496 14.9203 28.5788C11.7659 28.308 8.82842 26.862 6.69006 24.5273C4.5517 22.1926 3.36858 19.1397 3.3752 15.9737"
Expand Down
42 changes: 37 additions & 5 deletions src/components/menu/menu.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,42 @@

.navLink {
border-left: 2px solid transparent;

&:hover {
.menuItem {
color: $color-dark-blue-50;
}
}

&:active {
.menuItem {
color: $color-dark-blue-100;
}
}
}

.activeNavLink {
cursor: default;
border-left: 2px solid $color-blue-500;

.menuItem,
.menuItemText,
.menuMobileItemText,
.menuMobileItem svg {
.menuItem {
color: $color-blue-500;
}

&:hover {
border-left: 2px solid $color-blue-200;

.menuItem {
color: $color-blue-200;
}
}

&:active {
border-left: 2px solid $color-blue-700;

.menuItem {
color: $color-blue-700;
}
}
}

.menuItem {
Expand Down Expand Up @@ -86,6 +110,14 @@
img {
padding: 4px;
}

&:hover {
color: $color-dark-blue-50;
}

&:active {
color: $color-dark-blue-100;
}
}

.mobileMenuWrapper {
Expand Down
Loading