Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ant-design-pro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
ant-design-pro
Commits
b0567ad9
Commit
b0567ad9
authored
Aug 31, 2018
by
ιεΈ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the problem that the icon becomes a block element
parent
6180e59c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
src/components/GlobalHeader/index.js
src/components/GlobalHeader/index.js
+4
-5
src/components/GlobalHeader/index.less
src/components/GlobalHeader/index.less
+2
-3
src/components/TopNavHeader/index.js
src/components/TopNavHeader/index.js
+0
-1
No files found.
src/components/GlobalHeader/index.js
View file @
b0567ad9
import
React
,
{
PureComponent
}
from
'
react
'
;
import
React
,
{
PureComponent
}
from
'
react
'
;
import
{
Icon
,
Divider
}
from
'
antd
'
;
import
{
Icon
}
from
'
antd
'
;
import
Link
from
'
umi/link
'
;
import
Link
from
'
umi/link
'
;
import
Debounce
from
'
lodash-decorators/debounce
'
;
import
Debounce
from
'
lodash-decorators/debounce
'
;
import
styles
from
'
./index.less
'
;
import
styles
from
'
./index.less
'
;
...
@@ -26,12 +26,11 @@ export default class GlobalHeader extends PureComponent {
...
@@ -26,12 +26,11 @@ export default class GlobalHeader extends PureComponent {
const
{
collapsed
,
isMobile
,
logo
}
=
this
.
props
;
const
{
collapsed
,
isMobile
,
logo
}
=
this
.
props
;
return
(
return
(
<
div
className
=
{
styles
.
header
}
>
<
div
className
=
{
styles
.
header
}
>
{
isMobile
&&
[
{
isMobile
&&
(
<
Link
to
=
"
/
"
className
=
{
styles
.
logo
}
key
=
"
logo
"
>
<
Link
to
=
"
/
"
className
=
{
styles
.
logo
}
key
=
"
logo
"
>
<
img
src
=
{
logo
}
alt
=
"
logo
"
width
=
"
32
"
/>
<
img
src
=
{
logo
}
alt
=
"
logo
"
width
=
"
32
"
/>
<
/Link>
,
<
/Link
>
<
Divider
type
=
"
vertical
"
key
=
"
line
"
/>
,
)}
]}
<
Icon
<
Icon
className
=
{
styles
.
trigger
}
className
=
{
styles
.
trigger
}
type
=
{
collapsed
?
'
menu-unfold
'
:
'
menu-fold
'
}
type
=
{
collapsed
?
'
menu-unfold
'
:
'
menu-fold
'
}
...
...
src/components/GlobalHeader/index.less
View file @
b0567ad9
...
@@ -36,7 +36,7 @@ i.trigger {
...
@@ -36,7 +36,7 @@ i.trigger {
line-height: 64px;
line-height: 64px;
cursor: pointer;
cursor: pointer;
transition: all 0.3s, padding 0s;
transition: all 0.3s, padding 0s;
padding:
0
24px;
padding: 24px;
&:hover {
&:hover {
background: @primary-1;
background: @primary-1;
}
}
...
@@ -45,7 +45,6 @@ i.trigger {
...
@@ -45,7 +45,6 @@ i.trigger {
.right {
.right {
float: right;
float: right;
height: 100%;
height: 100%;
width: 324px;
.action {
.action {
cursor: pointer;
cursor: pointer;
padding: 0 12px;
padding: 0 12px;
...
@@ -106,7 +105,7 @@ i.trigger {
...
@@ -106,7 +105,7 @@ i.trigger {
display: none;
display: none;
}
}
i.trigger {
i.trigger {
padding:
0
12px;
padding:
24px
12px;
}
}
.logo {
.logo {
padding-right: 12px;
padding-right: 12px;
...
...
src/components/TopNavHeader/index.js
View file @
b0567ad9
...
@@ -39,7 +39,6 @@ export default class TopNavHeader extends PureComponent {
...
@@ -39,7 +39,6 @@ export default class TopNavHeader extends PureComponent {
<
/div
>
<
/div
>
<
div
<
div
style
=
{{
style
=
{{
flex
:
1
,
maxWidth
,
maxWidth
,
}}
}}
>
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment