@arcblock/ux 1.16.46 → 1.16.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Theme/index.js +15 -1
- package/package.json +4 -4
- package/src/Theme/index.js +14 -0
package/lib/Theme/index.js
CHANGED
|
@@ -61,7 +61,16 @@ const create = function create() {
|
|
|
61
61
|
main: mode === 'light' ? '#222222' : _Colors.default.common.white,
|
|
62
62
|
gray: mode === 'light' ? _Colors.default.grey[500] : _Colors.default.grey[300]
|
|
63
63
|
},
|
|
64
|
-
fontFamily: ['Lato', 'Avenir', '-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(',')
|
|
64
|
+
fontFamily: ['Lato', 'Avenir', '-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(','),
|
|
65
|
+
// 按最新设计规范, 只使用 400/700
|
|
66
|
+
fontWeightLight: 400,
|
|
67
|
+
fontWeightRegular: 400,
|
|
68
|
+
fontWeightMedium: 700,
|
|
69
|
+
fontWeightBold: 700,
|
|
70
|
+
// button 默认使用粗体
|
|
71
|
+
button: {
|
|
72
|
+
fontWeight: 700
|
|
73
|
+
}
|
|
65
74
|
}, typography || {}),
|
|
66
75
|
overrides: Object.assign({
|
|
67
76
|
MuiButton: {
|
|
@@ -69,6 +78,11 @@ const create = function create() {
|
|
|
69
78
|
boxShadow: 'none'
|
|
70
79
|
}
|
|
71
80
|
},
|
|
81
|
+
MuiButtonGroup: {
|
|
82
|
+
contained: {
|
|
83
|
+
boxShadow: 'none'
|
|
84
|
+
}
|
|
85
|
+
},
|
|
72
86
|
MuiAppBar: {
|
|
73
87
|
root: {
|
|
74
88
|
height: 80
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.49",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -53,10 +53,10 @@
|
|
|
53
53
|
"react": ">=16.12.0",
|
|
54
54
|
"react-ga": "^2.7.0"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "075a153e62a1f8139be774590ba207b7858d88c7",
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@arcblock/icons": "^1.16.
|
|
59
|
-
"@arcblock/react-hooks": "^1.16.
|
|
58
|
+
"@arcblock/icons": "^1.16.49",
|
|
59
|
+
"@arcblock/react-hooks": "^1.16.49",
|
|
60
60
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
61
61
|
"@fontsource/lato": "^4.5.3",
|
|
62
62
|
"@material-ui/core": "^4.12.3",
|
package/src/Theme/index.js
CHANGED
|
@@ -53,6 +53,15 @@ export const create = ({
|
|
|
53
53
|
'"Segoe UI Emoji"',
|
|
54
54
|
'"Segoe UI Symbol"',
|
|
55
55
|
].join(','),
|
|
56
|
+
// 按最新设计规范, 只使用 400/700
|
|
57
|
+
fontWeightLight: 400,
|
|
58
|
+
fontWeightRegular: 400,
|
|
59
|
+
fontWeightMedium: 700,
|
|
60
|
+
fontWeightBold: 700,
|
|
61
|
+
// button 默认使用粗体
|
|
62
|
+
button: {
|
|
63
|
+
fontWeight: 700,
|
|
64
|
+
},
|
|
56
65
|
},
|
|
57
66
|
typography || {}
|
|
58
67
|
),
|
|
@@ -63,6 +72,11 @@ export const create = ({
|
|
|
63
72
|
boxShadow: 'none',
|
|
64
73
|
},
|
|
65
74
|
},
|
|
75
|
+
MuiButtonGroup: {
|
|
76
|
+
contained: {
|
|
77
|
+
boxShadow: 'none',
|
|
78
|
+
},
|
|
79
|
+
},
|
|
66
80
|
MuiAppBar: {
|
|
67
81
|
root: {
|
|
68
82
|
height: 80,
|