From c397f552c37fe1929c1ef9b0f674310bcbea24e0 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Tue, 26 Dec 2017 11:31:05 +0800 Subject: [PATCH] fix some style --- .eslintrc | 1 + package.json | 8 ++--- src/components/Layout/Header.js | 3 +- src/components/Layout/Layout.less | 2 ++ src/components/Loader/Loader.less | 4 +-- src/public/logo.png | Bin 4206 -> 0 bytes src/public/logo.svg | 43 +++++++++++++++++++++++ src/routes/UIElement/dropOption/index.js | 6 ++-- src/routes/UIElement/iconfont/index.js | 6 ++-- src/routes/UIElement/search/index.js | 6 ++-- src/routes/dashboard/index.less | 1 + src/routes/login/index.less | 4 +++ src/routes/post/index.js | 6 ++-- src/themes/default.less | 2 -- src/utils/config.js | 2 +- 15 files changed, 70 insertions(+), 24 deletions(-) delete mode 100644 src/public/logo.png create mode 100644 src/public/logo.svg 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 b98342a77ec7b2740b98ac1391bcbee2d2bab6b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4206 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 Eg3Kw~`~Uy| 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: [],