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
904ca0ae
Commit
904ca0ae
authored
Jun 09, 2018
by
ιεΈ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix#1640 Floating Component Style Issues
parent
1d8293a6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
src/components/GlobalHeader/index.less
src/components/GlobalHeader/index.less
+0
-7
src/components/SiderMenu/SliderMenu.js
src/components/SiderMenu/SliderMenu.js
+4
-2
src/components/SiderMenu/index.less
src/components/SiderMenu/index.less
+5
-0
src/layouts/BasicLayout.js
src/layouts/BasicLayout.js
+2
-2
No files found.
src/components/GlobalHeader/index.less
View file @
904ca0ae
...
@@ -8,13 +8,6 @@
...
@@ -8,13 +8,6 @@
position: relative;
position: relative;
}
}
:global {
.ant-layout {
min-height: 100vh;
overflow-x: hidden;
}
}
.logo {
.logo {
height: 64px;
height: 64px;
line-height: 58px;
line-height: 58px;
...
...
src/components/SiderMenu/SliderMenu.js
View file @
904ca0ae
...
@@ -220,7 +220,7 @@ export default class SiderMenu extends PureComponent {
...
@@ -220,7 +220,7 @@ export default class SiderMenu extends PureComponent {
});
});
};
};
render
()
{
render
()
{
const
{
logo
,
collapsed
,
onCollapse
,
theme
}
=
this
.
props
;
const
{
logo
,
collapsed
,
onCollapse
,
fixSiderbar
,
theme
}
=
this
.
props
;
const
{
openKeys
}
=
this
.
state
;
const
{
openKeys
}
=
this
.
state
;
const
defaultProps
=
collapsed
?
{}
:
{
openKeys
};
const
defaultProps
=
collapsed
?
{}
:
{
openKeys
};
return
(
return
(
...
@@ -231,7 +231,9 @@ export default class SiderMenu extends PureComponent {
...
@@ -231,7 +231,9 @@ export default class SiderMenu extends PureComponent {
breakpoint
=
"
lg
"
breakpoint
=
"
lg
"
onCollapse
=
{
onCollapse
}
onCollapse
=
{
onCollapse
}
width
=
{
256
}
width
=
{
256
}
className
=
{
`
${
styles
.
sider
}
${
theme
===
'
light
'
?
styles
.
light
:
''
}
`
}
className
=
{
`
${
styles
.
sider
}
${
fixSiderbar
?
styles
.
fixSiderbar
:
''
}
${
theme
===
'
light
'
?
styles
.
light
:
''
}
`
}
>
>
<
div
className
=
{
styles
.
logo
}
key
=
"
logo
"
id
=
"
logo
"
>
<
div
className
=
{
styles
.
logo
}
key
=
"
logo
"
id
=
"
logo
"
>
<
Link
to
=
"
/
"
>
<
Link
to
=
"
/
"
>
...
...
src/components/SiderMenu/index.less
View file @
904ca0ae
...
@@ -29,6 +29,11 @@
...
@@ -29,6 +29,11 @@
box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
position: relative;
position: relative;
z-index: 10;
z-index: 10;
&.fixSiderbar {
position: fixed;
top: 0;
left: 0;
}
&.light {
&.light {
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
background-color: white;
background-color: white;
...
...
src/layouts/BasicLayout.js
View file @
904ca0ae
...
@@ -84,10 +84,10 @@ class BasicLayout extends React.PureComponent {
...
@@ -84,10 +84,10 @@ class BasicLayout extends React.PureComponent {
return
title
;
return
title
;
}
}
getLayoutStyle
=
()
=>
{
getLayoutStyle
=
()
=>
{
const
{
fixSiderbar
}
=
this
.
props
;
const
{
fixSiderbar
,
collapsed
}
=
this
.
props
;
if
(
fixSiderbar
)
{
if
(
fixSiderbar
)
{
return
{
return
{
height
:
'
100vh
'
,
paddingLeft
:
collapsed
?
'
80px
'
:
'
256px
'
,
};
};
}
}
return
null
;
return
null
;
...
...
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