Use more specific class names: grouped -> btn-grouped

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/stylesheets/generic/buttons.scss

@@ -158,6 +158,14 @@
       color: #468847;
     }
   }
+
+  &.btn-grouped {
+    margin-right: 7px;
+    float: left;
+    &:last-child {
+      margin-right: 0px;
+    }
+  }
 }
 
 .btn-block {
@@ -169,16 +177,5 @@
   }
 }
 
-.btn,
-.btn-group {
-  &.grouped {
-    margin-right: 7px;
-    float: left;
-    &:last-child {
-      margin-right: 0px;
-    }
-  }
-}
-
 .btn-group-small > .btn { @extend .btn.btn-small; }
 .btn-group-tiny > .btn { @extend .btn.btn-tiny; }

app/views/admin/users/show.html.haml

@@ -7,7 +7,7 @@
     %span.cred (Admin)
 
   .pull-right
-    = link_to edit_admin_user_path(@user), class: "btn grouped" do
+    = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
       %i.icon-edit
       Edit
 %hr

app/views/profiles/groups/index.html.haml

@@ -18,12 +18,12 @@
       %li
         .pull-right
           - if can?(current_user, :manage_group, group)
-            = link_to edit_group_path(group), class: "btn-small btn grouped" do
+            = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
               %i.icon-cogs
               Settings
 
           - if can?(current_user, :destroy, user_group)
-            = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn grouped", title: 'Remove user from group' do
+            = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do
               %i.icon-signout
               Leave
 

app/views/projects/branches/_branch.html.haml

@@ -12,12 +12,12 @@
       - if can?(current_user, :download_code, @project)
         = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small'
       - if branch.name != @repository.root_ref
-        = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn grouped btn-small', method: :post, title: "Compare" do
+        = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
           %i.icon-copy
           Compare
 
       - if can?(current_user, :admin_project, @project) && branch.name != @repository.root_ref
-        = link_to project_branch_path(@project, branch.name), class: 'btn grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
+        = link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
           %i.icon-trash
 
   - if commit

app/views/projects/commit/_commit_box.html.haml

@@ -12,7 +12,7 @@
       %ul.dropdown-menu
         %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
         %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
-    = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
+    = link_to project_tree_path(@project, @commit), class: "btn btn-primary btn-grouped" do
       %span Browse Code »
   %div
 

app/views/projects/hooks/index.html.haml

@@ -51,8 +51,8 @@
       - @hooks.each do |hook|
         %li
           .pull-right
-            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
-            = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small grouped"
+            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small btn-grouped"
+            = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small btn-grouped"
           .clearfix
             %span.monospace= hook.url
           %p

app/views/projects/issues/_issue.html.haml

@@ -38,10 +38,10 @@
   .issue-actions
     - if can? current_user, :modify_issue, issue
       - if issue.closed?
-        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-small grouped reopen_issue", remote: true
+        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-small btn-grouped reopen_issue", remote: true
       - else
-        = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, 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
+        = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue", remote: true
+      = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do
         %i.icon-edit
         Edit
 

app/views/projects/issues/show.html.haml

@@ -3,16 +3,16 @@
 
   %span.pull-right
     - if can?(current_user, :write_issue, @project)
-      = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
+      = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
         %i.icon-plus
         New Issue
     - if can?(current_user, :modify_issue, @issue)
       - if @issue.closed?
-        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped btn-reopen"
+        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-grouped btn-reopen"
       - else
-        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
+        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
 
-      = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
+      = link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do
         %i.icon-edit
         Edit
 
@@ -55,9 +55,9 @@
 - content_for :note_actions do
   - if can?(current_user, :modify_issue, @issue)
     - if @issue.closed?
-      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped btn-reopen"
+      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-grouped btn-reopen"
     - else
-      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
+      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
 
 .participants
   %cite.cgray #{@issue.participants.count} participants

app/views/projects/merge_requests/_show.html.haml

@@ -25,7 +25,7 @@
   - content_for :note_actions do
     - if can?(current_user, :modify_merge_request, @merge_request)
       - unless @merge_request.closed?
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
 
 
   .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }

app/views/projects/merge_requests/show/_mr_title.html.haml

@@ -13,9 +13,9 @@
             %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
             %li= link_to "Plain Diff",    project_merge_request_path(@project, @merge_request, format: :diff)
 
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
 
-        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped", id:"edit_merge_request" do
+        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
           %i.icon-edit
           Edit
 

app/views/projects/milestones/_milestone.html.haml

 %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
   .pull-right
     - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
-      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
+      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do
         %i.icon-edit
         Edit
       = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"

app/views/projects/milestones/show.html.haml

@@ -11,13 +11,13 @@
     %span.state-label.state-label-green Open
   .pull-right
     - if can?(current_user, :admin_milestone, @project)
-      = link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
+      = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
         %i.icon-edit
         Edit
       - if @milestone.active?
         = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove grouped"
       - else
-        = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn grouped"
+        = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped"
 
 - if @milestone.issues.any? && @milestone.can_be_closed?
   .alert.alert-success
@@ -63,10 +63,10 @@
       %span.badge= @users.count
 
   .pull-right
-    = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
+    = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-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 btn-small edit-milestone-link grouped"
+    = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped"
 
 .tab-content
   .tab-pane.active#tab-issues

app/views/projects/notes/_form.html.haml

@@ -22,7 +22,7 @@
 
   .note-form-actions
     .buttons
-      = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+      = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
       = yield(:note_actions)
 
       %a.btn.grouped.js-close-discussion-note-form Cancel

app/views/projects/team_members/index.html.haml

@@ -3,9 +3,9 @@
 
   - if can? current_user, :admin_team_member, @project
     %span.pull-right
-      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
+      = link_to new_project_team_member_path(@project), class: "btn btn-new btn-grouped", title: "New project member" do
         New project member
-      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
+      = link_to import_project_team_members_path(@project), class: "btn btn-grouped", title: "Import members from another project" do
         Import members
 
 %p.light

app/views/projects/walls/show.html.haml

@@ -9,7 +9,7 @@
           = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
         .note-form-actions
           .buttons
-            = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+            = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
 
           .note-form-option
             %a.choose-btn.btn.btn-small.js-choose-note-attachment-button

app/views/projects/wikis/_main_links.html.haml

 %span.pull-right
   - if (@wiki && @wiki.persisted?)
-    = link_to history_project_wiki_path(@project, @wiki), class: "btn grouped" do
+    = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
       Page History
     - if can?(current_user, :write_wiki, @project)
-      = link_to edit_project_wiki_path(@project, @wiki), class: "btn grouped" do
+      = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
         %i.icon-edit
         Edit

app/views/snippets/current_user_index.html.haml

 %h3.page-title
   My Snippets
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
       Add new snippet
-    = link_to snippets_path, class: "btn grouped"  do
+    = link_to snippets_path, class: "btn btn-grouped"  do
       Discover snippets
 
 %p.light

app/views/snippets/index.html.haml

@@ -2,9 +2,9 @@
   Public snippets
 
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
       Add new snippet
-    = link_to user_snippets_path(current_user), class: "btn grouped"  do
+    = link_to user_snippets_path(current_user), class: "btn btn-grouped"  do
       My snippets
 
 %p.light