m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Updating storybook webpack config and changing font paths (#13028)

Browse Source
This commit is contained in:
George Marshall 2022-01-04 16:41:10 -08:00 committed by GitHub
parent 75b9f71d45
commit c95da7dbb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.storybook/main.js
View File

@ -30,7 +30,6 @@ module.exports = {
url: false, url: false,
}, },
}, },
'resolve-url-loader',
{ {
loader: 'sass-loader', loader: 'sass-loader',
options: { options: {

20
ui/css/design-system/typography.scss
View File

@ -1,4 +1,4 @@
$fa-font-path: '/fonts/fontawesome'; $fa-font-path: 'fonts/fontawesome';
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome'; @import '../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome';
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/brands'; @import '../../../node_modules/@fortawesome/fontawesome-free/scss/brands';
@ -9,63 +9,63 @@ $fa-font-path: '/fonts/fontawesome';
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 100; font-weight: 100;
src: local('Roboto Thin'), local('Roboto-Thin'), url('/fonts/Roboto/Roboto-Thin.ttf') format('truetype'); src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'), url('/fonts/Roboto/Roboto-Light.ttf') format('truetype'); src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'), url('/fonts/Roboto/Roboto-Regular.ttf') format('truetype'); src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 500; font-weight: 500;
src: local('Roboto Medium'), local('Roboto-Medium'), url('/fonts/Roboto/Roboto-Medium.ttf') format('truetype'); src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: local('Roboto Bold'), local('Roboto-Bold'), url('/fonts/Roboto/Roboto-Bold.ttf') format('truetype'); src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
font-style: normal; font-style: normal;
font-weight: 900; font-weight: 900;
src: local('Roboto Black'), local('Roboto-Black'), url('/fonts/Roboto/Roboto-Black.ttf') format('truetype'); src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Euclid'; font-family: 'Euclid';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('/fonts/Euclid/EuclidCircularB-Regular-WebXL.ttf') format('truetype'); src: url('fonts/Euclid/EuclidCircularB-Regular-WebXL.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Euclid'; font-family: 'Euclid';
font-style: italic; font-style: italic;
font-weight: 400; font-weight: 400;
src: url('/fonts/Euclid/EuclidCircularB-RegularItalic-WebXL.ttf') format('truetype'); src: url('fonts/Euclid/EuclidCircularB-RegularItalic-WebXL.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Euclid'; font-family: 'Euclid';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: url('/fonts/Euclid/EuclidCircularB-Bold-WebXL.ttf') format('truetype'); src: url('fonts/Euclid/EuclidCircularB-Bold-WebXL.ttf') format('truetype');
} }
$font-family: Euclid, Roboto, Helvetica, Arial, sans-serif; $font-family: Euclid, Roboto, Helvetica, Arial, sans-serif;