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

Update fonts according to the new design system #109

Merged
merged 1 commit into from
Sep 7, 2021
Merged

Update fonts according to the new design system #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/styles/globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$primary: #38a7de;
$secondary: #0d2938;

$font: 'Droid Sans';
$font: 'Open Sans';
$font-header: 'Sansation';
$font-color: #2b2a28;
$border: rgba(65, 64, 66, 0.2);
Expand Down
3 changes: 1 addition & 2 deletions src/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@
@import './partials/noSearchResults';
@import './partials/showMoreFiles.scss';
@import './partials/adminTables';
@import url('https://fonts.googleapis.com/css2?family=Open+Sans&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Nunito+Sans&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,300;0,400;0,600;0,700;1,300;1,400;1,600;1,700&family=Open+Sans:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&display=swap');
2 changes: 1 addition & 1 deletion src/styles/partials/_adminTables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
text-align: center;
margin: 0.5rem;
font-weight: 500;
font-family: 'Droid Sans';
font-family: 'Open Sans';
color: #0d2938;
}
2 changes: 1 addition & 1 deletion src/styles/partials/_courseCover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

&--hold {
@include font;
width: 19.1875rem;
width: 20rem;
height: 1.75rem;
margin-top: 0.7891rem;
font-size: 1.5rem;
Expand Down
14 changes: 7 additions & 7 deletions src/styles/partials/_coursePage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
width: auto;
height: auto;
margin-top: 2.9375rem;
font-family: Raleway;
font-family: 'Nunito Sans';
font-style: normal;
font-weight: 500;
font-size: 2rem;
Expand Down Expand Up @@ -126,15 +126,15 @@
&_all_ {
width: 1.3125rem;
height: 1.375rem;
font-weight: bold;
font-weight: 600;
color: $primary;
padding: 0.5rem 5% 0.6875rem 0%;
}

&_tut_ {
width: 4.8125rem;
height: 1.375rem;
font-weight: bold;
font-weight: 600;
color: $primary;
padding: 0.5rem 4% 0.6875rem 5%;
border-left: 0.0625rem solid rgba($font-color, 0.4);
Expand All @@ -143,7 +143,7 @@
&_books_ {
width: 3.125rem;
height: 1.375rem;
font-weight: bold;
font-weight: 600;
color: $primary;
padding: 0.5rem 5% 0.6875rem 6%;
border-left: 0.0625rem solid rgba($font-color, 0.4);
Expand All @@ -152,16 +152,16 @@
&_notes_ {
width: 3rem;
height: 1.375rem;
font-weight: bold;
font-weight: 600;
color: $primary;
padding: 0.5rem 4% 0.6875rem 5%;
border-left: 0.0625rem solid rgba($font-color, 0.4);
}

&_exam_ {
width: 10.0625rem;
width: 11rem;
height: 1.375rem;
font-weight: bold;
font-weight: 600;
color: $primary;
padding: 0.5rem 0% 0.6875rem 4%;
border-left: 0.0625rem solid rgba($font-color, 0.4);
Expand Down
1 change: 1 addition & 0 deletions src/styles/partials/_noContentCover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
margin-top: 0.7891rem;
font-size: 1.5rem;
line-height: 1.75rem;
color: $primary;
}
}
2 changes: 1 addition & 1 deletion src/styles/partials/_request.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

&type {
@include font;
width: 6rem;
width: 7rem;
height: 1.1875rem;
margin-top: 2.25rem;
margin-left: 18%;
Expand Down
3 changes: 2 additions & 1 deletion src/styles/partials/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,14 @@
&button {
@include font;
padding: 0.375rem 0.75rem;
width: 9.8125rem;
width: 11rem;
height: 2.25rem;
background: rgba(255, 255, 255, 0.1);
border-radius: 0.125rem;
border: none;
color: $white;
margin-left: 0.5rem;
line-height: 150%;

img {
height: 0.875rem;
Expand Down