BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
85e49489
Commit
85e49489
authored
Aug 25, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace play icon font with svg
parent
1c4e8663
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
9 deletions
+27
-9
CHANGELOG
CHANGELOG
+1
-0
dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+7
-0
environments.scss
app/assets/stylesheets/pages/environments.scss
+3
-2
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+7
-0
_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+2
-2
_actions.haml
app/views/projects/deployments/_actions.haml
+2
-2
_icon_play.svg
app/views/shared/icons/_icon_play.svg
+4
-2
No files found.
CHANGELOG
View file @
85e49489
...
...
@@ -51,6 +51,7 @@ v 8.12.0 (unreleased)
- Load branches asynchronously in Cherry Pick and Revert dialogs.
- Add merge request versions !5467
- Change using size to use count and caching it for number of group members. !5935
- Replace play icon font with svg (ClemMakesApps)
- Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
- Reduce number of database queries on builds tab
- Capitalize mentioned issue timeline notes (ClemMakesApps)
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
85e49489
...
...
@@ -183,6 +183,13 @@
&
.dropdown-menu-user-link
{
line-height
:
16px
;
}
.icon-play
{
fill
:
$table-text-gray
;
margin-right
:
6px
;
height
:
12px
;
width
:
11px
;
}
}
.dropdown-header
{
...
...
app/assets/stylesheets/pages/environments.scss
View file @
85e49489
...
...
@@ -4,8 +4,9 @@
margin
:
0
;
}
.fa-play
{
font-size
:
14px
;
.icon-play
{
height
:
13px
;
width
:
12px
;
}
.dropdown-new
{
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
85e49489
...
...
@@ -215,6 +215,13 @@
border-color
:
$border-white-normal
;
}
}
.btn
{
.icon-play
{
height
:
13px
;
width
:
12px
;
}
}
}
}
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
85e49489
...
...
@@ -89,4 +89,4 @@
=
icon
(
'repeat'
)
-
elsif
build
.
playable?
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
,
class:
'btn btn-build'
do
=
icon
(
'
play'
)
=
custom_icon
(
'icon_
play'
)
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
85e49489
...
...
@@ -66,13 +66,13 @@
-
if
actions
.
any?
.btn-group
%a
.dropdown-toggle.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"play"
)
=
custom_icon
(
'icon_play'
)
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
-
actions
.
each
do
|
build
|
%li
=
link_to
play_namespace_project_build_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
build
),
method: :post
,
rel:
'nofollow'
do
=
icon
(
"play"
)
=
custom_icon
(
'icon_play'
)
%span
=
build
.
name
.
humanize
-
if
artifacts
.
present?
.btn-group
...
...
app/views/projects/deployments/_actions.haml
View file @
85e49489
...
...
@@ -5,13 +5,13 @@
.inline
.dropdown
%a
.dropdown-new.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"play"
)
=
custom_icon
(
'icon_play'
)
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
-
actions
.
each
do
|
action
|
%li
=
link_to
[
:play
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
action
],
method: :post
,
rel:
'nofollow'
do
=
icon
(
"play"
)
=
custom_icon
(
'icon_play'
)
%span
=
action
.
name
.
humanize
-
if
local_assigns
.
fetch
(
:allow_rollback
,
false
)
...
...
app/views/shared/icons/_icon_play.svg
View file @
85e49489
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 10 11"
><path
fill-rule=
"evenodd"
d=
"m9.283 6.47l-7.564 4.254c-.949.534-1.719.266-1.719-.576v-9.292c0-.852.756-1.117 1.719-.576l7.564 4.254c.949.534.963 1.392 0 1.934"
/></svg>
\ No newline at end of file
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 10 11"
class=
"icon-play"
>
<path
fill-rule=
"evenodd"
d=
"m9.283 6.47l-7.564 4.254c-.949.534-1.719.266-1.719-.576v-9.292c0-.852.756-1.117 1.719-.576l7.564 4.254c.949.534.963 1.392 0 1.934"
/>
</svg>
\ No newline at end of file
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