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
2ccad3c3
Commit
2ccad3c3
authored
Jul 15, 2020
by
Alexander Turinske
Committed by
Paul Slaughter
Jul 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-play icon with GitLab SVG play
- remove css on fa-play class - replace two fa-play instances
parent
27b98a2a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/stylesheets/pages/runners.scss
app/assets/stylesheets/pages/runners.scss
+1
-2
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+2
-2
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
.../projects/pipeline_schedules/_pipeline_schedule.html.haml
+2
-2
changelogs/unreleased/225933-fa-play-replacement.yml
changelogs/unreleased/225933-fa-play-replacement.yml
+5
-0
No files found.
app/assets/stylesheets/pages/runners.scss
View file @
2ccad3c3
...
@@ -45,8 +45,7 @@
...
@@ -45,8 +45,7 @@
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
.fa-pause
,
.fa-pause
{
.fa-play
{
font-size
:
11px
;
font-size
:
11px
;
}
}
}
}
...
...
app/views/admin/runners/_runner.html.haml
View file @
2ccad3c3
...
@@ -72,8 +72,8 @@
...
@@ -72,8 +72,8 @@
=
link_to
[
:pause
,
:admin
,
runner
],
method: :get
,
class:
'btn btn-default has-tooltip'
,
title:
_
(
'Pause'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Pause'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
link_to
[
:pause
,
:admin
,
runner
],
method: :get
,
class:
'btn btn-default has-tooltip'
,
title:
_
(
'Pause'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Pause'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
icon
(
'pause'
)
=
icon
(
'pause'
)
-
else
-
else
=
link_to
[
:resume
,
:admin
,
runner
],
method: :get
,
class:
'btn btn-default has-tooltip'
,
title:
_
(
'Resume'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Resume'
)
},
data:
{
placement:
'top'
,
container:
'body'
}
do
=
link_to
[
:resume
,
:admin
,
runner
],
method: :get
,
class:
'btn btn-default has-tooltip
gl-px-3
'
,
title:
_
(
'Resume'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Resume'
)
},
data:
{
placement:
'top'
,
container:
'body'
}
do
=
icon
(
'play'
)
=
sprite_
icon
(
'play'
)
.btn-group
.btn-group
=
link_to
[
:admin
,
runner
],
method: :delete
,
class:
'btn btn-danger has-tooltip'
,
title:
_
(
'Remove'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Remove'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
link_to
[
:admin
,
runner
],
method: :delete
,
class:
'btn btn-danger has-tooltip'
,
title:
_
(
'Remove'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Remove'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
icon
(
'remove'
)
=
icon
(
'remove'
)
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
View file @
2ccad3c3
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
%td
%td
.float-right.btn-group
.float-right.btn-group
-
if
can?
(
current_user
,
:play_pipeline_schedule
,
pipeline_schedule
)
-
if
can?
(
current_user
,
:play_pipeline_schedule
,
pipeline_schedule
)
=
link_to
play_pipeline_schedule_path
(
pipeline_schedule
),
method: :post
,
title:
s_
(
'Play'
),
class:
'btn'
do
=
link_to
play_pipeline_schedule_path
(
pipeline_schedule
),
method: :post
,
title:
s_
(
'Play'
),
class:
'btn
btn-svg gl-display-flex gl-align-items-center gl-justify-content-center
'
do
=
icon
(
'play'
)
=
sprite_
icon
(
'play'
)
-
if
can?
(
current_user
,
:take_ownership_pipeline_schedule
,
pipeline_schedule
)
-
if
can?
(
current_user
,
:take_ownership_pipeline_schedule
,
pipeline_schedule
)
=
link_to
take_ownership_pipeline_schedule_path
(
pipeline_schedule
),
method: :post
,
title:
s_
(
'PipelineSchedules|Take ownership'
),
class:
'btn'
do
=
link_to
take_ownership_pipeline_schedule_path
(
pipeline_schedule
),
method: :post
,
title:
s_
(
'PipelineSchedules|Take ownership'
),
class:
'btn'
do
=
s_
(
'PipelineSchedules|Take ownership'
)
=
s_
(
'PipelineSchedules|Take ownership'
)
...
...
changelogs/unreleased/225933-fa-play-replacement.yml
0 → 100644
View file @
2ccad3c3
---
title
:
Replace FA play icon with svg in pipeline schedule and admin runner page
merge_request
:
36379
author
:
type
:
other
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