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
33ca6966
Commit
33ca6966
authored
Oct 12, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing Tests and CSS display
parent
38a98662
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
10 deletions
+18
-10
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+10
-2
app/views/ci/status/_dropdown_graph_badge.html.haml
app/views/ci/status/_dropdown_graph_badge.html.haml
+2
-2
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+6
-6
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
33ca6966
...
@@ -725,9 +725,9 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -725,9 +725,9 @@ button.mini-pipeline-graph-dropdown-toggle {
fill
:
$gl-text-color-secondary
;
fill
:
$gl-text-color-secondary
;
width
:
$ci-action-icon-size
;
width
:
$ci-action-icon-size
;
height
:
$ci-action-icon-size
;
height
:
$ci-action-icon-size
;
left
:
-
6
px
;
left
:
-
3
px
;
position
:
relative
;
position
:
relative
;
top
:
-3px
;
top
:
0
;
}
}
&
:hover
svg
,
&
:hover
svg
,
...
@@ -743,6 +743,14 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -743,6 +743,14 @@ button.mini-pipeline-graph-dropdown-toggle {
left
:
8px
;
left
:
8px
;
}
}
}
}
svg
.icon-action-play
,
svg
.icon-action-stop
{
width
:
12px
;
height
:
12px
;
top
:
1px
;
left
:
0
;
}
}
}
// link to the build
// link to the build
...
...
app/views/ci/status/_dropdown_graph_badge.html.haml
View file @
33ca6966
...
@@ -15,5 +15,5 @@
...
@@ -15,5 +15,5 @@
%span
.ci-build-text
=
subject
.
name
%span
.ci-build-text
=
subject
.
name
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
class:
'ci-action-icon-wrapper js-ci-action-icon'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
,
container:
'body'
}
do
=
link_to
status
.
action_path
,
class:
"ci-action-icon-wrapper js-ci-action-icon"
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
,
container:
'body'
}
do
=
sprite_icon
(
status
.
action_icon
)
=
sprite_icon
(
status
.
action_icon
,
css_class:
"icon-action-
#{
status
.
action_icon
}
"
)
spec/features/projects/pipelines/pipeline_spec.rb
View file @
33ca6966
...
@@ -86,8 +86,8 @@ describe 'Pipeline', :js do
...
@@ -86,8 +86,8 @@ describe 'Pipeline', :js do
expect
(
page
).
to
have_content
(
'build'
)
expect
(
page
).
to
have_content
(
'build'
)
end
end
page
.
within
(
'#ci-badge-build .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-build .ci-action-icon-container
.js-icon-retry
'
)
do
expect
(
page
).
to
have_selector
(
'
.js-icon-retry
'
)
expect
(
page
).
to
have_selector
(
'
svg
'
)
end
end
end
end
...
@@ -105,8 +105,8 @@ describe 'Pipeline', :js do
...
@@ -105,8 +105,8 @@ describe 'Pipeline', :js do
expect
(
page
).
to
have_content
(
'test'
)
expect
(
page
).
to
have_content
(
'test'
)
end
end
page
.
within
(
'#ci-badge-test .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-test .ci-action-icon-container
.js-icon-retry
'
)
do
expect
(
page
).
to
have_selector
(
'
.js-icon-retry
'
)
expect
(
page
).
to
have_selector
(
'
svg
'
)
end
end
end
end
...
@@ -124,8 +124,8 @@ describe 'Pipeline', :js do
...
@@ -124,8 +124,8 @@ describe 'Pipeline', :js do
expect
(
page
).
to
have_content
(
'manual'
)
expect
(
page
).
to
have_content
(
'manual'
)
end
end
page
.
within
(
'#ci-badge-manual-build .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-manual-build .ci-action-icon-container
.js-icon-play
'
)
do
expect
(
page
).
to
have_selector
(
'
.js-icon-play
'
)
expect
(
page
).
to
have_selector
(
'
svg
'
)
end
end
end
end
...
...
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