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
65e482e7
Commit
65e482e7
authored
8 years ago
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change size of pipeline status icons and dropdowns
parent
ff0f70c0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
21 deletions
+41
-21
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+31
-16
app/views/projects/ci/builds/_build_pipeline.html.haml
app/views/projects/ci/builds/_build_pipeline.html.haml
+4
-2
app/views/projects/commit/_pipeline_status_group.html.haml
app/views/projects/commit/_pipeline_status_group.html.haml
+2
-1
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
...commit_statuses/_generic_commit_status_pipeline.html.haml
+4
-2
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
65e482e7
...
@@ -331,9 +331,9 @@
...
@@ -331,9 +331,9 @@
}
}
.stage-name
{
.stage-name
{
margin
-bottom
:
15
px
;
margin
:
0
0
15px
10
px
;
font-weight
:
bold
;
font-weight
:
bold
;
width
:
1
50
px
;
width
:
1
76
px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
@@ -364,12 +364,17 @@
...
@@ -364,12 +364,17 @@
.build-content
{
.build-content
{
width
:
164px
;
width
:
164px
;
white-space
:
nowrap
;
overflow
:
hidden
;
.ci-status-icon
{
text-overflow
:
ellipsis
;
svg
{
height
:
20px
;
width
:
20px
;
}
}
.ci-status-text
{
.ci-status-text
{
width
:
1
10
px
;
width
:
1
35
px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
@@ -397,27 +402,37 @@
...
@@ -397,27 +402,37 @@
color
:
$layout-link-gray
;
color
:
$layout-link-gray
;
.ci-status-text
{
.ci-status-text
{
width
:
80
px
;
width
:
112
px
;
}
}
}
}
.grouped-pipeline-dropdown
{
.grouped-pipeline-dropdown
{
padding
:
8px
0
;
padding
:
8px
0
;
width
:
200
px
;
width
:
168
px
;
left
:
auto
;
left
:
auto
;
right
:
-
214
px
;
right
:
-
180
px
;
top
:
-9px
;
top
:
-9px
;
max-height
:
245px
;
max-height
:
245px
;
overflow-y
:
scroll
;
overflow-y
:
scroll
;
a
:hover
{
a
{
padding
:
7px
8px
;
margin
:
0
8px
;
&
:hover
{
.ci-status-text
{
.ci-status-text
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
}
}
}
svg
{
width
:
14px
;
height
:
14px
;
}
.ci-status-text
{
.ci-status-text
{
width
:
1
45
px
;
width
:
1
12
px
;
}
}
.arrow
{
.arrow
{
...
@@ -482,7 +497,7 @@
...
@@ -482,7 +497,7 @@
position
:
absolute
;
position
:
absolute
;
border-bottom
:
2px
solid
$border-color
;
border-bottom
:
2px
solid
$border-color
;
width
:
25px
;
width
:
25px
;
height
:
6
5
px
;
height
:
6
9
px
;
}
}
// Right connecting curves
// Right connecting curves
...
@@ -504,7 +519,7 @@
...
@@ -504,7 +519,7 @@
&
:nth-child
(
2
)
{
&
:nth-child
(
2
)
{
&
:
:
after
,
&::
before
{
&
:
:
after
,
&::
before
{
height
:
29px
;
height
:
29px
;
top
:
-
10
px
;
top
:
-
7
px
;
}
}
.curve
{
.curve
{
display
:
block
;
display
:
block
;
...
@@ -562,7 +577,7 @@
...
@@ -562,7 +577,7 @@
width
:
21px
;
width
:
21px
;
height
:
25px
;
height
:
25px
;
position
:
absolute
;
position
:
absolute
;
top
:
-3
0
px
;
top
:
-3
1
.5
px
;
border-top
:
2px
solid
$border-color
;
border-top
:
2px
solid
$border-color
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/ci/builds/_build_pipeline.html.haml
View file @
65e482e7
...
@@ -5,8 +5,10 @@
...
@@ -5,8 +5,10 @@
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
elsif
can?
(
current_user
,
:read_build
,
@project
)
-
elsif
can?
(
current_user
,
:read_build
,
@project
)
=
link_to
namespace_project_build_path
(
subject
.
project
.
namespace
,
subject
.
project
,
subject
)
do
=
link_to
namespace_project_build_path
(
subject
.
project
.
namespace
,
subject
.
project
,
subject
)
do
%span
.ci-status-icon
=
render_status_with_link
(
'build'
,
subject
.
status
)
=
render_status_with_link
(
'build'
,
subject
.
status
)
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
else
-
else
%span
.ci-status-icon
=
render_status_with_link
(
'build'
,
subject
.
status
)
=
render_status_with_link
(
'build'
,
subject
.
status
)
=
ci_icon_for_status
(
subject
.
status
)
=
ci_icon_for_status
(
subject
.
status
)
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_pipeline_status_group.html.haml
View file @
65e482e7
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
=
render_status_with_link
(
'build'
,
group_status
)
%span
.ci-status-icon
=
render_status_with_link
(
'build'
,
group_status
)
.dropdown.inline
.dropdown.inline
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%span
.ci-status-text
%span
.ci-status-text
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
View file @
65e482e7
-
if
subject
.
target_url
-
if
subject
.
target_url
=
link_to
subject
.
target_url
do
=
link_to
subject
.
target_url
do
%span
.ci-status-icon
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
%span
.ci-status-text
=
subject
.
name
%span
.ci-status-text
=
subject
.
name
-
else
-
else
%span
.ci-status-icon
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
%span
.ci-status-text
=
subject
.
name
%span
.ci-status-text
=
subject
.
name
This diff is collapsed.
Click to expand it.
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