diff --git a/.eslintrc b/.eslintrc index dff5ed6..3e8054a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -37,6 +37,7 @@ "import/prefer-default-export": 0, "react/no-danger": 0, "jsx-a11y/no-static-element-interactions": 0, + "jsx-a11y/click-events-have-key-events": 0, "react/jsx-closing-tag-location": 0, "react/sort-comp": 0, "no-mixed-operators": 0, diff --git a/package.json b/package.json index d548701..fb1e19d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "antd-admin", - "version": "4.3.7", + "version": "4.3.8", "dependencies": { "antd": "3.0.3", "axios": "^0.17.1", @@ -60,9 +60,7 @@ "redbox-react": "^1.2.10", "roadhog": "1.3.1" }, - "pre-commit": [ - "lint" - ], + "pre-commit": ["lint"], "scripts": { "dev": "cross-env BROWSER=none HOST=0.0.0.0 roadhog server", "start": "roadhog buildDll && cross-env BROWSER=none HOST=0.0.0.0 roadhog server", @@ -71,4 +69,4 @@ "build:dll": "roadhog buildDll", "build:new": "node version && roadhog build" } -} +} \ No newline at end of file diff --git a/src/components/Layout/Header.js b/src/components/Layout/Header.js index d01c380..42fba18 100644 --- a/src/components/Layout/Header.js +++ b/src/components/Layout/Header.js @@ -31,8 +31,7 @@ const Header = ({ :
{}} - onKeyDown={switchSider} + onClick={switchSider} >
} diff --git a/src/components/Layout/Layout.less b/src/components/Layout/Layout.less index f310219..42c4fb6 100644 --- a/src/components/Layout/Layout.less +++ b/src/components/Layout/Layout.less @@ -91,6 +91,8 @@ font-size: 16px; text-transform: uppercase; display: inline-block; + font-weight: 700; + color: @primary-color; } } diff --git a/src/components/Loader/Loader.less b/src/components/Loader/Loader.less index fed0403..4ecbe52 100644 --- a/src/components/Loader/Loader.less +++ b/src/components/Loader/Loader.less @@ -26,8 +26,8 @@ } .inner { - width: 48px; - height: 48px; + width: 40px; + height: 40px; margin: 0 auto; text-indent: -12345px; border-top: 1px solid rgba(0, 0, 0, 0.08); diff --git a/src/public/logo.png b/src/public/logo.png deleted file mode 100644 index b98342a..0000000 Binary files a/src/public/logo.png and /dev/null differ diff --git a/src/public/logo.svg b/src/public/logo.svg new file mode 100644 index 0000000..e9f8c2a --- /dev/null +++ b/src/public/logo.svg @@ -0,0 +1,43 @@ + + + + Group 28 Copy 5 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/routes/UIElement/dropOption/index.js b/src/routes/UIElement/dropOption/index.js index 33420a7..5adf28e 100644 --- a/src/routes/UIElement/dropOption/index.js +++ b/src/routes/UIElement/dropOption/index.js @@ -1,8 +1,8 @@ import React from 'react' -import { DropOption } from 'components' +import { DropOption, Page } from 'components' import { Table, Row, Col, Card, message } from 'antd' -const DropOptionPage = () => (
+const DropOptionPage = () => ( @@ -90,6 +90,6 @@ const DropOptionPage = () => (
/> -
) +) export default DropOptionPage diff --git a/src/routes/UIElement/iconfont/index.js b/src/routes/UIElement/iconfont/index.js index 93fc43f..3ed7f6c 100644 --- a/src/routes/UIElement/iconfont/index.js +++ b/src/routes/UIElement/iconfont/index.js @@ -1,5 +1,5 @@ import React from 'react' -import { Iconfont } from 'components' +import { Iconfont, Page } from 'components' import { Table, Row, Col, Icon } from 'antd' import styles from './index.less' import './emoji' @@ -24,7 +24,7 @@ const localRequireSVGIcons = [ require('../../../svg/cute/think.svg'), ] -const IcoPage = () => (
+const IcoPage = () => (

Colorful Icon

) +) export default IcoPage diff --git a/src/routes/UIElement/search/index.js b/src/routes/UIElement/search/index.js index 2746290..3546b63 100644 --- a/src/routes/UIElement/search/index.js +++ b/src/routes/UIElement/search/index.js @@ -1,8 +1,8 @@ import React from 'react' -import { Search } from 'components' +import { Search, Page } from 'components' import { Table, Row, Col, Card } from 'antd' -const SearchPage = () => (
+const SearchPage = () => ( @@ -93,6 +93,6 @@ const SearchPage = () => (
/> -
) +) export default SearchPage diff --git a/src/routes/dashboard/index.less b/src/routes/dashboard/index.less index a9482aa..ebf4401 100644 --- a/src/routes/dashboard/index.less +++ b/src/routes/dashboard/index.less @@ -1,4 +1,5 @@ .dashboard{ + position: relative; :global { .ant-card { border-radius: 0; diff --git a/src/routes/login/index.less b/src/routes/login/index.less index 6af9d4a..2550e4b 100644 --- a/src/routes/login/index.less +++ b/src/routes/login/index.less @@ -1,3 +1,5 @@ +@import "~themes/vars"; + .form { position: absolute; top: 50%; @@ -40,6 +42,8 @@ font-size: 16px; text-transform: uppercase; display: inline-block; + font-weight: 700; + color: @primary-color; } } diff --git a/src/routes/post/index.js b/src/routes/post/index.js index caa2f2e..87e39ed 100644 --- a/src/routes/post/index.js +++ b/src/routes/post/index.js @@ -4,6 +4,7 @@ import { connect } from 'dva' import { Tabs } from 'antd' import { routerRedux } from 'dva/router' import queryString from 'query-string' +import { Page } from 'components' import List from './List' const { TabPane } = Tabs @@ -20,7 +21,6 @@ const Index = ({ const { list, pagination } = post location.query = queryString.parse(location.search) const { query, pathname } = location - console.log(location, query, pathname) const listProps = { pagination, @@ -48,7 +48,7 @@ const Index = ({ } - return (
+ return ( @@ -57,7 +57,7 @@ const Index = ({ -
) + ) } Index.propTypes = { diff --git a/src/themes/default.less b/src/themes/default.less index 429bcef..1e640f3 100644 --- a/src/themes/default.less +++ b/src/themes/default.less @@ -13,5 +13,3 @@ @border-color-base: #e5e5e5; @font-size-base: 13px; @text-color: #666; - -// @icon-url: "/antd/iconfont"; diff --git a/src/utils/config.js b/src/utils/config.js index 279cad3..5f4ad56 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -5,7 +5,7 @@ module.exports = { name: 'AntD Admin', prefix: 'antdAdmin', footerText: 'Ant Design Admin © 2017 zuiidea', - logo: '/logo.png', + logo: '/logo.svg', iconFontCSS: '/iconfont.css', iconFontJS: '/iconfont.js', CORS: [],