diff --git a/src/components/dashboard/numberCard.js b/src/components/dashboard/numberCard.js
index 47fc635..9f19e63 100644
--- a/src/components/dashboard/numberCard.js
+++ b/src/components/dashboard/numberCard.js
@@ -1,17 +1,17 @@
import React, { PropTypes } from 'react'
-import { Icon } from 'antd'
+import { Icon, Card } from 'antd'
import styles from './numberCard.less'
function NumberCard(props) {
const { icon, color, title, number } = props
return (
-
+
{title || 'No Title'}
{number || '10,000'}
-
+
)
}
diff --git a/src/components/dashboard/numberCard.less b/src/components/dashboard/numberCard.less
index 6daa31f..419aafa 100644
--- a/src/components/dashboard/numberCard.less
+++ b/src/components/dashboard/numberCard.less
@@ -1,16 +1,9 @@
@import "../vars.less";
.numberCard{
- box-shadow: @shadow-1;
padding: 32px;
font-family: monospace;
- background-color: #fff;
margin-bottom: 24px;
cursor: pointer;
- transition: @transition-ease-in;
- &:hover{
- box-shadow: @shadow-2;
- transform: translateY(-2px);
- }
.iconWarp{
font-size: 54px;
float: left;
diff --git a/src/components/skin.less b/src/components/skin.less
index 8e6375a..4be6fe1 100644
--- a/src/components/skin.less
+++ b/src/components/skin.less
@@ -1,11 +1,9 @@
@import "./vars.less";
:global{
- .ant-card{
- box-shadow: @shadow-1;
- transition: @transition-ease-in;
- &:hover{
- box-shadow: @shadow-2;
- transform: translateY(-2px);
- }
+ .ant-modal-mask{
+ background-color: rgba(55, 55, 55, 0.2);
+ }
+ .ant-modal-content{
+ box-shadow: none;
}
}
diff --git a/src/routes/app.js b/src/routes/app.js
index 372ed56..ddf2723 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -7,8 +7,8 @@ import Bread from '../components/layout/bread'
import Footer from '../components/layout/footer'
import Sider from '../components/layout/sider'
import styles from '../components/layout/main.less'
-import '../components/layout/common.less'
import {Spin,message} from 'antd'
+import '../components/layout/common.less'
function App({children, location, dispatch, app}) {
const {login, loading, loginButtonLoading, user} = app
diff --git a/src/theme.js b/src/theme.js
index 7c025a3..e71f78e 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -1,7 +1,10 @@
module.exports = () => {
return {
- '@primary-color': '#1DA57A',
- '@link-color': '#1DA57A',
- '@border-radius-base': '2px',
+ '@border-radius-base': '3px',
+ '@border-radius-sm': '2px',
+ '@shadow-color': 'rgba(0,0,0,0.05)',
+ '@shadow-1-down': '4px 4px 40px @shadow-color',
+ '@border-color-split':'#f4f4f4',
+ '@border-color-base':'#e5e5e5',
};
};