Merge branch 'dz-small-ui-improvements' into 'master'

Remove icons from some buttons which already has text Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 * remove plus icon from new milestone button on group milestone page * remove plus icon from new project button on group projects page * remove plus icon from milestone page See merge request !5050

Merge branch 'dz-small-ui-improvements' into 'master'
850bb6db · Dmitriy Zaporozhets · 97999fd4 · de157818 · 850bb6db · 850bb6db
Commit 850bb6db authored Jul 12, 2016 by Dmitriy Zaporozhets
Showing with 0 additions and 3 deletions

index.html.haml app/views/groups/milestones/index.html.haml +0 -1

projects.html.haml app/views/groups/projects.html.haml +0 -1

_summary.html.haml app/views/shared/milestones/_summary.html.haml +0 -1

No files found.
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -6,7 +6,6 @@
  .nav-controls
    - if can?(current_user, :admin_milestones, @group)
      = link_to new_group_milestone_path(@group), class: "btn btn-new" do
-        = icon('plus')
        New Milestone

 .row-content-block

--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -7,7 +7,6 @@
    - if can? current_user, :admin_group, @group
      .controls
        = link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
-          = icon('plus')
          New Project
  %ul.well-list
    - @projects.each do |project|

--- a/app/views/shared/milestones/_summary.html.haml
+++ b/app/views/shared/milestones/_summary.html.haml
@@ -26,7 +26,6 @@
    %span.pull-right.tab-issues-buttons
      - if project && can?(current_user, :create_issue, project)
        = link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
-          %i.fa.fa-plus
          New Issue
      = link_to 'Browse Issues', milestones_browse_issuables_path(milestone, type: :issues), class: "btn btn-grouped"
    %span.pull-right.tab-merge-requests-buttons.hidden