Browse Source

fix style error

pull/4293/head
陈帅 7 years ago
parent
commit
4a7320edaa
  1. 54
      src/components/GlobalHeader/index.less
  2. 7
      src/layouts/BasicLayout.tsx

54
src/components/GlobalHeader/index.less

@ -2,14 +2,6 @@
@pro-header-hover-bg: rgba(0, 0, 0, 0.025);
.header {
position: relative;
height: @layout-header-height;
padding: 0;
background: #fff;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
}
.logo {
display: inline-block;
height: @layout-header-height;
@ -100,30 +92,28 @@
}
@media only screen and (max-width: @screen-md) {
.header {
:global(.ant-divider-vertical) {
vertical-align: unset;
}
.name {
display: none;
}
i.trigger {
padding: 22px 12px;
}
.logo {
position: relative;
padding-right: 12px;
padding-left: 12px;
}
.right {
position: absolute;
top: 0;
right: 12px;
background: #fff;
.account {
.avatar {
margin-right: 0;
}
:global(.ant-divider-vertical) {
vertical-align: unset;
}
.name {
display: none;
}
i.trigger {
padding: 22px 12px;
}
.logo {
position: relative;
padding-right: 12px;
padding-left: 12px;
}
.right {
position: absolute;
top: 0;
right: 12px;
background: #fff;
.account {
.avatar {
margin-right: 0;
}
}
}

7
src/layouts/BasicLayout.tsx

@ -1,6 +1,5 @@
import { ConnectState, ConnectProps } from '@/models/connect';
import RightContent from '@/components/GlobalHeader/RightContent';
import { formatMessage } from 'umi-plugin-react/locale';
import { connect } from 'dva';
import React, { useState } from 'react';
import logo from '../assets/logo.svg';
@ -12,6 +11,7 @@ import {
Settings,
SettingDrawer,
} from '@ant-design/pro-layout';
import Link from 'umi/link';
export interface BasicLayoutProps extends BasicLayoutComponentsProps, ConnectProps {
breadcrumbNameMap: { [path: string]: MenuDataItem };
@ -43,7 +43,10 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
<BasicLayoutComponents
logo={logo}
onCollapse={handleMenuCollapse}
rightContentRender={RightProps => <RightContent {...RightProps} />}
menuItemRender={(menuItemProps, defaultDom) => {
return <Link to={menuItemProps.path}>{defaultDom}</Link>;
}}
rightContentRender={rightProps => <RightContent {...rightProps} />}
{...props}
{...settings}
>

Loading…
Cancel
Save