Dont load bootstrap buttons. Modified css with new buttons

23 files changed, 49 insertions, 44 deletions

diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index cff0251cd5a..8e45dc76ec6 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 btn-small pull-right"
+  = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right"
 %br
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "span6"
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 316e8235cbe..7c3b999afb3 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -13,7 +13,7 @@
   .clearfix
     = f.label :url, "URL:"
     .input
-      = f.text_field :url, class: "text_field xxlarge"
+      = f.text_field :url, class: "text_field xxlarge input-xpadding"
        
       = f.submit "Add System Hook", class: "btn btn-create"
 %hr
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index d641d366ca7..bc297209ae5 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -38,7 +38,7 @@
       .title
         Projects (#{@projects.total_count})
         .pull-right
-          = link_to 'New Project', new_project_path, class: "btn btn-small btn-primary wide"
+          = link_to 'New Project', new_project_path, class: "btn btn-new"
       %ul.well-list
         - @projects.each do |project|
           %li
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index e0647933394..b32f0ae87cc 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -30,7 +30,7 @@
       .title
         Users (#{@users.total_count})
         .pull-right
-          = link_to 'New User', new_admin_user_path, class: "btn btn-small wide btn-primary"
+          = link_to 'New User', new_admin_user_path, class: "btn btn-new"
       %ul.well-list
         - @users.each do |user|
           %li
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
index 860951b871a..63695d7e0b9 100644
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@@ -1,5 +1,10 @@
 %h3.page-title
   Group membership
+  - if current_user.can_create_group?
+    %span.pull-right
+      = link_to new_group_path, class: "btn btn-new" do
+        %i.icon-plus
+        New Group
 %p.light
   Members of group have access to all group projects.
 %hr
@@ -7,11 +12,6 @@
   .title
     %strong Groups
     (#{@groups.count})
-    - if current_user.can_create_group?
-      %span.pull-right
-        = link_to new_group_path, class: "btn btn-small btn-primary" do
-          %i.icon-plus
-          New Group
   %ul.well-list
     - @groups.each do |group|
       %li
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index f2180b9893b..0704874763e 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,5 +1,7 @@
 %h3.page-title
   My SSH keys
+  .pull-right
+    = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
 %p.light
   SSH key allows you to establish a secure connection between your computer and GitLab
   %br
@@ -11,8 +13,6 @@
 .ui-box
   .title
     SSH Keys (#{@keys.count})
-    .pull-right
-      = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
   %ul.well-list#keys-table
     = render @keys
     - if @keys.blank?
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index dd1186fd37c..25bf7912f1e 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -87,4 +87,4 @@
           = link_to "Add Public Key", new_profile_key_path, class: "btn btn-small"
 
   .form-actions
-    = f.submit 'Save', class: "btn btn-save"
+    = f.submit 'Save changes', class: "btn btn-save"
diff --git a/app/views/projects/blob/_actions.html.haml b/app/views/projects/blob/_actions.html.haml
index 456c7432c94..5641c528a4f 100644
--- a/app/views/projects/blob/_actions.html.haml
+++ b/app/views/projects/blob/_actions.html.haml
@@ -1,12 +1,12 @@
 .btn-group.tree-btn-group
   -# only show edit link for text files
   - if @blob.text?
-    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
-  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
+    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-small", disabled: !allowed_tree_edit?
+  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-small", target: "_blank"
   -# only show normal/blame view links for text files
   - if @blob.text?
     - if current_page? project_blame_path(@project, @id)
-      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
+      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-small"
     - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" unless @blob.empty?
-  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
+      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-small" unless @blob.empty?
+  = link_to "history", project_commits_path(@project, @id), class: "btn btn-small"
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index 0d388651e14..a83380841fa 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -14,9 +14,9 @@
       .pull-left
         - if params[:to] && params[:from]
           = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
-        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
+        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge input-xpadding"
         = "..."
-        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
+        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge input-xpadding"
       .pull-left
          
         = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index a1fa3475a84..757b8c00eea 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -1,12 +1,14 @@
 %p.slead
-  Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
+  Deploy keys allow read-only access to repository
 
-%p
-  You can create a deploy key or add existing one
-  = link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
+  = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
     %i.icon-plus
     New Deploy Key
 
+%p.light
+  They can be used for CI, staging or production servers.
+  You can create a deploy key or add existing one
+
 %hr.clearfix
 
 .row
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index f9fc65a71b4..d273a5c64fb 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -4,7 +4,7 @@
     .ui-box.white
       .title
         %strong= @project.name
-        Project Settings:
+        project settings:
       .form-holder
         = form_for(@project, remote: true) do |f|
           %fieldset
@@ -98,7 +98,7 @@
 
 
           .form-actions
-            = f.submit 'Save', class: "btn btn-save"
+            = f.submit 'Save changes', class: "btn btn-save"
 
     - if can?(current_user, :change_namespace, @project)
       .ui-box.ui-box-danger
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index c4b51d09335..a85f50491d6 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -14,7 +14,7 @@
   .clearfix
     = f.label :url, "URL:"
     .input
-      = f.text_field :url, class: "text_field xxlarge"
+      = f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
        
       = f.submit "Add Web Hook", class: "btn btn-create"
 %hr
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index ebe124d8906..50df3ee3b7a 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -6,7 +6,7 @@
     .pull-right
       .span6
         - 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: "btn btn-primary pull-right", 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: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do
             %i.icon-plus
             New Issue
         = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
@@ -14,7 +14,7 @@
           = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
           = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
           = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
-          = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
+          = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }
 
 .row
   .span3
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index f54a213a3f3..9b9da8d1b8f 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,5 +1,5 @@
 - if can? current_user, :write_merge_request, @project
-  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
+  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do
     %i.icon-plus
     New Merge Request
 %h3.page-title
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 0dc9dab872f..825243e773f 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -32,7 +32,7 @@
 
   .form-actions
     - if @milestone.new_record?
-      = f.submit 'Create milestone', class: "btn-save btn"
+      = f.submit 'Create milestone', class: "btn-create btn"
       = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
     -else
       = f.submit 'Save changes', class: "btn-save btn"
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 727fa6149d1..0c0828c9064 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -3,7 +3,7 @@
   %h3.page-title
     Milestones
     - if can? current_user, :admin_milestone, @project
-      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
+      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
         %i.icon-plus
         New Milestone
 
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 30d74e260a9..af80ceaed52 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/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 import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
+      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
         Import team from another project
-      = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
+      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
         New Team Member
 
 %p.light
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 464b1508a7e..4a558826f29 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -29,8 +29,9 @@
       = f.label :commit_message
       .input= f.text_field :message, class: 'span8'
   .actions
-    = f.submit 'Save', class: "btn-save btn"
     - if @wiki && @wiki.persisted?
+      = f.submit 'Save changes', class: "btn-save btn"
       = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
     - else
+      = f.submit 'Create page', class: "btn-create btn"
       = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index d62b46a7e5b..89325856acd 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -12,7 +12,7 @@
 
   - if can?(current_user, :write_wiki, @project)
     .pull-right
-      = link_to '#', class: "add-new-wiki btn btn-small btn-primary" do
+      = link_to '#', class: "add-new-wiki btn btn-new" do
         %i.icon-plus
         New Page
 
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index e783a982ddb..dd01bb99041 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -1,10 +1,9 @@
 = render 'nav'
 %h3.page-title
-  Git Access
+  Git access for
   %strong= @gollum_wiki.path_with_namespace
   = render 'main_links'
 
-%br
 .content
   .project_clone_panel
     .row
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index b60026f4584..a2a9aef04eb 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,12 +1,13 @@
 %h3.page-title
   My Snippets
-  %small share code pastes with others out of git repository
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
       Add new snippet
-    = link_to snippets_path, class: "btn btn-small grouped"  do
+    = link_to snippets_path, class: "btn grouped"  do
       Discover snippets
 
+%p.light
+  Share code pastes with others out of git repository
 %hr
 
 .row
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index c65ed4fb9df..2f6c914a159 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,13 +1,15 @@
 %h3.page-title
   Public snippets
-  %small share code pastes with others out of git repository
 
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
       Add new snippet
-    = link_to user_snippets_path(current_user), class: "btn btn-small grouped"  do
+    = link_to user_snippets_path(current_user), class: "btn grouped"  do
       My snippets
 
+%p.light
+  Public snippets created by you and other users are listed here
+
 %hr
 = render 'snippets'
 
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 5cf1fefe5f0..37f9e7576f5 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -7,7 +7,7 @@
       private
 
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-small", title: "New Snippet" do
       Add new snippet