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

Jump to bottom

Refactor/sidebar #1865

Merged
merged 2 commits into from
Oct 24, 2022
Merged

Refactor/sidebar #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279774a
fixing sidebar css in collapsed state
BrettCleary Oct 3, 2022
4930bec
button default style, style names standardized
BrettCleary Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/frontend/components/UI/Sidebar/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
transition: color 250ms;
text-align: start;
font-family: var(--primary-font-family);
border-radius: 0;
}

.App.collapsed .Sidebar__item {
padding: var(--space-xs) 0;
}

.App.collapsed .Sidebar__itemIcon {
margin: 0 auto;
}

.Sidebar__item:focus-visible {
Expand Down Expand Up @@ -69,7 +78,6 @@
display: inline-flex;
justify-content: center;
color: var(--accent);
flex-shrink: 0;
}

.currentDownloads {
Expand Down
14 changes: 11 additions & 3 deletions src/frontend/styles/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
@mixin buttonDefaultStyle {
BrettCleary marked this conversation as resolved.
Show resolved Hide resolved
font-family: var(--secondary-font-family);
border-radius: var(--space-3xs);
color: #161616;
}

button {
@include buttonDefaultStyle();
}

.button {
@include buttonDefaultStyle();
--line-height: 17px;
cursor: pointer;
padding: var(--space-sm);
background: var(--primary);
color: #1a1b1c;
text-transform: uppercase;
font-family: var(--secondary-font-family);
font-style: normal;
font-weight: var(--medium);
font-size: var(--text-md);
line-height: var(--line-height);
color: #161616;
border: none;
max-height: 40px;
text-align: center;
transition: 500ms;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-radius: var(--space-3xs);
}

.button:disabled {
Expand Down
39 changes: 33 additions & 6 deletions src/frontend/styles/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@ h2,
h3,
h4,
h5,
h6 {
h6,
.subtitle {
font-family: var(--primary-font-family);
}

.content-sm {
font-family: var(--secondary-font-family);
}

.text--6xl {
font-size: var(--text-6xl);
}
Expand Down Expand Up @@ -119,22 +124,44 @@ h5,

.subtitle,
.content,
.uppercase,
p,
h6,
.text--md {
.text--md,
button,
.button-md {
font-size: var(--text-md);
}

.content-s,
.button,
.content-sm,
.button-sm,
.text--sm {
font-size: var(--text-sm);
}

.subtitle-s,
.subtitle-sm,
.caption,
.status,
.text--xs {
font-size: var(--text-xs);
}

.subtitle,
.content-sm,
h5,
h4 {
font-weight: var(--medium);
}

.subtitle-sm,
arielj marked this conversation as resolved.
Show resolved Hide resolved
.button-sm,
.button-md,
h3,
h2,
h1 {
font-weight: var(--bold);
}

.status,
h6 {
font-weight: var(--semibold);
}