Commit eb9881d6 authored by afc163's avatar afc163

update layout to new design

parent 9a3d41cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
"font-size-base": "14px", "font-size-base": "14px",
"badge-font-size": "12px", "badge-font-size": "12px",
"btn-font-size-lg": "@font-size-base", "btn-font-size-lg": "@font-size-base",
"@menu-dark-bg": "#000B14",
"@menu-dark-submenu-bg": "#00182E",
"@layout-sider-background": "#000B14",
"layout-body-background": "#f5f5f5" "layout-body-background": "#f5f5f5"
} }
} }
export const imgMap = { export const imgMap = {
user: 'https://gw.alipayobjects.com/zos/rmsportal/YdMCpIJULitXfqHCFPbF.png', user: 'https://gw.alipayobjects.com/zos/rmsportal/UjusLxePxWGkttaqqmUI.png',
a: 'https://gw.alipayobjects.com/zos/rmsportal/ZrkcSjizAKNWwJTwcadT.png', a: 'https://gw.alipayobjects.com/zos/rmsportal/ZrkcSjizAKNWwJTwcadT.png',
b: 'https://gw.alipayobjects.com/zos/rmsportal/KYlwHMeomKQbhJDRUVvt.png', b: 'https://gw.alipayobjects.com/zos/rmsportal/KYlwHMeomKQbhJDRUVvt.png',
c: 'https://gw.alipayobjects.com/zos/rmsportal/gabvleTstEvzkbQRfjxu.png', c: 'https://gw.alipayobjects.com/zos/rmsportal/gabvleTstEvzkbQRfjxu.png',
......
@import "~antd/lib/style/themes/default.less";
.input { .input {
transition: all .3s; transition: all .3s;
width: 0; width: 0;
...@@ -10,15 +12,12 @@ ...@@ -10,15 +12,12 @@
border: 0; border: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
color: #fff; box-shadow: none !important;
&::placeholder {
color: rgba(255, 255, 255, .5);
}
} }
&, &,
&:hover, &:hover,
&:focus { &:focus {
border-bottom: 1px solid #fff; border-bottom: 1px solid @border-color-base;
} }
&.show { &.show {
width: 210px; width: 210px;
......
...@@ -66,10 +66,12 @@ class BasicLayout extends React.PureComponent { ...@@ -66,10 +66,12 @@ class BasicLayout extends React.PureComponent {
return ( return (
<SubMenu <SubMenu
title={ title={
<span> item.icon ? (
<Icon type={item.icon} /> <span>
<span>{item.name}</span> <Icon type={item.icon} />
</span> <span>{item.name}</span>
</span>
) : item.name
} }
key={item.key || item.path} key={item.key || item.path}
> >
...@@ -80,7 +82,7 @@ class BasicLayout extends React.PureComponent { ...@@ -80,7 +82,7 @@ class BasicLayout extends React.PureComponent {
return ( return (
<Menu.Item key={item.key || item.path}> <Menu.Item key={item.key || item.path}>
<Link to={itemPath}> <Link to={itemPath}>
<Icon type={item.icon} /> {item.icon && <Icon type={item.icon} />}
<span>{item.name}</span> <span>{item.name}</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
......
@import "~antd/lib/style/themes/default.less"; @import "~antd/lib/style/themes/default.less";
.header { .header {
background: @primary-color;
padding: 0 16px 0 0; padding: 0 16px 0 0;
color: #fff; background: #fff;
border-bottom: 1px solid @border-color-split;
} }
.logo { .logo {
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
line-height: 64px; line-height: 64px;
padding-left: 32px; padding-left: 32px;
transition: all .3s; transition: all .3s;
background: @primary-color; background: #00284D;
overflow: hidden; overflow: hidden;
img { img {
display: inline-block; display: inline-block;
...@@ -42,10 +42,9 @@ ...@@ -42,10 +42,9 @@
line-height: 64px; line-height: 64px;
cursor: pointer; cursor: pointer;
transition: all .3s; transition: all .3s;
color: #fff;
padding: 0 28px; padding: 0 28px;
&:hover { &:hover {
background: @primary-7; background: rgba(0, 0, 0, .04);
} }
} }
...@@ -64,7 +63,7 @@ ...@@ -64,7 +63,7 @@
} }
&:global(.ant-popover-open), &:global(.ant-popover-open),
&:hover { &:hover {
background: @primary-7; background: rgba(0, 0, 0, .04);
} }
} }
.search:hover { .search:hover {
......
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