Commit 82bc821b authored by 陈前坚's avatar 陈前坚

perf: style

parent 2e55f28e
...@@ -118,7 +118,8 @@ ...@@ -118,7 +118,8 @@
"sanitize.css": "8.0.0", "sanitize.css": "8.0.0",
"sha1": "^1.1.1", "sha1": "^1.1.1",
"styled-components": "4.2.0", "styled-components": "4.2.0",
"use-merge-value": "^1.0.2" "use-merge-value": "^1.0.2",
"voca": "^1.4.0"
}, },
"devDependencies": { "devDependencies": {
"@ant-design/icons": "^4.0.0", "@ant-design/icons": "^4.0.0",
......
...@@ -12,6 +12,8 @@ import { ConnectedRouter } from 'connected-react-router/immutable'; ...@@ -12,6 +12,8 @@ import { ConnectedRouter } from 'connected-react-router/immutable';
import Immutable from 'immutable'; import Immutable from 'immutable';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { ConfigProvider } from 'antd';
import zhCN from 'antd/es/locale/zh_CN';
import configureStore from './configureStore'; import configureStore from './configureStore';
import App from './containers/App'; import App from './containers/App';
import history from './utils/history'; import history from './utils/history';
...@@ -24,7 +26,9 @@ const render = () => { ...@@ -24,7 +26,9 @@ const render = () => {
ReactDOM.render( ReactDOM.render(
<Provider store={store}> <Provider store={store}>
<ConnectedRouter history={history}> <ConnectedRouter history={history}>
<App /> <ConfigProvider locale={zhCN}>
<App />
</ConfigProvider>
</ConnectedRouter> </ConnectedRouter>
</Provider>, </Provider>,
MOUNT_NODE, MOUNT_NODE,
......
This diff is collapsed.
@media screen and (min-width:1300px){
.hide{
display:none;
}
}
.redText{ .redText{
color: red; color: red;
cursor: pointer; cursor: pointer;
} }
.ant-layout{
overflow: auto;
.ant-layout-content{
margin:12px !important;
}
}
.userManageContainer{ .userManageContainer{
.ant-tree-treenode{ .ant-tree-treenode{
width: 100% !important; width: 100% !important;
...@@ -26,10 +37,9 @@ ...@@ -26,10 +37,9 @@
} }
} }
.contentContainer{ .contentContainer{
min-height: calc(100vh - 78px);
display: flex; display: flex;
.orgContainer{ .orgContainer{
min-height: calc(100vh - 78px); height: calc(100vh - 74px);
float: left; float: left;
padding: 10px; padding: 10px;
min-width: 240px; min-width: 240px;
...@@ -44,17 +54,22 @@ ...@@ -44,17 +54,22 @@
} }
.hide{ .hide{
display: none; display: none;
// width:0;
transition: 1s; transition: 1s;
} }
.userContainer{ .userContainer{
margin-left: 10px; height: calc(100vh - 168px) !important;
flex: 1; flex: 1;
height: calc(100vh - 78px); min-width: 840px;
min-width: 880px;
background: white; background: white;
.ant-table-pagination-right{ .ant-table-pagination{
padding-right: 12px; padding-right: 12px;
background: white;
margin: 1px 0;
padding:8px;
padding-right: 20px;
.ant-pagination-prev,.ant-pagination-next{
line-height: 8px !important;
}
} }
.ant-btn-primary{ .ant-btn-primary{
margin-left: 20px; margin-left: 20px;
...@@ -73,6 +88,32 @@ ...@@ -73,6 +88,32 @@
text-overflow:ellipsis; text-overflow:ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.ant-table-content{
height:calc(100vh - 168px);
border-right: white;
overflow: auto !important;
//滚动条整体部分
&::-webkit-scrollbar {
height: 10px;//x轴滚动条粗细
width:10px;//y轴滚动条粗细
border-bottom: 2px solid white;
}
//滚动条里面的小方块,能上下左右移动(取决于是垂直滚动条还是水平滚动条)
&::-webkit-scrollbar-thumb {
border-radius: 10px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: rgba(74, 74, 75, 0.1);
margin-bottom: 10px;
}
//滚动条的轨道(里面装有thumb)滚动槽
&::-webkit-scrollbar-track {
box-shadow: 0;
border-radius: 0;
background: white;//滚动槽背景色
border-radius: 10px;//滚动条边框半径设置
}
}
} }
} }
} }
......
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