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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
dbd58111
Commit
dbd58111
authored
Jul 13, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix icon alignment; reduce side padding on table cells; add tag and fork icon for pipeline ref
parent
7968484d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
15 deletions
+27
-15
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+23
-14
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+4
-1
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
dbd58111
.pipelines
{
.pipelines
{
.stage
{
.stage
{
max-width
:
8
0px
;
max-width
:
9
0px
;
width
:
8
0px
;
width
:
9
0px
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -30,13 +30,17 @@
...
@@ -30,13 +30,17 @@
}
}
.table.builds
{
.table.builds
{
min-width
:
1
1
00px
;
min-width
:
1
2
00px
;
tr
{
tr
{
th
{
th
{
padding
:
16px
;
padding
:
16px
8px
;
border
:
none
;
border
:
none
;
}
}
td
{
padding
:
10px
8px
;
}
}
}
tbody
{
tbody
{
...
@@ -46,9 +50,8 @@
...
@@ -46,9 +50,8 @@
.branch-commit
{
.branch-commit
{
.branch-name
{
.branch-name
{
margin-left
:
8px
;
font-weight
:
bold
;
font-weight
:
bold
;
max-width
:
1
8
0px
;
max-width
:
1
5
0px
;
overflow
:
hidden
;
overflow
:
hidden
;
display
:
inline-block
;
display
:
inline-block
;
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -57,10 +60,15 @@
...
@@ -57,10 +60,15 @@
}
}
svg
{
svg
{
margin
:
0
6px
;
height
:
14px
;
height
:
14px
;
width
:
auto
;
width
:
auto
;
vertical-align
:
middle
;
vertical-align
:
middle
;
fill
:
$table-text-gray
;
}
.fa
{
font-size
:
12px
;
color
:
$table-text-gray
;
}
}
.commit-id
{
.commit-id
{
...
@@ -88,6 +96,12 @@
...
@@ -88,6 +96,12 @@
}
}
}
}
.icon-container
{
display
:
inline-block
;
text-align
:
center
;
width
:
20px
;
}
.duration
,
.duration
,
.finished-at
{
.finished-at
{
color
:
$table-text-gray
;
color
:
$table-text-gray
;
...
@@ -98,15 +112,10 @@
...
@@ -98,15 +112,10 @@
}
}
svg
{
svg
{
height
:
12px
;
width
:
12px
;
width
:
auto
;
height
:
auto
;
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.fa
,
svg
{
margin-right
:
5px
;
}
}
}
.pipeline-actions
{
.pipeline-actions
{
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
dbd58111
...
@@ -10,8 +10,11 @@
...
@@ -10,8 +10,11 @@
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
%span
##{pipeline.id}
%span
##{pipeline.id}
-
if
pipeline
.
ref
-
if
pipeline
.
ref
.icon-container
=
pipeline
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
custom_icon
(
"icon_commit"
)
.icon-container
=
custom_icon
(
"icon_commit"
)
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
-
if
pipeline
.
tag?
-
if
pipeline
.
tag?
%span
.label.label-primary
tag
%span
.label.label-primary
tag
...
...
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