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
fcb82e83
Commit
fcb82e83
authored
Mar 04, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1589-deploy-board-css-fix' into 'master'
Improve CSS to handle not having actions See merge request !1336
parents
0643a0fd
8f838b46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/assets/javascripts/environments/components/deploy_board_component.js.es6
...pts/environments/components/deploy_board_component.js.es6
+1
-1
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+4
-2
No files found.
app/assets/javascripts/environments/components/deploy_board_component.js.es6
View file @
fcb82e83
...
...
@@ -155,7 +155,7 @@ module.exports = {
</div>
</section>
<section class="deploy-board-actions">
<section class="deploy-board-actions"
v-if="deployBoardData.rollback_url || deployBoardData.abort_url"
>
<a class="btn"
data-method="post"
rel="nofollow"
...
...
app/assets/stylesheets/pages/environments.scss
View file @
fcb82e83
...
...
@@ -158,7 +158,7 @@
width
:
70px
;
flex-wrap
:
wrap
;
justify-content
:
center
;
margin
:
20px
0
20px
10
px
;
margin
:
20px
0
20px
5
px
;
>
span
{
text-align
:
center
;
...
...
@@ -175,7 +175,7 @@
.deploy-board-instances
{
order
:
2
;
width
:
75%
;
margin-left
:
20px
;
.text
{
color
:
$gl-text-color-secondary
;
...
...
@@ -193,6 +193,8 @@
.deploy-board-actions
{
order
:
3
;
align-self
:
center
;
min-width
:
150px
;
margin-left
:
10px
;
}
&
.deploy-board-error-message
{
...
...
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