Skip to content

Commit 4a97bfa

Browse files
legobeatlegobeat
committed
wip: revert ui stylesheet import changes
I am not sure what the intention and direction is here. Getting the following error without reverting: ``` $ yarn build dist Running task "dist"... Starting 'dist'... Starting 'clean'... Finished 'clean' Starting 'styles:prod'... LavaMoat: ignoring write attempt to read-access global "process" LavaMoat: ignoring write attempt to read-access global "__dirname" LavaMoat: ignoring write attempt to read-access global "__filename" LavaMoat: ignoring write attempt to read-access global "Buffer" [Error: Missing error message at new PluginError (/app/node_modules/plugin-error/index.js:64:11) at errorM (/app/node_modules/gulp-dart-sass/index.js:123:15) at callback (/app/node_modules/gulp-dart-sass/index.js:132:16) at eval (/app/node_modules/sass/sass.dart.js:22:46) at Function.call$2 (/app/node_modules/sass/sass.dart.js:93648:16) at _render_closure1.call$2 (/app/node_modules/sass/sass.dart.js:82008:12) at _RootZone.runBinary$3$3 (/app/node_modules/sass/sass.dart.js:27548:18) at _FutureListener.handleError$1 (/app/node_modules/sass/sass.dart.js:26097:19) at _Future__propagateToListeners_handleError.call$0 (/app/node_modules/sass/sass.dart.js:26395:49) at Object._Future__propagateToListeners (/app/node_modules/sass/sass.dart.js:4548:77)] { dartException: <ref *1> { '$cachedTrace': _StackTrace { _exception: [Circular *1], _trace: 'Error: Missing error message\n' + ' at new PluginError (/app/node_modules/plugin-error/index.js:64:11)\n' + ' at errorM (/app/node_modules/gulp-dart-sass/index.js:123:15)\n' + ' at callback (/app/node_modules/gulp-dart-sass/index.js:132:16)\n' + ' at eval (/app/node_modules/sass/sass.dart.js:22:46)\n' + ' at Function.call$2 (/app/node_modules/sass/sass.dart.js:93648:16)\n' + ' at _render_closure1.call$2 (/app/node_modules/sass/sass.dart.js:82008:12)\n' + ' at _RootZone.runBinary$3$3 (/app/node_modules/sass/sass.dart.js:27548:18)\n' + ' at _FutureListener.handleError$1 (/app/node_modules/sass/sass.dart.js:26097:19)\n' + ' at _Future__propagateToListeners_handleError.call$0 (/app/node_modules/sass/sass.dart.js:26395:49)\n' + ' at Object._Future__propagateToListeners (/app/node_modules/sass/sass.dart.js:4548:77)' } } } ``` MetaMask#17872 (review)
1 parent 927fa85 commit 4a97bfa

File tree

5 files changed

+22
-23
lines changed

5 files changed

+22
-23
lines changed

‎ui/components/app/app-header/app-header.component.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import NetworkDisplay from '../network-display';
99

1010
///: BEGIN:ONLY_INCLUDE_IN(beta)
1111
import BetaHeader from '../beta-header';
12-
///: END:ONLY_INCLUDE_IN
12+
///: END:ONLY_INCLUDE_IN(beta)
1313

1414
export default class AppHeader extends PureComponent {
1515
static propTypes = {
@@ -121,15 +121,15 @@ export default class AppHeader extends PureComponent {
121121
onClick,
122122
///: BEGIN:ONLY_INCLUDE_IN(beta)
123123
showBetaHeader,
124-
///: END:ONLY_INCLUDE_IN
124+
///: END:ONLY_INCLUDE_IN(beta)
125125
} = this.props;
126126

127127
return (
128128
<>
129129
{
130130
///: BEGIN:ONLY_INCLUDE_IN(beta)
131131
showBetaHeader ? <BetaHeader /> : null
132-
///: END:ONLY_INCLUDE_IN
132+
///: END:ONLY_INCLUDE_IN(beta)
133133
}
134134

135135
<div className="app-header">

‎ui/components/app/confirm-page-container/confirm-page-container.component.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import SetApproveForAllWarning from '../set-approval-for-all-warning';
3030
import { useI18nContext } from '../../../hooks/useI18nContext';
3131
///: BEGIN:ONLY_INCLUDE_IN(flask)
3232
import useTransactionInsights from '../../../hooks/useTransactionInsights';
33-
///: END:ONLY_INCLUDE_IN
33+
///: END:ONLY_INCLUDE_IN(flask)
3434
import {
3535
getAccountName,
3636
getAddressBookEntry,
@@ -88,7 +88,7 @@ const ConfirmPageContainer = (props) => {
8888
nativeCurrency,
8989
///: BEGIN:ONLY_INCLUDE_IN(flask)
9090
txData,
91-
///: END:ONLY_INCLUDE_IN
91+
///: END:ONLY_INCLUDE_IN(flask)
9292
assetStandard,
9393
isApprovalOrRejection,
9494
} = props;
@@ -348,7 +348,7 @@ ConfirmPageContainer.propTypes = {
348348
detailsComponent: PropTypes.node,
349349
///: BEGIN:ONLY_INCLUDE_IN(flask)
350350
txData: PropTypes.object,
351-
///: END:ONLY_INCLUDE_IN
351+
///: END:ONLY_INCLUDE_IN(flask)
352352
tokenAddress: PropTypes.string,
353353
nonce: PropTypes.string,
354354
warning: PropTypes.string,

‎ui/css/design-system/typography.scss

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
@use "sass:map";
22

3-
$fa-font-path: '~@fortawesome/fontawesome-free/webfonts';
3+
$fa-font-path: 'fonts/fontawesome';
44

5-
@import '~@fortawesome/fontawesome-free/scss/fontawesome';
6-
@import '~@fortawesome/fontawesome-free/scss/brands';
7-
@import '~@fortawesome/fontawesome-free/scss/solid';
8-
@import '~@fortawesome/fontawesome-free/scss/regular';
5+
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome';
6+
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/brands';
7+
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/solid';
8+
@import '../../../node_modules/@fortawesome/fontawesome-free/scss/regular';
99

1010
@font-face {
1111
font-family: 'Roboto';
1212
font-style: normal;
1313
font-weight: 100;
14-
src: local('Roboto Thin'), local('Roboto-Thin'), url('../../../app/fonts/Roboto/Roboto-Thin.ttf') format('truetype');
14+
src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype');
1515
}
1616

1717
@font-face {
1818
font-family: 'Roboto';
1919
font-style: normal;
2020
font-weight: 300;
21-
src: local('Roboto Light'), local('Roboto-Light'), url('../../../app/fonts/Roboto/Roboto-Light.ttf') format('truetype');
21+
src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype');
2222
}
2323

2424
@font-face {
2525
font-family: 'Roboto';
2626
font-style: normal;
2727
font-weight: 400;
28-
src: local('Roboto'), local('Roboto-Regular'), url('../../../app/fonts/Roboto/Roboto-Regular.ttf') format('truetype');
28+
src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype');
2929
}
3030

3131
@font-face {
3232
font-family: 'Roboto';
3333
font-style: normal;
3434
font-weight: 500;
35-
src: local('Roboto Medium'), local('Roboto-Medium'), url('../../../app/fonts/Roboto/Roboto-Medium.ttf') format('truetype');
35+
src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype');
3636
}
3737

3838
@font-face {
3939
font-family: 'Roboto';
4040
font-style: normal;
4141
font-weight: 700;
42-
src: local('Roboto Bold'), local('Roboto-Bold'), url('../../../app/fonts/Roboto/Roboto-Bold.ttf') format('truetype');
42+
src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype');
4343
}
4444

4545
@font-face {
4646
font-family: 'Roboto';
4747
font-style: normal;
4848
font-weight: 900;
49-
src: local('Roboto Black'), local('Roboto-Black'), url('../../../app/fonts/Roboto/Roboto-Black.ttf') format('truetype');
49+
src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype');
5050
}
5151

5252
@font-face {
5353
font-family: 'Euclid Circular B';
5454
font-style: normal;
5555
font-weight: 400;
56-
src: url('../../../app/fonts/Euclid/EuclidCircularB-Regular-WebXL.ttf') format('truetype');
56+
src: url('fonts/Euclid/EuclidCircularB-Regular-WebXL.ttf') format('truetype');
5757
}
5858

5959
@font-face {
6060
font-family: 'Euclid Circular B';
6161
font-style: italic;
6262
font-weight: 400;
63-
src: url('../../../app/fonts/Euclid/EuclidCircularB-RegularItalic-WebXL.ttf') format('truetype');
63+
src: url('fonts/Euclid/EuclidCircularB-RegularItalic-WebXL.ttf') format('truetype');
6464
}
6565

6666
@font-face {
6767
font-family: 'Euclid Circular B';
6868
font-style: normal;
6969
font-weight: 500;
70-
src: url('../../../app/fonts/Euclid/EuclidCircularB-Medium.ttf') format('truetype');
70+
src: url('fonts/Euclid/EuclidCircularB-Medium.ttf') format('truetype');
7171
}
7272

7373
@font-face {
7474
font-family: 'Euclid Circular B';
7575
font-style: normal;
7676
font-weight: 700;
77-
src: url('../../../app/fonts/Euclid/EuclidCircularB-Bold-WebXL.ttf') format('truetype');
77+
src: url('fonts/Euclid/EuclidCircularB-Bold-WebXL.ttf') format('truetype');
7878
}
7979

8080
$font-family: 'Euclid Circular B', Roboto, Helvetica, Arial, sans-serif;

‎ui/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
import Root from './pages';
2727
import txHelper from './helpers/utils/tx-helper';
2828
import { _setBackgroundConnection } from './store/action-queue';
29-
import './css/index.scss';
3029

3130
log.setLevel(global.METAMASK_DEBUG ? 'debug' : 'warn');
3231

‎ui/pages/onboarding-flow/welcome/index.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "~react-responsive-carousel/lib/styles/carousel.min.css";
1+
@import "./react-gallery/carousel.min.css";
22

33
.onboarding-welcome {
44
.control-dots .dot {

0 commit comments

Comments
 (0)