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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0ae8dc9d
Commit
0ae8dc9d
authored
Nov 21, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix blank states using old css
parent
f562e69e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
27 deletions
+46
-27
app/assets/javascripts/environments/components/environment.vue
...ssets/javascripts/environments/components/environment.vue
+19
-17
app/assets/javascripts/pipelines/components/pipelines.vue
app/assets/javascripts/pipelines/components/pipelines.vue
+4
-2
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+9
-0
app/views/projects/environments/show.html.haml
app/views/projects/environments/show.html.haml
+9
-8
changelogs/unreleased/40377-blank-states.yml
changelogs/unreleased/40377-blank-states.yml
+5
-0
No files found.
app/assets/javascripts/environments/components/environment.vue
View file @
0ae8dc9d
...
@@ -227,25 +227,27 @@ export default {
...
@@ -227,25 +227,27 @@ export default {
/>
/>
<div
<div
class=
"blank-state
blank-state-no-icon
"
class=
"blank-state
-row
"
v-if=
"!isLoading && state.environments.length === 0"
>
v-if=
"!isLoading && state.environments.length === 0"
>
<h2
class=
"blank-state-title js-blank-state-title"
>
<div
class=
"blank-state-center"
>
You don't have any environments right now.
<h2
class=
"blank-state-title js-blank-state-title"
>
</h2>
You don't have any environments right now.
<p
class=
"blank-state-text"
>
</h2>
Environments are places where code gets deployed, such as staging or production.
<p
class=
"blank-state-text"
>
<br
/>
Environments are places where code gets deployed, such as staging or production.
<a
:href=
"helpPagePath"
>
<br
/>
Read more about environments
<a
:href=
"helpPagePath"
>
Read more about environments
</a>
</p>
<a
v-if=
"canCreateEnvironmentParsed"
:href=
"newEnvironmentPath"
class=
"btn btn-create js-new-environment-button"
>
New environment
</a>
</a>
</p>
</div>
<a
v-if=
"canCreateEnvironmentParsed"
:href=
"newEnvironmentPath"
class=
"btn btn-create js-new-environment-button"
>
New environment
</a>
</div>
</div>
<div
<div
...
...
app/assets/javascripts/pipelines/components/pipelines.vue
View file @
0ae8dc9d
...
@@ -267,9 +267,11 @@
...
@@ -267,9 +267,11 @@
/>
/>
<div
<div
class=
"blank-state
blank-state-no-icon
"
class=
"blank-state
-row
"
v-if=
"shouldRenderNoPipelinesMessage"
>
v-if=
"shouldRenderNoPipelinesMessage"
>
<h2
class=
"blank-state-title js-blank-state-title"
>
No pipelines to show.
</h2>
<div
class=
"blank-state-center"
>
<h2
class=
"blank-state-title js-blank-state-title"
>
No pipelines to show.
</h2>
</div>
</div>
</div>
<div
<div
...
...
app/assets/stylesheets/framework/blank.scss
View file @
0ae8dc9d
...
@@ -56,6 +56,12 @@
...
@@ -56,6 +56,12 @@
}
}
}
}
.blank-state-center
{
padding-top
:
20px
;
padding-bottom
:
20px
;
text-align
:
center
;
}
.blank-state
{
.blank-state
{
padding
:
20px
;
padding
:
20px
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
...
@@ -66,7 +72,10 @@
...
@@ -66,7 +72,10 @@
align-items
:
center
;
align-items
:
center
;
padding
:
50px
30px
;
padding
:
50px
30px
;
}
}
}
.blank-state
,
.blank-state-center
{
.blank-state-icon
{
.blank-state-icon
{
svg
{
svg
{
display
:
block
;
display
:
block
;
...
...
app/views/projects/environments/show.html.haml
View file @
0ae8dc9d
...
@@ -19,14 +19,15 @@
...
@@ -19,14 +19,15 @@
.environments-container
.environments-container
-
if
@deployments
.
blank?
-
if
@deployments
.
blank?
.blank-state.blank-state-no-icon
.blank-state-row
%h2
.blank-state-title
.blank-state-center
You don't have any deployments right now.
%h2
.blank-state-title
%p
.blank-state-text
You don't have any deployments right now.
Define environments in the deploy stage(s) in
%p
.blank-state-text
%code
.gitlab-ci.yml
Define environments in the deploy stage(s) in
to track deployments here.
%code
.gitlab-ci.yml
=
link_to
"Read more"
,
help_page_path
(
"ci/environments"
),
class:
"btn btn-success"
to track deployments here.
=
link_to
"Read more"
,
help_page_path
(
"ci/environments"
),
class:
"btn btn-success"
-
else
-
else
.table-holder
.table-holder
.ci-table.environments
{
role:
'grid'
}
.ci-table.environments
{
role:
'grid'
}
...
...
changelogs/unreleased/40377-blank-states.yml
0 → 100644
View file @
0ae8dc9d
---
title
:
Fix blank states using old css
merge_request
:
author
:
type
:
fixed
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