Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
63b49c3c
Commit
63b49c3c
authored
May 10, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '30949-empty-states' into 'master'
Center all empty states Closes #30949 See merge request !11249
parents
f6d82455
343e37b8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
28 deletions
+13
-28
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+3
-18
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-4
app/views/shared/empty_states/_issues.html.haml
app/views/shared/empty_states/_issues.html.haml
+2
-2
app/views/shared/empty_states/_labels.html.haml
app/views/shared/empty_states/_labels.html.haml
+2
-2
app/views/shared/empty_states/_merge_requests.html.haml
app/views/shared/empty_states/_merge_requests.html.haml
+2
-2
changelogs/unreleased/30949-empty-states.yml
changelogs/unreleased/30949-empty-states.yml
+4
-0
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
63b49c3c
...
@@ -312,7 +312,7 @@
...
@@ -312,7 +312,7 @@
}
}
.empty-state
{
.empty-state
{
margin
:
100px
0
0
;
margin
:
5%
auto
0
;
.text-content
{
.text-content
{
max-width
:
460px
;
max-width
:
460px
;
...
@@ -335,27 +335,12 @@
...
@@ -335,27 +335,12 @@
}
}
.btn
{
.btn
{
margin
:
$btn-side-margin
$btn-side-margin
0
0
;
margin
:
$btn-side-margin
5px
;
}
@media
(
max-width
:
$screen-xs-max
)
{
margin-top
:
50px
;
text-align
:
center
;
.btn
{
@media
(
max-width
:
$screen-xs-max
)
{
width
:
100%
;
width
:
100%
;
}
}
}
}
@media
(
min-width
:
$screen-xs-max
)
{
&
.merge-requests
.text-content
{
margin-top
:
40px
;
}
&
.labels
.text-content
{
margin-top
:
70px
;
}
}
}
}
.flex-container-block
{
.flex-container-block
{
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
63b49c3c
...
@@ -8,10 +8,6 @@
...
@@ -8,10 +8,6 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.empty-state
{
margin
:
5%
auto
0
;
}
.table-holder
{
.table-holder
{
width
:
100%
;
width
:
100%
;
...
...
app/views/shared/empty_states/_issues.html.haml
View file @
63b49c3c
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
-
has_button
=
button_path
||
project_select_button
-
has_button
=
button_path
||
project_select_button
.row.empty-state
.row.empty-state
.
pull-right.col-xs-12
{
class:
"#{'col-sm-6' if has_button}"
}
.
col-xs-12
.svg-content
.svg-content
=
render
'shared/empty_states/icons/issues.svg'
=
render
'shared/empty_states/icons/issues.svg'
.col-xs-12
{
class:
"#{'col-sm-6' if has_button}"
}
.col-xs-12
.text-center
.text-content
.text-content
-
if
has_button
&&
current_user
-
if
has_button
&&
current_user
%h4
%h4
...
...
app/views/shared/empty_states/_labels.html.haml
View file @
63b49c3c
.row.empty-state.labels
.row.empty-state.labels
.
pull-right.col-xs-12.col-sm-6
.
col-xs-12
.svg-content
.svg-content
=
render
'shared/empty_states/icons/labels.svg'
=
render
'shared/empty_states/icons/labels.svg'
.col-xs-12.
col-sm-6
.col-xs-12.
text-center
.text-content
.text-content
%h4
Labels can be applied to issues and merge requests to categorize them.
%h4
Labels can be applied to issues and merge requests to categorize them.
%p
You can also star a label to make it a priority label.
%p
You can also star a label to make it a priority label.
...
...
app/views/shared/empty_states/_merge_requests.html.haml
View file @
63b49c3c
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
-
has_button
=
button_path
||
project_select_button
-
has_button
=
button_path
||
project_select_button
.row.empty-state.merge-requests
.row.empty-state.merge-requests
.col-xs-12
{
class:
"#{'col-sm-6 pull-right' if has_button}"
}
.col-xs-12
.svg-content
.svg-content
=
render
'shared/empty_states/icons/merge_requests.svg'
=
render
'shared/empty_states/icons/merge_requests.svg'
.col-xs-12
{
class:
"#{'col-sm-6' if has_button}"
}
.col-xs-12
.text-center
.text-content
.text-content
-
if
has_button
-
if
has_button
%h4
%h4
...
...
changelogs/unreleased/30949-empty-states.yml
0 → 100644
View file @
63b49c3c
---
title
:
Center all empty states
merge_request
:
author
:
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