Skip to content

Add new font #157

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

Merged
merged 2 commits into from
Mar 5, 2021
Merged

Add new font #157

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
e238394
Add new font
stefashkaa Mar 5, 2021
cd6477e
Add mixin usage
stefashkaa Mar 5, 2021
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
Binary file removed src/assets/fonts/Sora-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed src/assets/fonts/Sora-ExtraBold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed src/assets/fonts/Sora-Regular.otf
View file
Open in desktop
Binary file not shown.
Binary file removed src/assets/fonts/Sora-SemiBold.otf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/Sora-VariableFont_wght.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/styles/breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.el-breadcrumb__separator {
color: var(--s-color-base-content-tertiary);
font-weight: normal;
@include font-weight(400);
}
.el-breadcrumb__inner {
color: var(--s-color-base-content-tertiary);
&.is-link {
color: var(--s-color-base-content-tertiary);
font-weight: normal;
@include font-weight(400);
&:hover {
color: var(--s-color-theme-accent);
}
Expand Down
1 change: 0 additions & 1 deletion src/styles/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
}
span {
font-feature-settings: var(--s-font-feature-settings-heading);
font-weight: normal;
@include font-weight(700, true);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ html {

/* Typography */
h1, h2, h3, h4, h5, h6 {
font-weight: normal;
@include font-weight(400);
font-feature-settings: var(--s-font-feature-settings-heading);
}

Expand Down
23 changes: 2 additions & 21 deletions src/styles/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,10 @@
font-style: normal;
font-display: block;
}
@font-face {
font-family: "SoraB";
src: url("~@/assets/fonts/Sora-Bold.otf");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "SoraEB";
src: url("~@/assets/fonts/Sora-ExtraBold.otf");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "SoraSB";
src: url("~@/assets/fonts/Sora-SemiBold.otf");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "Sora";
src: url("~@/assets/fonts/Sora-Regular.otf");
font-weight: normal;
font-style: normal;
src: url("~@/assets/fonts/Sora-VariableFont_wght.ttf") format("truetype-variations");
font-weight: 1 999;
}
@font-face {
font-family: "JetBrainsMono";
Expand Down
4 changes: 1 addition & 3 deletions src/styles/pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,10 @@
.per-page-text,
.el-pagination__jump {
color: var(--s-color-base-content-tertiary);
font-weight: normal;
@include font-weight(400);
}
.el-pager li {
color: var(--s-color-base-content-primary);
font-weight: normal;
@include font-weight(700);
&.btn-quicknext,
&.btn-quickprev {
Expand Down Expand Up @@ -146,7 +145,6 @@
color: var(--s-color-theme-accent);
}
.el-select-dropdown__item.selected {
font-weight: normal;
@include font-weight(700, true);
}
}
2 changes: 1 addition & 1 deletion src/styles/select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ $select-prefix-height: $s-size-mini;
border-radius: var(--s-border-radius-mini);
}
&.selected {
font-weight: normal;
@include font-weight(400);
&.hover {
background-color: transparent;
}
Expand Down
1 change: 0 additions & 1 deletion src/styles/tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
@include tabs-border-radius("mini", var(--s-border-radius-mini));
.el-tabs__header {
.el-tabs__item {
font-weight: normal;
@include font-weight(600, true);
}
}
Expand Down
20 changes: 4 additions & 16 deletions src/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,9 @@ $--breakpoints-spec: (

// Mixin for font-weight (temporarily solution)
@mixin font-weight($fontWeight: 400, $important: false) {
@if $fontWeight == 400 and $important == false {
font-family: "Sora", sans-serif;
} @else if $fontWeight == 400 and $important == true {
font-family: "Sora", sans-serif !important;
} @else if $fontWeight == 500 and $important == false {
font-family: "SoraSB", sans-serif;
} @else if $fontWeight == 500 and $important == true {
font-family: "SoraSB", sans-serif !important;
} @else if $fontWeight == 600 and $important == false {
font-family: "SoraB", sans-serif;
} @else if $fontWeight == 600 and $important == true {
font-family: "SoraB", sans-serif !important;
} @else if $fontWeight == 700 and $important == false {
font-family: "SoraEB", sans-serif;
} @else if $fontWeight == 700 and $important == true {
font-family: "SoraEB", sans-serif !important;
@if $important == false {
font-weight: $fontWeight;
} @else {
font-weight: $fontWeight !important;
}
}