Skip to content

Commit

Permalink
use downloaded fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
Dripcoding committed Oct 24, 2020
1 parent d8a4efe commit 2166e72
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 8 deletions.
7 changes: 0 additions & 7 deletions public/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
// // images
// import bgPatternDesktop from './assets/images/bg-pattern-desktop.svg'
// import bgPatternMobile from './assets/images/bg-pattern-mobile.svg'
// import chevron from './assets/images/icon-arrow-down.svg'
// import boxDesktop from './assets/images/illustration-box-desktop.svg'
// import womanOnlineDesktop from './assets/images/illustration-woman-online-desktop.svg'
// import womanOnlineMobile from './assets/images/illustration-woman-online-mobile.svg'
// styles
import './styles/reset.scss'
import './styles/main.scss'
Expand Down
29 changes: 29 additions & 0 deletions public/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
@use 'mixins' as *;
@use 'palette' as *;

@font-face {
font-family: "KumbhSans-Bold";
src: url("../assets/fonts/KumbhSans-Bold.ttf") format("ttf");
}

@font-face {
font-family: "KumbhSans-Light";
src: url("../assets/fonts/KumbhSans-Light.ttf") format("ttf");
}

@font-face {
font-family: "KumbhSans-Regular";
src: url("../assets/fonts/KumbhSans-Regular.ttf") format("ttf");
}

body {
background-image: $gradient;
display: flex;
Expand All @@ -13,6 +28,7 @@ body {
.cardContainer {
@include faq-card-container;
@include flex-row;
font-family: "KumbhSans-Regular";

@media screen and (max-width: 1100px) {
@include flex-column;
Expand Down Expand Up @@ -49,6 +65,7 @@ body {

h1 {
@include faq-card-container-header;
font-family: "KumbhSans-Bold";

@media screen and (max-width: 1100px) {
align-self: center;
Expand Down Expand Up @@ -83,10 +100,18 @@ body {

.faqContainer__item__header--active {
@include desktop-active-item-header;
font-family: "KumbhSans-Bold";
font-weight: 700;
font-size: 14px;
line-height: 14px;
}

.faqContainer__item__header {
@include desktop-inactive-item-header;
font-family: "KumbhSans-Regular";
font-weight: 400;
font-size: 14px;
line-height: 14px;

&:hover {
color: $cardActiveItemHeaderHoverColor;
Expand Down Expand Up @@ -118,6 +143,10 @@ body {

.faqContainer__item__answer {
display: none;
font-family: "KumbhSans-Regular";
font-size: 12px;
font-weight: 400;
line-height: 18px;
}

div:first-of-type {
Expand Down
10 changes: 9 additions & 1 deletion webpack-common.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,21 @@ module.exports = {
use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader']
},
{
test: /\.(png|svg|jpg|gif)$/,
test: /\.(png|svg|jpg|gif|ttf)$/,
use: [
{
loader: 'url-loader',
}
],
},
{
test: /\.(woff|woff2|eot|ttf|otf)$/,
use: [
{
loader: 'file-loader'
}
],
}
]
},
plugins: [
Expand Down

1 comment on commit 2166e72

@vercel
Copy link

@vercel vercel bot commented on 2166e72 Oct 24, 2020

Choose a reason for hiding this comment

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

Please sign in to comment.