Skip to content

Commit 01d2669

Browse files
committed
resolve alifd/next style issues
1 parent 567c6a6 commit 01d2669

File tree

11 files changed

+18
-95
lines changed

11 files changed

+18
-95
lines changed

web-app/.storybook/addons.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import '@storybook/addon-actions/register'
22
import '@storybook/addon-links/register'
3-
import '@storybook/addon-knobs/register'
4-
import '@storybook/addon-notes/register'
3+
import '@storybook/addon-knobs/register'

web-app/.storybook/config.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { configure } from '@storybook/react';
2+
import '@alifd/next/dist/next.css';
3+
24
// automatically import all files ending in *.stories.tsx
35
const req = require.context('../stories', true, /\.stories\.tsx$/);
46

web-app/.storybook/webpack.config.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ const path = require('path')
33
// see typescript setup
44
// https://storybook.js.org/docs/configurations/typescript-config/
55
module.exports = ({ config }) => {
6-
config.module.rules.push({
7-
test: /\.scss$/,
8-
use: ['style-loader', 'css-loader', 'sass-loader'],
9-
include: path.resolve(__dirname, '../'),
10-
})
6+
config.module.rules.push({
7+
test: /\.scss$/,
8+
use: ['style-loader', 'css-loader', 'sass-loader'],
9+
include: path.resolve(__dirname, '../'),
10+
})
1111
config.module.rules.push({
1212
test: /\.(ts|tsx)$/,
1313
loader: require.resolve('babel-loader'),

web-app/package-lock.json

+3-66
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"@alifd/next": "^1.15.5",
77
"@types/jest": "^24.0.13",
8-
"@types/node": "^12.0.4",
8+
"@types/node": "^12.0.7",
99
"@types/react": "^16.8.19",
1010
"@types/react-dom": "^16.8.4",
1111
"moment": "^2.24.0",

web-app/src/components/Continue/ContinueItem.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import * as React from 'react'
2-
import Button from '@alifd/next/lib/button'
3-
import '@alifd/next/lib/button/style'
4-
import '@alifd/next/lib/button/style'
5-
import Card from '@alifd/next/lib/card'
2+
import { Button, Card } from '@alifd/next'
63

74
interface Props {
85
title: string

web-app/src/components/Level/index.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import * as React from 'react'
2-
import Button from '@alifd/next/lib/button'
3-
import '@alifd/next/lib/button/style'
4-
import Card from '@alifd/next/lib/card'
5-
import '@alifd/next/lib/card/style'
2+
import { Button, Card } from '@alifd/next'
63
import CR from '../../../../src/typings'
74

85
const styles = {

web-app/src/components/New/index.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as React from 'react'
2-
import Button from '@alifd/next/lib/button'
3-
import '@alifd/next/lib/button/style'
2+
import { Button } from '@alifd/next'
43

54
interface Props {
65
onNew(tutorialId: string): void

web-app/src/components/Stage/index.tsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import * as React from 'react'
2-
import Button from '@alifd/next/lib/button'
3-
import '@alifd/next/lib/button/style'
4-
import Card from '@alifd/next/lib/card'
5-
import '@alifd/next/lib/card/style'
6-
2+
import { Button, Card } from '@alifd/next'
73
import CR from '../../../../src/typings'
84

95
import Step from '../Step'

web-app/src/components/Step/index.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as React from 'react'
2-
import Checkbox from '@alifd/next/lib/checkbox'
3-
import '@alifd/next/lib/checkbox/style'
2+
import { Checkbox } from '@alifd/next'
43
// import CC from '../../typings/client'
54
import CR from '../../../../src/typings'
65

web-app/src/components/Summary/index.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import * as React from 'react'
2-
import Button from '@alifd/next/lib/button'
3-
import '@alifd/next/lib/button/style'
4-
import Card from '@alifd/next/lib/card'
5-
import '@alifd/next/lib/card/style'
2+
import { Button, Card } from '@alifd/next'
63
import CR from '../../../../src/typings'
74

85
const styles = {

0 commit comments

Comments
 (0)