diff --git a/.prettierignore b/.prettierignore index 2098c78c895e444136787bb101b9e2af2e519cae..6ce5e0186c7069221cdc1a321f1683d9c38d7c97 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,5 @@ **/*.md **/*.svg -**/*.ejs -**/*.html package.json .umi .umi-production diff --git a/functions/package.json b/functions/package.json index dd7281977e6816559ab0d5142b98a57358248d96..fe77db2ab178ceec526d78d077834a401b7970a0 100644 --- a/functions/package.json +++ b/functions/package.json @@ -17,7 +17,7 @@ "firebase-functions": "^2.1.0", "mockjs": "^1.0.1-beta3", "moment": "^2.22.2", - "path-to-regexp": "^2.2.1" + "path-to-regexp": "^3.0.0" }, "private": true } diff --git a/package.json b/package.json index cc68c65c75223b2d24d7af5a484e5d152d1f5b81..9d57bffe32388aa9ea8dd5080fe91016d5310085 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "antd": "^3.11.6", "bizcharts": "^3.4.2", "bizcharts-plugin-slider": "^2.1.1-beta.1", - "chalk": "^2.4.2", "classnames": "^2.2.6", "dva": "^2.4.0", "enquire-js": "^0.2.1", @@ -46,62 +45,62 @@ "memoize-one": "^5.0.0", "moment": "^2.22.2", "numeral": "^2.0.6", - "nzh": "^1.0.3", + "nzh": "^1.0.4", "omit.js": "^1.0.0", - "path-to-regexp": "^2.4.0", - "prop-types": "^15.5.10", + "path-to-regexp": "^3.0.0", + "prop-types": "^15.6.2", "qs": "^6.6.0", - "rc-animate": "^2.4.4", - "react": "^16.6.3", + "rc-animate": "^2.6.0", + "react": "^16.7.0", "react-container-query": "^0.11.0", "react-copy-to-clipboard": "^5.0.1", "react-document-title": "^2.0.3", - "react-dom": "^16.6.3", + "react-dom": "^16.7.0", "react-fittext": "^1.0.0", - "react-media": "^1.8.0", + "react-media": "^1.9.2", "react-router-dom": "^4.3.1" }, "devDependencies": { "@types/react": "^16.7.7", "@types/react-dom": "^16.0.10", "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", + "chalk": "^2.4.2", "check-prettier": "^1.0.1", "cross-env": "^5.1.1", "cross-port-killer": "^1.0.1", - "enzyme": "3.7.0", - "eslint": "^5.4.0", - "eslint-config-airbnb": "^17.0.0", - "eslint-config-prettier": "^3.0.1", + "enzyme": "3.8.0", + "eslint": "^5.12.1", + "eslint-config-airbnb": "^17.1.0", + "eslint-config-prettier": "^3.6.0", "eslint-plugin-babel": "^5.3.0", - "eslint-plugin-compat": "^2.6.2", - "eslint-plugin-import": "^2.14.0", - "eslint-plugin-jsx-a11y": "^6.1.2", - "eslint-plugin-markdown": "^1.0.0-beta.6", - "eslint-plugin-react": "^7.11.1", + "eslint-plugin-compat": "^2.6.3", + "eslint-plugin-import": "^2.15.0", + "eslint-plugin-jsx-a11y": "^6.2.0", + "eslint-plugin-markdown": "^1.0.0", + "eslint-plugin-react": "^7.12.4", "gh-pages": "^2.0.1", - "husky": "^1.2.0", + "husky": "^1.3.1", "jest-puppeteer": "^3.9.0", "less": "^3.9.0", "lint-staged": "^8.1.0", "merge-umi-mock-data": "^1.0.4", "mockjs": "^1.0.1-beta3", - "prettier": "1.15.2", - "pro-download": "^1.0.1", + "prettier": "1.16.1", "slash2": "^2.0.0", "stylelint": "^9.8.0", "stylelint-config-prettier": "^4.0.0", "stylelint-config-standard": "^18.0.0", - "tslint": "^5.10.0", - "tslint-config-prettier": "^1.10.0", + "tslint": "^5.12.1", + "tslint-config-prettier": "^1.17.0", "tslint-react": "^3.6.0", - "umi": "^2.4.2", + "umi": "^2.4.4", "umi-plugin-ga": "^1.1.3", - "umi-plugin-react": "^1.3.4" + "umi-plugin-react": "^1.4.2" }, "optionalDependencies": { - "puppeteer": "^1.10.0" + "puppeteer": "^1.11.0" }, "lint-staged": { "**/*.{js,ts,tsx,json,jsx,less}": [ diff --git a/src/components/NoticeIcon/index.less b/src/components/NoticeIcon/index.less index 3ca7c5d1e7126893c6044603f06e5c76cabed104..529a8f8084556f79af01cc21bdbb717734a94a47 100644 --- a/src/components/NoticeIcon/index.less +++ b/src/components/NoticeIcon/index.less @@ -2,6 +2,7 @@ .popover { width: 336px; + position: relative; } .noticeButton { @@ -9,9 +10,13 @@ display: inline-block; transition: all 0.3s; } - .icon { padding: 4px; + vertical-align: middle; +} + +.badge { + font-size: 16px; } .tabs { diff --git a/src/components/SelectLang/index.less b/src/components/SelectLang/index.less index 971ef2aa98be7393a749381e64976df111ffd306..91d9df07e58be62ac87ede5df733e43c3adc515d 100644 --- a/src/components/SelectLang/index.less +++ b/src/components/SelectLang/index.less @@ -14,7 +14,7 @@ vertical-align: top; line-height: @layout-header-height; > i { - font-size: 14px !important; + font-size: 16px !important; transform: none !important; svg { position: relative; diff --git a/src/pages/List/CardList.js b/src/pages/List/CardList.js index 03f799a14feb9d70ec47a9ad7fcaf739123d2ae4..a40f74b7e5cdf48418baae4162172ed9766effcb 100644 --- a/src/pages/List/CardList.js +++ b/src/pages/List/CardList.js @@ -86,7 +86,7 @@ class CardList extends PureComponent { ) : ( ) diff --git a/src/pages/document.ejs b/src/pages/document.ejs index fcdbaca186b6f76b8440891af3538348a85dbdfe..36be3f61a731a3f252f7f0ba8b137a37b56cb996 100644 --- a/src/pages/document.ejs +++ b/src/pages/document.ejs @@ -1,15 +1,18 @@ - - - - - Ant Design Pro - - - - - -
- + + + + + Ant Design Pro + + + + + +
+