diff --git a/.roadhogrc b/.roadhogrc index b693be04f25041b9fb1d1ee2d5b64e3533f90b22..c039a47c810b9030d47884ab56a09525b411e94f 100755 --- a/.roadhogrc +++ b/.roadhogrc @@ -21,6 +21,9 @@ "font-size-base": "14px", "badge-font-size": "12px", "btn-font-size-lg": "@font-size-base", + "@menu-dark-bg": "#000B14", + "@menu-dark-submenu-bg": "#00182E", + "@layout-sider-background": "#000B14", "layout-body-background": "#f5f5f5" } } diff --git a/mock/utils.js b/mock/utils.js index 6e1c72fe988b0a84581c76737512cdfedbe53cbd..229e69b830b7f0bf710b6dd5717ad7968694bfdd 100644 --- a/mock/utils.js +++ b/mock/utils.js @@ -1,5 +1,5 @@ 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', b: 'https://gw.alipayobjects.com/zos/rmsportal/KYlwHMeomKQbhJDRUVvt.png', c: 'https://gw.alipayobjects.com/zos/rmsportal/gabvleTstEvzkbQRfjxu.png', diff --git a/src/components/HeaderSearch/index.less b/src/components/HeaderSearch/index.less index 115387460e8e65340d8d22a4a4b0d9fccc29543a..52e58ca939362876f05d0310b998ec581c81c609 100644 --- a/src/components/HeaderSearch/index.less +++ b/src/components/HeaderSearch/index.less @@ -1,3 +1,5 @@ +@import "~antd/lib/style/themes/default.less"; + .input { transition: all .3s; width: 0; @@ -10,15 +12,12 @@ border: 0; padding-left: 0; padding-right: 0; - color: #fff; - &::placeholder { - color: rgba(255, 255, 255, .5); - } + box-shadow: none !important; } &, &:hover, &:focus { - border-bottom: 1px solid #fff; + border-bottom: 1px solid @border-color-base; } &.show { width: 210px; diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 8b5ce7100fc2546815a4d3187871556e581d6ef1..2a6e63fd2fc797f9474412a16f148f2e79efcbe1 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -66,10 +66,12 @@ class BasicLayout extends React.PureComponent { return ( - - {item.name} - + item.icon ? ( + + + {item.name} + + ) : item.name } key={item.key || item.path} > @@ -80,7 +82,7 @@ class BasicLayout extends React.PureComponent { return ( - + {item.icon && } {item.name} diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less index 7cc6fb07d075c6de71d304ee2b2b7eaf6b91e57e..0fb8e8f6a78cb54d4f6225cc0ec096a08a5ee843 100644 --- a/src/layouts/BasicLayout.less +++ b/src/layouts/BasicLayout.less @@ -1,9 +1,9 @@ @import "~antd/lib/style/themes/default.less"; .header { - background: @primary-color; padding: 0 16px 0 0; - color: #fff; + background: #fff; + border-bottom: 1px solid @border-color-split; } .logo { @@ -12,7 +12,7 @@ line-height: 64px; padding-left: 32px; transition: all .3s; - background: @primary-color; + background: #00284D; overflow: hidden; img { display: inline-block; @@ -42,10 +42,9 @@ line-height: 64px; cursor: pointer; transition: all .3s; - color: #fff; padding: 0 28px; &:hover { - background: @primary-7; + background: rgba(0, 0, 0, .04); } } @@ -64,7 +63,7 @@ } &:global(.ant-popover-open), &:hover { - background: @primary-7; + background: rgba(0, 0, 0, .04); } } .search:hover {