Skip to content

Commit 8ed477d

Browse files
authored
Merge pull request #129 from omgnetwork/kevin/react-export-sass-bug
Rename index.module.scss due to create-react-app 4 bug
2 parents 064323f + c40c23a commit 8ed477d

31 files changed

+68
-35
lines changed

package-lock.json

Lines changed: 38 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

src/components/button/Button.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Button {
44
display: flex;

src/components/copy/Copy.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Copy {
44
.icon {

src/components/gaspicker/GasPicker.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.GasPicker {
44
display: flex;

src/components/info/Info.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Info {
44
display: flex;

src/components/input/Input.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Input {
44
display: flex;

src/components/inputselect/InputSelect.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.selectContainer {
44
height: 46px;

src/components/mobileheader/MobileHeader.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.MobileHeader {
44
display: none;

src/components/mobilemenu/MobileMenu.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.menu {
44
background-color: $gray1;

src/components/modal/Modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
Fade
2222
} from '@material-ui/core';
2323

24-
import { gray6, gray3, gray1 } from 'index.scss';
24+
import { gray6, gray3, gray1 } from 'index.module.scss';
2525

2626
const useStyles = makeStyles({
2727
modal: {

src/components/pager/Pager.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Pager {
44
display: flex;

src/components/select/Select.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Select {
44
display: flex;

src/components/tabs/Tabs.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Tabs {
44
display: flex;

src/components/transaction/Transaction.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Transaction {
44
display: flex;

src/components/walletpicker/WalletPicker.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.WalletPicker {
44
display: flex;

src/containers/account/Account.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Account {
44
margin-bottom: 20px;

src/containers/app/App.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.App {
44
display: flex;

src/containers/home/Home.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Home {
44
display: flex;

src/containers/modals/deposit/DepositModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/exit/ExitModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/ledger/LedgerConnect.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/ledger/LedgerPrompt.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/merge/MergeModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/processexit/ProcessExitsModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.buttons {
44
display: flex;

src/containers/modals/transfer/TransferModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.disclaimer {
44
font-family: 'Messina';

src/containers/modals/wrongnetwork/WrongNetworkModal.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.WrongNetworkModal {
44
display: flex;

src/containers/status/Status.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.Status {
44
display: flex;

src/containers/transactions/Transactions.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'index.scss';
1+
@import 'index.module.scss';
22

33
.container {
44
display: flex;

src/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import store from 'store';
2323

2424
import App from 'containers/app/App';
2525

26-
import './index.scss';
26+
// Renamed due to https://github.com/facebook/create-react-app/issues/10047
27+
import './index.module.scss';
2728

2829
if (config.gtmId) {
2930
TagManager.initialize({ gtmId: config.gtmId });
File renamed without changes.

0 commit comments

Comments
 (0)