From 6e0163ad13d1380d40c9e48e290a8e74a9580767 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 7 Nov 2018 11:57:51 +0800 Subject: [PATCH] upgrade heading font and fix light menu hightlight border --- src/components/SiderMenu/SiderMenu.js | 2 +- src/components/SiderMenu/index.less | 2 +- src/layouts/UserLayout.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js index 2d366b9b..e457f2f5 100644 --- a/src/components/SiderMenu/SiderMenu.js +++ b/src/components/SiderMenu/SiderMenu.js @@ -118,7 +118,7 @@ export default class SiderMenu extends PureComponent { mode="inline" handleOpenChange={this.handleOpenChange} onOpenChange={this.handleOpenChange} - style={{ padding: '16px 0', width: '100%', overflowX: 'hidden' }} + style={{ padding: '16px 0', width: '100%' }} {...defaultProps} /> diff --git a/src/components/SiderMenu/index.less b/src/components/SiderMenu/index.less index 06d5f6ab..7ffba1b1 100644 --- a/src/components/SiderMenu/index.less +++ b/src/components/SiderMenu/index.less @@ -21,7 +21,7 @@ vertical-align: middle; font-size: 20px; margin: 0 0 0 12px; - font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif; + font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; font-weight: 600; } } diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index d4ac3861..0e1ff2f0 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -57,7 +57,7 @@ .title { font-size: 33px; color: @heading-color; - font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif; + font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; font-weight: 600; position: relative; top: 2px; -- GitLab