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
Léo-Paul Géneau
gitlab-ce
Commits
febd3884
Commit
febd3884
authored
Jul 14, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '35035-sidebar-job-spaces' into 'master'
Fix spacing in sidebar Closes #35035 See merge request !12844
parents
6fb712a0
948afa2a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+4
-0
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+4
-4
changelogs/unreleased/35035-sidebar-job-spaces.yml
changelogs/unreleased/35035-sidebar-job-spaces.yml
+4
-0
No files found.
app/assets/stylesheets/pages/builds.scss
View file @
febd3884
...
@@ -244,6 +244,10 @@
...
@@ -244,6 +244,10 @@
}
}
}
}
.block-last
{
padding
:
16px
0
;
}
.trigger-build-variable
{
.trigger-build-variable
{
color
:
$code-color
;
color
:
$code-color
;
}
}
...
...
app/views/projects/jobs/_sidebar.html.haml
View file @
febd3884
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#js-details-block-vue
#js-details-block-vue
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
.block
{
class:
(
"block-first"
if
!
@build
.
coverage
)
}
.block
.title
.title
Job artifacts
Job artifacts
-
if
@build
.
artifacts_expired?
-
if
@build
.
artifacts_expired?
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
Browse
Browse
-
if
@build
.
trigger_request
-
if
@build
.
trigger_request
.build-widget
.build-widget
.block
%h4
.title
%h4
.title
Trigger
Trigger
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
.js-build-variable.trigger-build-variable
=
key
.js-build-variable.trigger-build-variable
=
key
.js-build-value.trigger-build-value
=
value
.js-build-value.trigger-build-value
=
value
.block
%div
{
class:
(
@build
.
pipeline
.
stages_count
>
1
?
"block"
:
"block-last"
)
}
%p
%p
Commit
Commit
=
link_to
@build
.
pipeline
.
short_sha
,
project_commit_path
(
@project
,
@build
.
pipeline
.
sha
),
class:
'commit-sha link-commit'
=
link_to
@build
.
pipeline
.
short_sha
,
project_commit_path
(
@project
,
@build
.
pipeline
.
sha
),
class:
'commit-sha link-commit'
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
-
if
@build
.
pipeline
.
stages_count
>
1
-
if
@build
.
pipeline
.
stages_count
>
1
.dropdown.build-dropdown
.dropdown.build-dropdown
.title
%div
%span
{
class:
"ci-status-icon-#{@build.pipeline.status}"
}
%span
{
class:
"ci-status-icon-#{@build.pipeline.status}"
}
=
ci_icon_for_status
(
@build
.
pipeline
.
status
)
=
ci_icon_for_status
(
@build
.
pipeline
.
status
)
Pipeline
Pipeline
...
...
changelogs/unreleased/35035-sidebar-job-spaces.yml
0 → 100644
View file @
febd3884
---
title
:
Fix vertical space in job details sidebar
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