diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-01 17:09:12 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-01 17:09:12 +0000 |
commit | 9e2feaa55618f5676ba50428041cda6cc7a32783 (patch) | |
tree | a2f58309454b63d4c2e6701b97ae6e4c46c21c02 /app/assets/stylesheets | |
parent | a4c56a2b895f1313c09f1f029745395c4563763c (diff) | |
parent | 85e494890a931b6031aed2f9f2e50d30d6f37a32 (diff) | |
download | gitlab-ce-9e2feaa55618f5676ba50428041cda6cc7a32783.tar.gz |
Merge branch 'replace-play-icon' into 'master'
Replace play icon font with svg
## What does this MR do?
Replaces the `play` font awesome icon with svg
## Are there points in the code the reviewer needs to double check?
Make sure that the svg is looking great on all the changed pages
## Why was this MR needed?
SVG is better than fonts :smile:
## What are the relevant issue numbers?
#21455
## Screenshots (if relevant)
Before (Pipeline):
![Screen_Shot_2016-08-26_at_4.16.16_PM](/uploads/90a75b91b516e643f2134e053b0d7590/Screen_Shot_2016-08-26_at_4.16.16_PM.png)
After (Pipeline):
![Screen_Shot_2016-08-26_at_4.15.49_PM](/uploads/44e44a3d4c14066b8b7ec8c3da36e012/Screen_Shot_2016-08-26_at_4.15.49_PM.png)
Before (Environments):
![Screen_Shot_2016-08-31_at_3.03.35_PM](/uploads/bd4087a9f01c1a4d3c373d2662df4fe5/Screen_Shot_2016-08-31_at_3.03.35_PM.png)
After (Environments):
![Screen_Shot_2016-08-31_at_3.00.23_PM](/uploads/0ec45031bedb271f16bea3544cbfe52b/Screen_Shot_2016-08-31_at_3.00.23_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6038
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 7 |
3 files changed, 17 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index edb2ff01f88..b0ba112476b 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -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 { diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 55f9d4a0011..d01c60ee6ab 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -4,8 +4,9 @@ margin: 0; } - .fa-play { - font-size: 14px; + .icon-play { + height: 13px; + width: 12px; } .dropdown-new { diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index b56c0727660..2911576b66f 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -213,6 +213,13 @@ border-color: $border-white-normal; } } + + .btn { + .icon-play { + height: 13px; + width: 12px; + } + } } } |