refactor buttons pt1

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

@@ -5,7 +5,7 @@
 = form_tag admin_users_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "xlarge"
-  = submit_tag "Search", class: "btn submit primary"
+  = submit_tag "Search", class: "btn submit btn-primary"
 %ul.nav.nav-tabs
   %li{class: "#{'active' unless params[:filter]}"}
     = link_to admin_users_path do
@@ -52,7 +52,7 @@
           - if user.blocked
             = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "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 danger"
-          = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger"
+            = 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"
 = paginate @admin_users, theme: "admin"

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

@@ -86,7 +86,7 @@
       %td= select_tag :project_access, options_for_select(Project.access_options), class: "project-access-select chosen span3"
     %tr
-      %td= submit_tag 'Add', class: "btn primary"
+      %td= submit_tag 'Add', class: "btn btn-primary"
       %td
         Read more about project permissions
         %strong= link_to "here", help_permissions_path, class: "vlink"
@@ -124,4 +124,4 @@
         %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 danger"
+        %td= link_to 'Remove from team', admin_project_member_path(project, tm.user), confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove"

app/views/commits/_commit_box.html.haml

@@ -13,7 +13,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 primary grouped" do
+      = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
         %span Browse Code »
     %h3.commit-title.page_title
       = gfm escape_once(@commit.title)

app/views/compare/_form.html.haml

@@ -19,7 +19,7 @@
         = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
       .pull-left
          
-        = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
+        = submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
     - if @refs_are_same
       .alert
         %span Refs are the same

app/views/dashboard/_zero_authorized_projects.html.haml

@@ -6,7 +6,7 @@
     = current_user.projects_limit
     projects. Click on button below to add a new one
     .link_holder
-      = link_to new_project_path, class: "btn primary" do
+      = link_to new_project_path, class: "btn btn-primary" do
         New Project »
   - else
     If you will be added to project - it will be displayed here

app/views/deploy_keys/_form.html.haml

@@ -18,6 +18,6 @@
           = link_to "here", help_ssh_path
     .actions
-      = f.submit 'Save', class: "save-btn btn"
-      = link_to "Cancel", project_deploy_keys_path(@project), class: "btn cancel-btn"
+      = f.submit 'Save', class: "btn-save btn"
+      = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"

app/views/devise/passwords/edit.html.haml

@@ -8,5 +8,5 @@
   %div
     = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
   %div
-    = f.submit "Change my password", class: "btn primary"
+    = f.submit "Change my password", class: "btn btn-primary"
     .right= render partial: "devise/shared/links"

app/views/devise/passwords/new.html.erb

@@ -4,6 +4,6 @@
   <%= f.email_field :email, :placeholder => "Email",  :class => "text" %>
   <br/>
   <br/>
-  <%= f.submit "Reset password", :class => "primary btn"  %>
+  <%= f.submit "Reset password", :class => "btn-primary btn"  %>
   <div class="right"> <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br /></div>
 <% end %>

app/views/devise/registrations/new.html.haml

@@ -12,7 +12,7 @@
   %div
     = f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm password", :required => true
   %div
-    = f.submit "Sign up", :class => "primary btn wide"
+    = f.submit "Sign up", :class => "btn-primary btn wide"
   %br
   %hr
   = link_to "Sign in", new_session_path(resource_name)

app/views/devise/sessions/_new_ldap.html.haml

@@ -3,11 +3,11 @@
   = text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"}
   = password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"}
   %br/
-  = submit_tag "LDAP Sign in", :class => "primary btn"
+  = submit_tag "LDAP Sign in", :class => "btn-primary btn"
   - if devise_mapping.omniauthable?
     - (resource_class.omniauth_providers - [:ldap]).each do |provider|
       %hr/
-      = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary"
+      = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn btn-primary"
       %br/
   %hr/
   %a#other_form_toggle{:href => "#", :onclick => "javascript:$('#new_user').toggle();"} Other Sign in
@@ -24,6 +24,6 @@
         = f.check_box :remember_me
         %span Remember me
   %br/
-  = f.submit "Sign in", :class => "primary btn"
+  = f.submit "Sign in", :class => "btn-primary btn"
   .right
     = render :partial => "devise/shared/links"

app/views/devise/sessions/new.html.haml

@@ -11,7 +11,7 @@
           = f.check_box :remember_me
           %span Remember me
     %br/
-    = f.submit "Sign in", :class => "primary btn wide"
+    = f.submit "Sign in", :class => "btn-primary btn wide"
     .right
       = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
     %br/

app/views/groups/_new_group_member.html.haml

@@ -14,5 +14,5 @@
     .form-actions
       = hidden_field_tag :redirect_to, people_group_path(@group)
-      = f.submit 'Add', class: "btn save-btn"
+      = f.submit 'Add', class: "btn btn-save"

app/views/groups/_new_member.html.haml

@@ -14,5 +14,5 @@
     .form-actions
       = hidden_field_tag :redirect_to, people_group_path(@group, project_id: @project.id)
-      = f.submit 'Add', class: "btn save-btn"
+      = f.submit 'Add', class: "btn btn-save"

app/views/groups/new.html.haml

@@ -10,7 +10,7 @@
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
        
-      = f.submit 'Create group', class: "btn primary"
+      = f.submit 'Create group', class: "btn btn-primary"
   %hr
   .padded
     %ul

app/views/groups/search.html.haml

@@ -4,6 +4,6 @@
       %strong Looking for
     .input
       = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
-      = submit_tag 'Search', class: "btn primary wide"
+      = submit_tag 'Search', class: "btn btn-primary wide"
 - if params[:search].present?
   = render 'search/result'

app/views/hooks/index.html.haml

@@ -18,7 +18,7 @@
     .input
       = f.text_field :url, class: "text_field xxlarge"
        
-      = f.submit "Add Web Hook", class: "btn primary"
+      = f.submit "Add Web Hook", class: "btn btn-primary"
 %hr
 -if @hooks.any?

app/views/issues/_form.html.haml

@@ -44,12 +44,12 @@
     .actions
       - if @issue.new_record?
-        = f.submit 'Submit new issue', class: "btn success"
+        = f.submit 'Submit new issue', class: "btn btn-create"
       -else
-        = f.submit 'Save changes', class: "save-btn btn"
+        = f.submit 'Save changes', class: "btn-save btn"
       - cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue)
-      = link_to "Cancel", cancel_path, class: 'btn cancel-btn'
+      = link_to "Cancel", cancel_path, class: 'btn btn-cancel'

app/views/issues/index.html.haml

@@ -6,7 +6,7 @@
     .right
       .span5
         - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn primary", title: "New Issue", id: "new_issue_link" do
+          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn btn-primary", title: "New Issue", id: "new_issue_link" do
             %i.icon-plus
             New Issue
         = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right  do
@@ -33,7 +33,7 @@
                 = select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone")
                 = hidden_field_tag 'update[issues_ids]', []
                 = hidden_field_tag :status, params[:status]
-              = button_tag "Save", class: "btn update_selected_issues btn-small save-btn"
+              = button_tag "Save", class: "btn update_selected_issues btn-small btn-save"
           .issues_filters
             = form_tag project_issues_path(@project), method: :get  do
               = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels")

app/views/keys/_form.html.haml

@@ -19,6 +19,6 @@
     .actions
-      = f.submit 'Save', class: "btn save-btn"
-      = link_to "Cancel", keys_path, class: "btn cancel-btn"
+      = f.submit 'Save', class: "btn btn-save"
+      = link_to "Cancel", keys_path, class: "btn btn-cancel"

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 danger delete-key right"
+    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove delete-key right"