refactor buttons pt2

49 files changed, 90 insertions, 90 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index ed102253ab6..86b4c5b3b64 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -92,7 +92,7 @@
     background-color: #ccc;
   }
 
-  &.very_small {
+  &.btn-tiny {
     font-size: 11px;
     padding: 2px 6px;
     line-height: 16px;
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index d4934791110..b29d2991d34 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -215,10 +215,10 @@ ul.notes {
  */
 
 .comment-btn {
-  @extend .create-btn;
+  @extend .btn-create;
 }
 .reply-btn {
-  @extend .primary;
+  @extend .btn-primary;
 }
 .file .content tr.line_holder:hover > td { background: $hover !important; }
 .file .content tr.line_holder:hover > td .line_note_link {
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 9a5e7edea0f..3698778e9fc 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -6,7 +6,7 @@
         = link_to admin_projects_path do
           %h1= Project.count
         %hr
-        = link_to 'New Project', new_project_path, class: "btn small"
+        = link_to 'New Project', new_project_path, class: "btn btn-small"
   .span4
     .ui-box
       %h5.title Groups
@@ -14,7 +14,7 @@
         = link_to admin_groups_path do
           %h1= Group.count
         %hr
-        = link_to 'New Group', new_admin_group_path, class: "btn small"
+        = link_to 'New Group', new_admin_group_path, class: "btn btn-small"
   .span4
     .ui-box
       %h5.title Users
@@ -22,7 +22,7 @@
         = link_to admin_users_path do
           %h1= User.count
         %hr
-        = link_to 'New User', new_admin_user_path, class: "btn small"
+        = link_to 'New User', new_admin_user_path, class: "btn btn-small"
 
 .row
   .span4
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 443abece919..f1e857eca8a 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -4,7 +4,7 @@
     allows you to keep projects organized.
     Use groups for uniting related projects.
 
-  = link_to 'New Group', new_admin_group_path, class: "btn small right"
+  = link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
 %br
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "xlarge"
@@ -30,6 +30,6 @@
       %td
         = link_to group.owner_name, admin_user_path(group.owner_id)
       %td.bgred
-        = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small"
-        = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
+        = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
+        = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 = paginate @groups, theme: "admin"
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 15bff871cd5..412a7ff2038 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -33,7 +33,7 @@
         %td
           = link_to admin_hook_path(hook) do
             %strong= hook.url
-          = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn small right"
+          = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
         %td POST
         %td
-          = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small right"
+          = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 8ac2fa12520..f42e1f3af86 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   Projects
-  = link_to 'New Project', new_project_path, class: "btn small right"
+  = link_to 'New Project', new_project_path, class: "btn btn-small right"
 
 %hr
 
@@ -52,8 +52,8 @@
               %i.icon-lock.cgreen
             = link_to project.name_with_namespace, [:admin, project]
             .right
-              = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn small"
-              = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
+              = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
+              = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
         - if @projects.blank?
           %p.nothing_here_message 0 projects matches
         - else
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index fb1a7b488c1..fc3ed1e8b23 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -129,7 +129,7 @@
       %td
         = link_to tm.name, admin_user_path(tm)
       %td= @project.project_access_human(tm)
-      %td= link_to 'Edit Access', edit_admin_project_member_path(@project, tm), class: "btn small"
+      %td= link_to 'Edit Access', edit_admin_project_member_path(@project, tm), class: "btn btn-small"
       %td= link_to 'Remove from team', admin_project_member_path(@project, tm), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove small"
 
 %br
diff --git a/app/views/admin/teams/index.html.haml b/app/views/admin/teams/index.html.haml
index e7344f4ea2c..1d54a27f8f5 100644
--- a/app/views/admin/teams/index.html.haml
+++ b/app/views/admin/teams/index.html.haml
@@ -3,7 +3,7 @@
   %small
     simple Teams description
 
-  = link_to 'New Team', new_admin_team_path, class: "btn small right"
+  = link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
   %br
 
 = form_tag admin_teams_path, method: :get, class: 'form-inline' do
@@ -32,7 +32,7 @@
       %td
         = link_to team.owner.name, admin_user_path(team.owner_id)
       %td.bgred
-        = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn small"
-        = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
+        = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
+        = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 
 = paginate @teams, theme: "admin"
diff --git a/app/views/admin/teams/show.html.haml b/app/views/admin/teams/show.html.haml
index 2561e3aeaf5..4d27f31be58 100644
--- a/app/views/admin/teams/show.html.haml
+++ b/app/views/admin/teams/show.html.haml
@@ -42,7 +42,7 @@
 %fieldset
   %legend
     Members (#{@team.members.count})
-    %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary small right", id: :add_members_to_team
+    %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
   - if @team.members.any?
     %table#members_list
       %thead
@@ -60,14 +60,14 @@
           %td= @team.human_default_projects_access(member)
           %td= @team.admin?(member) ? "Admin" : "Member"
           %td.bgred
-            = link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn small"
+            = link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn btn-small"
              
-            = link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn btn-remove small", id: "remove_member_#{member.id}"
+            = link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn btn-remove btn-small", id: "remove_member_#{member.id}"
 
 %fieldset
   %legend
     Projects (#{@team.projects.count})
-    %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary small right", id: :assign_projects_to_team
+    %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
   - if @team.projects.any?
     %table#projects_list
       %thead
@@ -82,7 +82,7 @@
           %td
             %span= @team.human_max_project_access(project)
           %td.bgred
-            = link_to 'Edit', edit_admin_team_project_path(@team, project), class: "btn small"
+            = link_to 'Edit', edit_admin_team_project_path(@team, project), class: "btn btn-small"
              
             = link_to 'Relegate', admin_team_project_path(@team, project), confirm: 'Remove project from team. Are you sure?', method: :delete, class: "btn btn-remove small", id: "relegate_project_#{project.id}"
 
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 9f447bcd9e7..51b05c05993 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -63,10 +63,10 @@
             .alert.alert-error
               - if @admin_user.blocked
                 %p This user is blocked and is not able to login to GitLab
-                = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small"
+                = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn btn-small"
               - else
                 %p Blocked users will be removed from all projects & will not be able to login to GitLab.
-                = link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small btn-remove"
+                = link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
     %fieldset
       %legend Profile
       .clearfix
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0aa8a16fbc6..d8828183083 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   Users
-  = link_to 'New User', new_admin_user_path, class: "btn small right"
+  = link_to 'New User', new_admin_user_path, class: "btn btn-small right"
 %br
 
 = form_tag admin_users_path, method: :get, class: 'form-inline' do
@@ -44,15 +44,15 @@
       %td= user.username
       %td= user.email
       %td= user.users_projects.count
-      %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn small"
+      %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
       %td.bgred
         - if user == current_user
           %span.cred It's you!
         - else
           - if user.blocked
-            = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success"
+            = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
           - else
-            = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small btn-remove"
-          = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small btn-remove"
+            = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
+          = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 
 = paginate @admin_users, theme: "admin"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index fefb5706a93..69062aa375a 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -123,5 +123,5 @@
       %tr
         %td= link_to project.name_with_namespace, admin_project_path(project)
         %td= tm.project_access_human
-        %td= link_to 'Edit Access', edit_admin_project_member_path(project, tm.user), class: "btn small"
-        %td= link_to 'Remove from team', admin_project_member_path(project, tm.user), confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove"
+        %td= link_to 'Edit Access', edit_admin_project_member_path(project, tm.user), class: "btn btn-small"
+        %td= link_to 'Remove from team', admin_project_member_path(project, tm.user), confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove"
diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml
index 9a9aed39b08..5e7d43c99cb 100644
--- a/app/views/commits/_diffs.html.haml
+++ b/app/views/commits/_diffs.html.haml
@@ -33,7 +33,7 @@
             - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
               %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
 
-            = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn very_small right view-file'} do
+            = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
               View file @
               %span.commit-short-id= @commit.short_id(6)
 
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index f9774669d9a..535f0349212 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -5,7 +5,7 @@
       (#{groups.count})
     - if current_user.can_create_group?
       %span.right
-        = link_to new_group_path, class: "btn very_small info" do
+        = link_to new_group_path, class: "btn btn-tiny info" do
           %i.icon-plus
           New Group
   %ul.well-list
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index f2acd2b0b0c..a5396a0023d 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -5,7 +5,7 @@
       (#{@projects_count})
     - if current_user.can_create_project?
       %span.right
-        = link_to new_project_path, class: "btn very_small info" do
+        = link_to new_project_path, class: "btn btn-tiny info" do
           %i.icon-plus
           New Project
 
diff --git a/app/views/dashboard/_teams.html.haml b/app/views/dashboard/_teams.html.haml
index 5b2ea7a2384..1be6e25c54d 100644
--- a/app/views/dashboard/_teams.html.haml
+++ b/app/views/dashboard/_teams.html.haml
@@ -4,7 +4,7 @@
     %small
       (#{@teams.count})
     %span.right
-      = link_to new_team_path, class: "btn very_small info" do
+      = link_to new_team_path, class: "btn btn-tiny info" do
         %i.icon-plus
         New Team
   %ul.well-list
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index e6c710e68e9..94b319fe24f 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -4,7 +4,7 @@
     (#{@projects.total_count})
   - if current_user.can_create_project?
     %span.right
-      = link_to new_project_path, class: "btn very_small info" do
+      = link_to new_project_path, class: "btn btn-tiny info" do
         %i.icon-plus
         New Project
 
diff --git a/app/views/deploy_keys/_show.html.haml b/app/views/deploy_keys/_show.html.haml
index a5314ae92ad..68b00568c6d 100644
--- a/app/views/deploy_keys/_show.html.haml
+++ b/app/views/deploy_keys/_show.html.haml
@@ -8,5 +8,5 @@
       = time_ago_in_words(key.created_at)
       ago
   %td
-    = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "danger btn delete-key small right"
+    = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small right"
 
diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml
index b9c654a1abe..db167f4e2f2 100644
--- a/app/views/deploy_keys/index.html.haml
+++ b/app/views/deploy_keys/index.html.haml
@@ -4,7 +4,7 @@
   Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
 
   - if can? current_user, :admin_project, @project
-    = link_to new_project_deploy_key_path(@project), class: "btn small", title: "New Deploy Key" do
+    = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
       Add Deploy Key
 - if @keys.any?
   %table
diff --git a/app/views/deploy_keys/show.html.haml b/app/views/deploy_keys/show.html.haml
index c94cf10dde0..4a864fae9d7 100644
--- a/app/views/deploy_keys/show.html.haml
+++ b/app/views/deploy_keys/show.html.haml
@@ -11,4 +11,4 @@
 %hr
 %pre= @key.key
 .right
-  = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "danger btn delete-key"
+  = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 040d1ae94aa..b7732c50a32 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -5,7 +5,7 @@
       (#{projects.count})
     - if can? current_user, :manage_group, @group
       %span.right
-        = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
+        = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
           %i.icon-plus
           New Project
   %ul.well-list
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 84dd17c045d..a140b401b9d 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,7 +1,7 @@
 .projects
   .activities.span8
     = render "events/event_last_push", event: @last_push
-    = link_to dashboard_path, class: 'btn very_small' do
+    = link_to dashboard_path, class: 'btn btn-tiny' do
       ← To dashboard
      
     %span.cgray You will only see events from projects in this group
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 98a82f110de..3d814ab4db8 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -38,5 +38,5 @@
           %span.monospace= hook.url
         %td
           .right
-            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small grouped"
-            = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small grouped"
+            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
+            = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index dcef901c15f..9f543ef97d8 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -4,15 +4,15 @@
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
   .right
     - if issue.notes.any?
-      %span.btn.small.disabled.grouped
+      %span.btn.btn-small.disabled.grouped
         %i.icon-comment
         = issue.notes.count
     - if can? current_user, :modify_issue, issue
       - if issue.closed
-        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn small grouped reopen_issue", remote: true
+        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn btn-small grouped reopen_issue", remote: true
       - else
-        = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn small grouped close_issue", remote: true
-      = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link grouped" do
+        = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
+      = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
         %i.icon-edit
         Edit
 
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
index 049981766b6..9e85e6228ce 100644
--- a/app/views/keys/_show.html.haml
+++ b/app/views/keys/_show.html.haml
@@ -8,5 +8,5 @@
       = time_ago_in_words(key.created_at)
       ago
   %td
-    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove delete-key right"
+    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
 
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 7369f3dd061..cdfc623d0a5 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -2,19 +2,19 @@
   .right
     .left
       - if merge_request.merged?
-        %span.btn.small.disabled.grouped
+        %span.btn.btn-small.disabled.grouped
           %strong
             %i.icon-ok
             = "MERGED"
       - if merge_request.notes.any?
-        %span.btn.small.disabled.grouped
+        %span.btn.btn-small.disabled.grouped
           %i.icon-comment
           = merge_request.mr_and_commit_notes.count
       - if merge_request.milestone_id?
-        %span.btn.small.disabled.grouped
+        %span.btn.btn-small.disabled.grouped
           %i.icon-time
           = merge_request.milestone.title
-      %span.btn.small.disabled.grouped
+      %span.btn.btn-small.disabled.grouped
         = merge_request.source_branch
         →
         = merge_request.target_branch
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index 128ffe76782..27f1c2ab8e1 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -31,7 +31,7 @@
   .automerge_widget.cannot_be_merged{style: "display:none"}
     .alert.alert-info
       %span
-        = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
+        = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
          
         %strong This request can't be merged with GitLab. You should do it manually
 
diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml
index 3864792f7e8..9111ff8b954 100644
--- a/app/views/milestones/_milestone.html.haml
+++ b/app/views/milestones/_milestone.html.haml
@@ -1,7 +1,7 @@
 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
   .right
     - if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
-      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn small edit-milestone-link grouped" do
+      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
         %i.icon-edit
         Edit
   %h4
diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml
index 3089595fe0b..c1dc6da983d 100644
--- a/app/views/milestones/index.html.haml
+++ b/app/views/milestones/index.html.haml
@@ -3,7 +3,7 @@
   %h3.page_title
     Milestones
     - if can? current_user, :admin_milestone, @project
-      = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn small", title: "New Milestone"
+      = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
   %br
   %div.ui-box
     .title
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index 797f35befa5..eeefb70e57c 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -10,12 +10,12 @@
   .span6
     .right
       - unless  @milestone.closed
-        = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn small grouped", title: "New Issue" do
+        = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
           %i.icon-plus
           New Issue
         = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
         - if can?(current_user, :admin_milestone, @project)
-          = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do
+          = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
             %i.icon-edit
             Edit
 
@@ -25,7 +25,7 @@
   %hr
   %p
     %span All issues for this milestone are closed. You may close milestone now.
-    = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small btn-remove"
+    = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn btn-small btn-remove"
 
 .ui-box.ui-box-show
   .ui-box-head
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index d094119a9da..a063fb0a6bb 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -26,7 +26,7 @@
     .attachment
       %h6 Attachment:
       .file_name.js-attachment-filename File name...
-      %a.choose-btn.btn.small.js-choose-note-attachment-button Choose File ...
+      %a.choose-btn.btn.btn-small.js-choose-note-attachment-button Choose File ...
       .hint Any file up to 10 MB
 
       = f.file_field :attachment, class: "js-note-attachment-input"
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 4c0463aff79..65b5a5d29fc 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -65,13 +65,13 @@
             %li
               %p
                 Need a group for several dependent projects?
-                = link_to new_group_path, class: "btn very_small" do
+                = link_to new_group_path, class: "btn btn-tiny" do
                   Create a group
           - if current_user.can_create_team?
             %li
               %p
                 Want to share a team between projects?
-                = link_to new_team_path, class: "btn very_small" do
+                = link_to new_team_path, class: "btn btn-tiny" do
                   Create a team
       %fieldset
         %legend
@@ -90,7 +90,7 @@
           %span.right
             = link_to pluralize(current_user.keys.count, 'key'), keys_path
         .padded
-          = link_to "Add Public Key", new_key_path, class: "btn small"
+          = link_to "Add Public Key", new_key_path, class: "btn btn-small"
 
   .form-actions
     = f.submit 'Save', class: "btn btn-save"
diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml
index dc4f4e23356..b3f2b82eb77 100644
--- a/app/views/projects/_new_form.html.haml
+++ b/app/views/projects/_new_form.html.haml
@@ -24,11 +24,11 @@
     .clearfix
       .input.light
         Need a group for several dependent projects?
-        = link_to new_group_path, class: "btn very_small" do
+        = link_to new_group_path, class: "btn btn-tiny" do
           Create a group
   - if current_user.can_create_team?
     .clearfix
       .input.light
         Want to share a project between team?
-        = link_to new_team_path, class: "btn very_small" do
+        = link_to new_team_path, class: "btn btn-tiny" do
           Create a team
diff --git a/app/views/protected_branches/index.html.haml b/app/views/protected_branches/index.html.haml
index 8ceff635fd9..6e7c638eb0f 100644
--- a/app/views/protected_branches/index.html.haml
+++ b/app/views/protected_branches/index.html.haml
@@ -51,4 +51,4 @@
                   (branch was removed from repository)
               %td
                 - if can? current_user, :admin_project, @project
-                  = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small"
+                  = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small"
diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
index ed518300ac0..017a33b34f3 100644
--- a/app/views/snippets/_blob.html.haml
+++ b/app/views/snippets/_blob.html.haml
@@ -3,7 +3,7 @@
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
-      = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn very_small", target: "_blank"
+      = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
   .file_content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 7b8f94de7dd..db2185745ef 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -5,7 +5,7 @@
   %small share code pastes with others out of git repository
 
   - if can? current_user, :write_snippet, @project
-    = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
+    = link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do
       Add new snippet
 %br
 %table
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 02022185f9a..767b9736545 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -4,7 +4,7 @@
   = @snippet.title
   %small= @snippet.file_name
   - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
-    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn small right"
+    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right"
 
 %br
 %div= render 'blob'
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index c8138af4428..c85ec9812a8 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -19,10 +19,10 @@
         - if current_user == user
           %span.btn.disabled This is you!
         - if @project.namespace_owner == user
-          %span.btn.disabled.success Owner
+          %span.btn.disabled.btn-success Owner
         - elsif user.blocked
           %span.btn.disabled.blocked Blocked
         - elsif allow_admin
-          = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "very_small btn btn-remove" do
+          = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove" do
             %i.icon-minus.icon-white
 
diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index 935755f36c4..6e5090c7799 100644
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -8,9 +8,9 @@
 
   - if can? current_user, :admin_team_member, @project
     %span.right
-      = link_to import_project_team_members_path(@project), class: "btn small grouped", title: "Import team from another project" do
+      = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
         Import team from another project
-      = link_to available_project_teams_path(@project), class: "btn small grouped", title: "Assign project to team of users" do
+      = link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do
         Assign project to Team of users
       = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
         New Team Member
diff --git a/app/views/teams/_projects.html.haml b/app/views/teams/_projects.html.haml
index 4d99d5c259b..e72125919b1 100644
--- a/app/views/teams/_projects.html.haml
+++ b/app/views/teams/_projects.html.haml
@@ -5,7 +5,7 @@
       (#{projects.count})
     - if can? current_user, :manage_user_team, @team
       %span.right
-        = link_to new_team_project_path(@team), class: "btn very_small info" do
+        = link_to new_team_project_path(@team), class: "btn btn-tiny info" do
           %i.icon-plus
           Assign Project
   %ul.well-list
diff --git a/app/views/teams/members/_show.html.haml b/app/views/teams/members/_show.html.haml
index a14177dfe29..e2b702ab0d7 100644
--- a/app/views/teams/members/_show.html.haml
+++ b/app/views/teams/members/_show.html.haml
@@ -23,9 +23,9 @@
         - if current_user == user
           %span.btn.disabled This is you!
         - if @team.owner == user
-          %span.btn.disabled.success Owner
+          %span.btn.disabled.btn-success Owner
         - elsif user.blocked
           %span.btn.disabled.blocked Blocked
         - elsif allow_admin
-          = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "very_small btn btn-remove" do
+          = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove" do
             %i.icon-minus.icon-white
diff --git a/app/views/teams/projects/index.html.haml b/app/views/teams/projects/index.html.haml
index 5aa6a999c20..de2bee093ec 100644
--- a/app/views/teams/projects/index.html.haml
+++ b/app/views/teams/projects/index.html.haml
@@ -29,7 +29,7 @@
 
         - if current_user.can?(:admin_user_team, @team)
           %td.bgred
-            = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn small"
+            = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn btn-small"
             = link_to 'Relegate', team_project_path(@team, project), confirm: 'Remove project from team and move to global namespace. Are you sure?', method: :delete, class: "btn btn-remove small"
 
 - else
diff --git a/app/views/teams/show.html.haml b/app/views/teams/show.html.haml
index d9257ab090c..d6e80e2a51e 100644
--- a/app/views/teams/show.html.haml
+++ b/app/views/teams/show.html.haml
@@ -1,6 +1,6 @@
 .projects
   .activities.span8
-    = link_to dashboard_path, class: 'btn very_small' do
+    = link_to dashboard_path, class: 'btn btn-tiny' do
       ← To dashboard
      
     %span.cgray Events and projects are filtered in scope of team
diff --git a/app/views/tree/_blob_actions.html.haml b/app/views/tree/_blob_actions.html.haml
index 21334ea1f16..0bde968d0e6 100644
--- a/app/views/tree/_blob_actions.html.haml
+++ b/app/views/tree/_blob_actions.html.haml
@@ -1,12 +1,12 @@
 .btn-group.tree-btn-group
   -# only show edit link for text files
   - if @tree.text?
-    = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small", disabled: !allowed_tree_edit?
-  = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
+    = link_to "edit", edit_project_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
+  = link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank"
   -# only show normal/blame view links for text files
   - if @tree.text?
     - if current_page? project_blame_path(@project, @id)
-      = link_to "normal view", project_tree_path(@project, @id), class: "btn very_small"
+      = link_to "normal view", project_tree_path(@project, @id), class: "btn btn-tiny"
     - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
-  = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
+      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
+  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index c2842959510..b0f775673b5 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -24,7 +24,7 @@
           %th Name
           %th Last Update
           %th Last Commit
-          %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
+          %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right"
 
       - if tree.up_dir?
         %tr.tree-item
diff --git a/app/views/tree/edit.html.haml b/app/views/tree/edit.html.haml
index 281f4cc5ba2..81918e509b8 100644
--- a/app/views/tree/edit.html.haml
+++ b/app/views/tree/edit.html.haml
@@ -10,7 +10,7 @@
             %strong= @ref
         %span.options
           .btn-group.tree-btn-group
-            = link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small btn-cancel", confirm: "Are you sure?"
+            = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
       .file_content.code
         %pre#editor= @tree.data
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 644826282b8..3977de24280 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -5,7 +5,7 @@
       = @user.name
       - if @user == current_user
         .right
-          = link_to profile_path, class: 'btn small' do
+          = link_to profile_path, class: 'btn btn-small' do
             %i.icon-edit
             Edit Profile
       %br
diff --git a/app/views/wikis/edit.html.haml b/app/views/wikis/edit.html.haml
index bf4a9aad444..71f8d6a9b6c 100644
--- a/app/views/wikis/edit.html.haml
+++ b/app/views/wikis/edit.html.haml
@@ -4,5 +4,5 @@
 
 .right
   - if can? current_user, :admin_wiki, @project
-    = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn small btn-remove" do
+    = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
       Delete this page
\ No newline at end of file
diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml
index d3bd58bbeec..245d192efa1 100644
--- a/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@ -1,12 +1,12 @@
 %h3.page_title
   = @wiki.title
   %span.right
-    = link_to pages_project_wikis_path(@project), class: "btn small grouped" do
+    = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
       Pages
     - if can? current_user, :write_wiki, @project
-      = link_to history_project_wiki_path(@project, @wiki), class: "btn small grouped" do
+      = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
         History
-      = link_to edit_project_wiki_path(@project, @wiki), class: "btn small grouped" do
+      = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
         %i.icon-edit
         Edit
 %br