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
P
pro-blocks
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
pro-blocks
Commits
74b4f30f
Commit
74b4f30f
authored
Dec 26, 2017
by
afc163
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pageHeader responsive issue
parent
2885fa95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
30 deletions
+25
-30
src/routes/Dashboard/Workplace.js
src/routes/Dashboard/Workplace.js
+6
-6
src/routes/Dashboard/Workplace.less
src/routes/Dashboard/Workplace.less
+19
-24
No files found.
src/routes/Dashboard/Workplace.js
View file @
74b4f30f
...
@@ -148,17 +148,17 @@ export default class Workplace extends PureComponent {
...
@@ -148,17 +148,17 @@ export default class Workplace extends PureComponent {
<
/div
>
<
/div
>
);
);
const
pageHeaderExtra
=
(
const
extraContent
=
(
<
div
className
=
{
styles
.
pageHeaderExtra
}
>
<
div
className
=
{
styles
.
extraContent
}
>
<
div
>
<
div
className
=
{
styles
.
statItem
}
>
<
p
>
项目数
<
/p
>
<
p
>
项目数
<
/p
>
<
p
>
56
<
/p
>
<
p
>
56
<
/p
>
<
/div
>
<
/div
>
<
div
>
<
div
className
=
{
styles
.
statItem
}
>
<
p
>
团队内排名
<
/p
>
<
p
>
团队内排名
<
/p
>
<
p
>
8
<
span
>
/ 24</
span
><
/p
>
<
p
>
8
<
span
>
/ 24</
span
><
/p
>
<
/div
>
<
/div
>
<
div
>
<
div
className
=
{
styles
.
statItem
}
>
<
p
>
项目访问
<
/p
>
<
p
>
项目访问
<
/p
>
<
p
>
2
,
223
<
/p
>
<
p
>
2
,
223
<
/p
>
<
/div
>
<
/div
>
...
@@ -168,7 +168,7 @@ export default class Workplace extends PureComponent {
...
@@ -168,7 +168,7 @@ export default class Workplace extends PureComponent {
return
(
return
(
<
PageHeaderLayout
<
PageHeaderLayout
content
=
{
pageHeaderContent
}
content
=
{
pageHeaderContent
}
extraContent
=
{
pageHeaderExtra
}
extraContent
=
{
extraContent
}
>
>
<
Row
gutter
=
{
24
}
>
<
Row
gutter
=
{
24
}
>
<
Col
xl
=
{
16
}
lg
=
{
24
}
md
=
{
24
}
sm
=
{
24
}
xs
=
{
24
}
>
<
Col
xl
=
{
16
}
lg
=
{
24
}
md
=
{
24
}
sm
=
{
24
}
xs
=
{
24
}
>
...
...
src/routes/Dashboard/Workplace.less
View file @
74b4f30f
...
@@ -40,25 +40,26 @@
...
@@ -40,25 +40,26 @@
}
}
}
}
.
pageHeaderExtra
{
.
extraContent
{
.clearfix();
.clearfix();
float: right;
float: right;
& > div {
white-space: nowrap;
.statItem {
padding: 0 32px;
padding: 0 32px;
position: relative;
position: relative;
float: left
;
display: inline-block
;
&
> p:first-child {
> p:first-child {
color: @text-color-secondary;
color: @text-color-secondary;
font-size: @font-size-base;
font-size: @font-size-base;
line-height: 22px;
line-height: 22px;
margin-bottom: 4px;
margin-bottom: 4px;
}
}
&
> p {
> p {
color: @heading-color;
color: @heading-color;
font-size: 30px;
font-size: 30px;
line-height: 38px;
line-height: 38px;
margin: 0;
margin: 0;
&
> span {
> span {
color: @text-color-secondary;
color: @text-color-secondary;
font-size: 20px;
font-size: 20px;
}
}
...
@@ -72,11 +73,11 @@
...
@@ -72,11 +73,11 @@
height: 40px;
height: 40px;
content: '';
content: '';
}
}
}
&:last-child {
& > div:last-child {
padding-right: 0;
padding-right: 0;
&:after {
&:after {
display: none;
display: none;
}
}
}
}
}
}
}
...
@@ -163,12 +164,6 @@
...
@@ -163,12 +164,6 @@
color: @disabled-color;
color: @disabled-color;
}
}
@media screen and (min-width: @screen-xl) {
.pageHeaderExtra {
min-width: 345px;
}
}
@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
.activeCard {
.activeCard {
margin-bottom: 24px;
margin-bottom: 24px;
...
@@ -176,9 +171,9 @@
...
@@ -176,9 +171,9 @@
.members {
.members {
margin-bottom: 0;
margin-bottom: 0;
}
}
.
pageHeaderExtra
{
.
extraContent
{
margin-left: -44px;
margin-left: -44px;
& > div
{
.statItem
{
padding: 0 16px;
padding: 0 16px;
}
}
}
}
...
@@ -191,10 +186,10 @@
...
@@ -191,10 +186,10 @@
.members {
.members {
margin-bottom: 0;
margin-bottom: 0;
}
}
.
pageHeaderExtra
{
.
extraContent
{
float: none;
float: none;
margin-right: 0;
margin-right: 0;
& > div
{
.statItem
{
padding: 0 16px;
padding: 0 16px;
text-align: left;
text-align: left;
&:after {
&:after {
...
@@ -205,7 +200,7 @@
...
@@ -205,7 +200,7 @@
}
}
@media screen and (max-width: @screen-md) {
@media screen and (max-width: @screen-md) {
.
pageHeaderExtra
{
.
extraContent
{
margin-left: -16px;
margin-left: -16px;
}
}
.projectList {
.projectList {
...
@@ -222,8 +217,8 @@
...
@@ -222,8 +217,8 @@
margin-left: 0;
margin-left: 0;
}
}
}
}
.
pageHeaderExtra
{
.
extraContent
{
& > div
{
.statItem
{
float: none;
float: none;
}
}
}
}
...
...
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