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 😄 ## 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

Merge branch 'replace-play-icon' into 'master'
9e2feaa5 · Annabel Dunstone Gray · a4c56a2b · 85e49489 · 9e2feaa5 · 9e2feaa5
Commit 9e2feaa5 authored Sep 01, 2016 by Annabel Dunstone Gray
8 changed files
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,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)

--- 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 {

--- 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 {

--- 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;
+        }
+      }
    }
  }


--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -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')
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -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

--- a/app/views/projects/deployments/_actions.haml
+++ b/app/views/projects/deployments/_actions.haml
@@ -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)

--- a/app/views/shared/icons/_icon_play.svg
+++ b/app/views/shared/icons/_icon_play.svg
-<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