Commit 464912e7 authored by 陈帅's avatar 陈帅 Committed by 陈小聪

html prettier (#3473)

* prettier html

* update dependencies

* centering icon

* set icon size

* edit text
parent fe94317e
**/*.md **/*.md
**/*.svg **/*.svg
**/*.ejs
**/*.html
package.json package.json
.umi .umi
.umi-production .umi-production
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"firebase-functions": "^2.1.0", "firebase-functions": "^2.1.0",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"moment": "^2.22.2", "moment": "^2.22.2",
"path-to-regexp": "^2.2.1" "path-to-regexp": "^3.0.0"
}, },
"private": true "private": true
} }
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
"antd": "^3.11.6", "antd": "^3.11.6",
"bizcharts": "^3.4.2", "bizcharts": "^3.4.2",
"bizcharts-plugin-slider": "^2.1.1-beta.1", "bizcharts-plugin-slider": "^2.1.1-beta.1",
"chalk": "^2.4.2",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"dva": "^2.4.0", "dva": "^2.4.0",
"enquire-js": "^0.2.1", "enquire-js": "^0.2.1",
...@@ -46,62 +45,62 @@ ...@@ -46,62 +45,62 @@
"memoize-one": "^5.0.0", "memoize-one": "^5.0.0",
"moment": "^2.22.2", "moment": "^2.22.2",
"numeral": "^2.0.6", "numeral": "^2.0.6",
"nzh": "^1.0.3", "nzh": "^1.0.4",
"omit.js": "^1.0.0", "omit.js": "^1.0.0",
"path-to-regexp": "^2.4.0", "path-to-regexp": "^3.0.0",
"prop-types": "^15.5.10", "prop-types": "^15.6.2",
"qs": "^6.6.0", "qs": "^6.6.0",
"rc-animate": "^2.4.4", "rc-animate": "^2.6.0",
"react": "^16.6.3", "react": "^16.7.0",
"react-container-query": "^0.11.0", "react-container-query": "^0.11.0",
"react-copy-to-clipboard": "^5.0.1", "react-copy-to-clipboard": "^5.0.1",
"react-document-title": "^2.0.3", "react-document-title": "^2.0.3",
"react-dom": "^16.6.3", "react-dom": "^16.7.0",
"react-fittext": "^1.0.0", "react-fittext": "^1.0.0",
"react-media": "^1.8.0", "react-media": "^1.9.2",
"react-router-dom": "^4.3.1" "react-router-dom": "^4.3.1"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^16.7.7", "@types/react": "^16.7.7",
"@types/react-dom": "^16.0.10", "@types/react-dom": "^16.0.10",
"antd-pro-merge-less": "^1.0.0", "antd-pro-merge-less": "^1.0.0",
"antd-theme-webpack-plugin": "^1.1.8", "antd-theme-webpack-plugin": "^1.2.0",
"babel-eslint": "^10.0.1", "babel-eslint": "^10.0.1",
"chalk": "^2.4.2",
"check-prettier": "^1.0.1", "check-prettier": "^1.0.1",
"cross-env": "^5.1.1", "cross-env": "^5.1.1",
"cross-port-killer": "^1.0.1", "cross-port-killer": "^1.0.1",
"enzyme": "3.7.0", "enzyme": "3.8.0",
"eslint": "^5.4.0", "eslint": "^5.12.1",
"eslint-config-airbnb": "^17.0.0", "eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.0.1", "eslint-config-prettier": "^3.6.0",
"eslint-plugin-babel": "^5.3.0", "eslint-plugin-babel": "^5.3.0",
"eslint-plugin-compat": "^2.6.2", "eslint-plugin-compat": "^2.6.3",
"eslint-plugin-import": "^2.14.0", "eslint-plugin-import": "^2.15.0",
"eslint-plugin-jsx-a11y": "^6.1.2", "eslint-plugin-jsx-a11y": "^6.2.0",
"eslint-plugin-markdown": "^1.0.0-beta.6", "eslint-plugin-markdown": "^1.0.0",
"eslint-plugin-react": "^7.11.1", "eslint-plugin-react": "^7.12.4",
"gh-pages": "^2.0.1", "gh-pages": "^2.0.1",
"husky": "^1.2.0", "husky": "^1.3.1",
"jest-puppeteer": "^3.9.0", "jest-puppeteer": "^3.9.0",
"less": "^3.9.0", "less": "^3.9.0",
"lint-staged": "^8.1.0", "lint-staged": "^8.1.0",
"merge-umi-mock-data": "^1.0.4", "merge-umi-mock-data": "^1.0.4",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"prettier": "1.15.2", "prettier": "1.16.1",
"pro-download": "^1.0.1",
"slash2": "^2.0.0", "slash2": "^2.0.0",
"stylelint": "^9.8.0", "stylelint": "^9.8.0",
"stylelint-config-prettier": "^4.0.0", "stylelint-config-prettier": "^4.0.0",
"stylelint-config-standard": "^18.0.0", "stylelint-config-standard": "^18.0.0",
"tslint": "^5.10.0", "tslint": "^5.12.1",
"tslint-config-prettier": "^1.10.0", "tslint-config-prettier": "^1.17.0",
"tslint-react": "^3.6.0", "tslint-react": "^3.6.0",
"umi": "^2.4.2", "umi": "^2.4.4",
"umi-plugin-ga": "^1.1.3", "umi-plugin-ga": "^1.1.3",
"umi-plugin-react": "^1.3.4" "umi-plugin-react": "^1.4.2"
}, },
"optionalDependencies": { "optionalDependencies": {
"puppeteer": "^1.10.0" "puppeteer": "^1.11.0"
}, },
"lint-staged": { "lint-staged": {
"**/*.{js,ts,tsx,json,jsx,less}": [ "**/*.{js,ts,tsx,json,jsx,less}": [
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.popover { .popover {
width: 336px; width: 336px;
position: relative;
} }
.noticeButton { .noticeButton {
...@@ -9,9 +10,13 @@ ...@@ -9,9 +10,13 @@
display: inline-block; display: inline-block;
transition: all 0.3s; transition: all 0.3s;
} }
.icon { .icon {
padding: 4px; padding: 4px;
vertical-align: middle;
}
.badge {
font-size: 16px;
} }
.tabs { .tabs {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
vertical-align: top; vertical-align: top;
line-height: @layout-header-height; line-height: @layout-header-height;
> i { > i {
font-size: 14px !important; font-size: 16px !important;
transform: none !important; transform: none !important;
svg { svg {
position: relative; position: relative;
......
...@@ -86,7 +86,7 @@ class CardList extends PureComponent { ...@@ -86,7 +86,7 @@ class CardList extends PureComponent {
) : ( ) : (
<List.Item> <List.Item>
<Button type="dashed" className={styles.newButton}> <Button type="dashed" className={styles.newButton}>
<Icon type="plus" /> 产品 <Icon type="plus" /> 产品
</Button> </Button>
</List.Item> </List.Item>
) )
......
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta
<title>Ant Design Pro</title> name="viewport"
<link rel="icon" href="/favicon.png" type="image/x-icon"> content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.6/dist/data-set.min.js"></script> />
</head> <title>Ant Design Pro</title>
<body> <link rel="icon" href="/favicon.png" type="image/x-icon" />
<noscript>Sorry, we need js to run correctly!</noscript> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.6/dist/data-set.min.js"></script>
<div id="root"></div> </head>
</body> <body>
<noscript>Sorry, we need js to run correctly!</noscript>
<div id="root"></div>
</body>
</html> </html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment