Download as
Browse Code »

Commit 033aa1a885801c299a20ab39af6f897bb53dc3d4

Authored by Dmitriy Zaporozhets
1 parent 9fdbdc66
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

refactor buttons pt1

Showing 75 changed files with 139 additions and 150 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @033aa1a
@@ -7,11 +7,7 @@ @@ -7,11 +7,7 @@
7 color: #333; 7 color: #333;
8 } 8 }
9 9
10 - &.btn-white {  
11 - background: #FFF;  
12 - }  
13 -  
14 - &.primary { 10 + &.btn-primary {
15 background: #2a79A3; 11 background: #2a79A3;
16 @include linear-gradient(#47A7b7, #2585b5); 12 @include linear-gradient(#47A7b7, #2585b5);
17 border-color: #2A79A3; 13 border-color: #2A79A3;
@@ -58,21 +54,17 @@ @@ -58,21 +54,17 @@
58 } 54 }
59 } 55 }
60 56
61 - &.save-btn { 57 + &.btn-create {
62 @extend .wide; 58 @extend .wide;
63 - @extend .primary;  
64 - }  
65 -  
66 - &.cancel-btn {  
67 - float: right; 59 + @extend .success;
68 } 60 }
69 61
70 - &.wide {  
71 - padding-left: 30px;  
72 - padding-right: 30px; 62 + &.btn-save {
  63 + @extend .wide;
  64 + @extend .btn-primary;
73 } 65 }
74 66
75 - &.danger { 67 + &.btn-remove {
76 @extend .btn-danger; 68 @extend .btn-danger;
77 border-color: #BD362F; 69 border-color: #BD362F;
78 70
@@ -82,8 +74,13 @@ @@ -82,8 +74,13 @@
82 } 74 }
83 } 75 }
84 76
85 - &.danger {  
86 - @extend .btn-danger; 77 + &.btn-cancel {
  78 + float: right;
  79 + }
  80 +
  81 + &.wide {
  82 + padding-left: 20px;
  83 + padding-right: 20px;
87 } 84 }
88 85
89 &.small { 86 &.small {
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @033aa1a
@@ -214,9 +214,11 @@ ul.notes { @@ -214,9 +214,11 @@ ul.notes {
214 * Note Form 214 * Note Form
215 */ 215 */
216 216
217 -.comment-btn, 217 +.comment-btn {
  218 + @extend .create-btn;
  219 +}
218 .reply-btn { 220 .reply-btn {
219 - @extend .save-btn; 221 + @extend .primary;
220 } 222 }
221 .file .content tr.line_holder:hover > td { background: $hover !important; } 223 .file .content tr.line_holder:hover > td { background: $hover !important; }
222 .file .content tr.line_holder:hover > td .line_note_link { 224 .file .content tr.line_holder:hover > td .line_note_link {
app/views/admin/groups/edit.html.haml
  Diff comments   View file @033aa1a
@@ -24,5 +24,5 @@ @@ -24,5 +24,5 @@
24 %li It will change the git path to repositories under this group. 24 %li It will change the git path to repositories under this group.
25 25
26 .form-actions 26 .form-actions
27 - = f.submit 'Rename group', class: "btn danger"  
28 - = link_to 'Cancel', admin_groups_path, class: "btn cancel-btn" 27 + = f.submit 'Rename group', class: "btn btn-remove"
  28 + = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel"
app/views/admin/groups/index.html.haml
  Diff comments   View file @033aa1a
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 %br 8 %br
9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do 9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
10 = text_field_tag :name, params[:name], class: "xlarge" 10 = text_field_tag :name, params[:name], class: "xlarge"
11 - = submit_tag "Search", class: "btn submit primary" 11 + = submit_tag "Search", class: "btn submit btn-primary"
12 12
13 %table 13 %table
14 %thead 14 %thead
@@ -31,5 +31,5 @@ @@ -31,5 +31,5 @@
31 = link_to group.owner_name, admin_user_path(group.owner_id) 31 = link_to group.owner_name, admin_user_path(group.owner_id)
32 %td.bgred 32 %td.bgred
33 = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small" 33 = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small"
34 - = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger" 34 + = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
35 = paginate @groups, theme: "admin" 35 = paginate @groups, theme: "admin"
app/views/admin/groups/new.html.haml
  Diff comments   View file @033aa1a
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12   12  
13 - = f.submit 'Create group', class: "btn primary" 13 + = f.submit 'Create group', class: "btn btn-primary"
14 %hr 14 %hr
15 .padded 15 .padded
16 %ul 16 %ul
app/views/admin/groups/show.html.haml
  Diff comments   View file @033aa1a
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 = form_for [:admin, @group] do |f| 42 = form_for [:admin, @group] do |f|
43 = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'} 43 = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'}
44 %div 44 %div
45 - = f.submit 'Change Owner', class: "btn danger" 45 + = f.submit 'Change Owner', class: "btn btn-remove"
46 = link_to "Cancel", "#", class: "btn change-owner-cancel-link" 46 = link_to "Cancel", "#", class: "btn change-owner-cancel-link"
47 47
48 - if @group.projects.any? 48 - if @group.projects.any?
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 %span.monospace= project.path_with_namespace + ".git" 63 %span.monospace= project.path_with_namespace + ".git"
64 %td= project.users.count 64 %td= project.users.count
65 %td.bgred 65 %td.bgred
66 - = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small" 66 + = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn btn-remove small"
67 67
68 = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do 68 = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do
69 %table.zebra-striped 69 %table.zebra-striped
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"} 88 %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}
89 89
90 %tr 90 %tr
91 - %td= submit_tag 'Add user to projects in group', class: "btn primary" 91 + %td= submit_tag 'Add user to projects in group', class: "btn btn-primary"
92 %td 92 %td
93 Read more about project permissions 93 Read more about project permissions
94 %strong= link_to "here", help_permissions_path, class: "vlink" 94 %strong= link_to "here", help_permissions_path, class: "vlink"
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 .input 110 .input
111 = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' 111 = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
112 .form-actions 112 .form-actions
113 - = submit_tag 'Add', class: "btn primary" 113 + = submit_tag 'Add', class: "btn btn-primary"
114 114
115 :javascript 115 :javascript
116 $(function(){ 116 $(function(){
app/views/admin/hooks/index.html.haml
  Diff comments   View file @033aa1a
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 .input 15 .input
16 = f.text_field :url, class: "text_field xxlarge" 16 = f.text_field :url, class: "text_field xxlarge"
17   17  
18 - = f.submit "Add System Hook", class: "btn primary" 18 + = f.submit "Add System Hook", class: "btn btn-primary"
19 %hr 19 %hr
20 20
21 -if @hooks.any? 21 -if @hooks.any?
app/views/admin/projects/_form.html.haml
  Diff comments   View file @033aa1a
@@ -65,8 +65,8 @@ @@ -65,8 +65,8 @@
65 65
66 66
67 .actions 67 .actions
68 - = f.submit 'Save Project', class: "btn save-btn"  
69 - = link_to 'Cancel', admin_projects_path, class: "btn cancel-btn" 68 + = f.submit 'Save Project', class: "btn btn-save"
  69 + = link_to 'Cancel', admin_projects_path, class: "btn btn-cancel"
70 70
71 71
72 72
app/views/admin/projects/index.html.haml
  Diff comments   View file @033aa1a
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 37
38 38
39 .form-actions 39 .form-actions
40 - = submit_tag "Search", class: "btn submit primary" 40 + = submit_tag "Search", class: "btn submit btn-primary"
41 = link_to "Reset", admin_projects_path, class: "btn" 41 = link_to "Reset", admin_projects_path, class: "btn"
42 .span8 42 .span8
43 .ui-box 43 .ui-box
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 = link_to project.name_with_namespace, [:admin, project] 53 = link_to project.name_with_namespace, [:admin, project]
54 .right 54 .right
55 = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn small" 55 = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn small"
56 - = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn small danger" 56 + = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
57 - if @projects.blank? 57 - if @projects.blank?
58 %p.nothing_here_message 0 projects matches 58 %p.nothing_here_message 0 projects matches
59 - else 59 - else
app/views/admin/projects/members/_form.html.haml
  Diff comments   View file @033aa1a
@@ -12,5 +12,5 @@ @@ -12,5 +12,5 @@
12 12
13 %br 13 %br
14 .actions 14 .actions
15 - = f.submit 'Save', class: "btn primary" 15 + = f.submit 'Save', class: "btn btn-primary"
16 = link_to 'Cancel', :back, class: "btn" 16 = link_to 'Cancel', :back, class: "btn"
app/views/admin/projects/show.html.haml
  Diff comments   View file @033aa1a
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 = link_to tm.name, admin_user_path(tm) 130 = link_to tm.name, admin_user_path(tm)
131 %td= @project.project_access_human(tm) 131 %td= @project.project_access_human(tm)
132 %td= link_to 'Edit Access', edit_admin_project_member_path(@project, tm), class: "btn small" 132 %td= link_to 'Edit Access', edit_admin_project_member_path(@project, tm), class: "btn small"
133 - %td= link_to 'Remove from team', admin_project_member_path(@project, tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small" 133 + %td= link_to 'Remove from team', admin_project_member_path(@project, tm), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove small"
134 134
135 %br 135 %br
136 %h5 Add new team member 136 %h5 Add new team member
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"} 147 %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}
148 148
149 %tr 149 %tr
150 - %td= submit_tag 'Add', class: "btn primary" 150 + %td= submit_tag 'Add', class: "btn btn-primary"
151 %td 151 %td
152 Read more about project permissions 152 Read more about project permissions
153 %strong= link_to "here", help_permissions_path, class: "vlink" 153 %strong= link_to "here", help_permissions_path, class: "vlink"
app/views/admin/teams/edit.html.haml
  Diff comments   View file @033aa1a
@@ -19,5 +19,5 @@ @@ -19,5 +19,5 @@
19 %li It will change web url for access team and team projects. 19 %li It will change web url for access team and team projects.
20 20
21 .form-actions 21 .form-actions
22 - = f.submit 'Rename team', class: "btn danger"  
23 - = link_to 'Cancel', admin_teams_path, class: "btn cancel-btn" 22 + = f.submit 'Rename team', class: "btn btn-remove"
  23 + = link_to 'Cancel', admin_teams_path, class: "btn btn-cancel"
app/views/admin/teams/index.html.haml
  Diff comments   View file @033aa1a
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 = form_tag admin_teams_path, method: :get, class: 'form-inline' do 9 = form_tag admin_teams_path, method: :get, class: 'form-inline' do
10 = text_field_tag :name, params[:name], class: "xlarge" 10 = text_field_tag :name, params[:name], class: "xlarge"
11 - = submit_tag "Search", class: "btn submit primary" 11 + = submit_tag "Search", class: "btn submit btn-primary"
12 12
13 %table 13 %table
14 %thead 14 %thead
@@ -33,6 +33,6 @@ @@ -33,6 +33,6 @@
33 = link_to team.owner.name, admin_user_path(team.owner_id) 33 = link_to team.owner.name, admin_user_path(team.owner_id)
34 %td.bgred 34 %td.bgred
35 = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn small" 35 = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn small"
36 - = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn small danger" 36 + = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn small btn-remove"
37 37
38 = paginate @teams, theme: "admin" 38 = paginate @teams, theme: "admin"
app/views/admin/teams/members/_form.html.haml
  Diff comments   View file @033aa1a
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 16
17 %br 17 %br
18 .actions 18 .actions
19 - = submit_tag 'Save', class: "btn primary" 19 + = submit_tag 'Save', class: "btn btn-primary"
20 = link_to 'Cancel', :back, class: "btn" 20 = link_to 'Cancel', :back, class: "btn"
app/views/admin/teams/members/new.html.haml
  Diff comments   View file @033aa1a
@@ -26,4 +26,4 @@ @@ -26,4 +26,4 @@
26 %td 26 %td
27 %span= check_box_tag :group_admin 27 %span= check_box_tag :group_admin
28 %span Admin? 28 %span Admin?
29 - %td= submit_tag 'Add', class: "btn primary", id: :add_members_to_team 29 + %td= submit_tag 'Add', class: "btn btn-primary", id: :add_members_to_team
app/views/admin/teams/new.html.haml
  Diff comments   View file @033aa1a
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12   12  
13 - = f.submit 'Create team', class: "btn primary" 13 + = f.submit 'Create team', class: "btn btn-primary"
14 %hr 14 %hr
15 .padded 15 .padded
16 %ul 16 %ul
app/views/admin/teams/projects/_form.html.haml
  Diff comments   View file @033aa1a
@@ -12,5 +12,5 @@ @@ -12,5 +12,5 @@
12 12
13 %br 13 %br
14 .actions 14 .actions
15 - = submit_tag 'Save', class: "btn primary" 15 + = submit_tag 'Save', class: "btn btn-primary"
16 = link_to 'Cancel', :back, class: "btn" 16 = link_to 'Cancel', :back, class: "btn"
app/views/admin/teams/projects/new.html.haml
  Diff comments   View file @033aa1a
@@ -20,4 +20,4 @@ @@ -20,4 +20,4 @@
20 %tr 20 %tr
21 %td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' 21 %td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
22 %td= select_tag :greatest_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" } 22 %td= select_tag :greatest_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
23 - %td= submit_tag 'Add', class: "btn primary", id: :assign_projects_to_team 23 + %td= submit_tag 'Add', class: "btn btn-primary", id: :assign_projects_to_team
app/views/admin/teams/show.html.haml
  Diff comments   View file @033aa1a
@@ -36,13 +36,13 @@ @@ -36,13 +36,13 @@
36 = form_for @team, url: admin_team_path(@team) do |f| 36 = form_for @team, url: admin_team_path(@team) do |f|
37 = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'} 37 = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'}
38 %div 38 %div
39 - = f.submit 'Change Owner', class: "btn danger" 39 + = f.submit 'Change Owner', class: "btn btn-remove"
40 = link_to "Cancel", "#", class: "btn change-owner-cancel-link" 40 = link_to "Cancel", "#", class: "btn change-owner-cancel-link"
41 41
42 %fieldset 42 %fieldset
43 %legend 43 %legend
44 Members (#{@team.members.count}) 44 Members (#{@team.members.count})
45 - %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn success small right", id: :add_members_to_team 45 + %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary small right", id: :add_members_to_team
46 - if @team.members.any? 46 - if @team.members.any?
47 %table#members_list 47 %table#members_list
48 %thead 48 %thead
@@ -62,12 +62,12 @@ @@ -62,12 +62,12 @@
62 %td.bgred 62 %td.bgred
63 = link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn small" 63 = link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn small"
64   64  
65 - = link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn danger small", id: "remove_member_#{member.id}" 65 + = 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}"
66 66
67 %fieldset 67 %fieldset
68 %legend 68 %legend
69 Projects (#{@team.projects.count}) 69 Projects (#{@team.projects.count})
70 - %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn success small right", id: :assign_projects_to_team 70 + %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary small right", id: :assign_projects_to_team
71 - if @team.projects.any? 71 - if @team.projects.any?
72 %table#projects_list 72 %table#projects_list
73 %thead 73 %thead
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 %td.bgred 84 %td.bgred
85 = link_to 'Edit', edit_admin_team_project_path(@team, project), class: "btn small" 85 = link_to 'Edit', edit_admin_team_project_path(@team, project), class: "btn small"
86   86  
87 - = link_to 'Relegate', admin_team_project_path(@team, project), confirm: 'Remove project from team. Are you sure?', method: :delete, class: "btn danger small", id: "relegate_project_#{project.id}" 87 + = 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}"
88 88
89 :javascript 89 :javascript
90 $(function(){ 90 $(function(){
app/views/admin/users/_form.html.haml
  Diff comments   View file @033aa1a
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small" 66 = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small"
67 - else 67 - else
68 %p Blocked users will be removed from all projects & will not be able to login to GitLab. 68 %p Blocked users will be removed from all projects & will not be able to login to GitLab.
69 - = link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger" 69 + = 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"
70 %fieldset 70 %fieldset
71 %legend Profile 71 %legend Profile
72 .clearfix 72 .clearfix
@@ -80,8 +80,8 @@ @@ -80,8 +80,8 @@
80 .input= f.text_field :twitter 80 .input= f.text_field :twitter
81 81
82 .actions 82 .actions
83 - = f.submit 'Save', class: "btn save-btn" 83 + = f.submit 'Save', class: "btn btn-save"
84 - if @admin_user.new_record? 84 - if @admin_user.new_record?
85 - = link_to 'Cancel', admin_users_path, class: "btn cancel-btn" 85 + = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
86 - else 86 - else
87 - = link_to 'Cancel', admin_user_path(@admin_user), class: "btn cancel-btn" 87 + = link_to 'Cancel', admin_user_path(@admin_user), class: "btn btn-cancel"
app/views/admin/users/index.html.haml
  Diff comments   View file @033aa1a
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 = form_tag admin_users_path, method: :get, class: 'form-inline' do 6 = form_tag admin_users_path, method: :get, class: 'form-inline' do
7 = text_field_tag :name, params[:name], class: "xlarge" 7 = text_field_tag :name, params[:name], class: "xlarge"
8 - = submit_tag "Search", class: "btn submit primary" 8 + = submit_tag "Search", class: "btn submit btn-primary"
9 %ul.nav.nav-tabs 9 %ul.nav.nav-tabs
10 %li{class: "#{'active' unless params[:filter]}"} 10 %li{class: "#{'active' unless params[:filter]}"}
11 = link_to admin_users_path do 11 = link_to admin_users_path do
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 - if user.blocked 52 - if user.blocked
53 = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success" 53 = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success"
54 - else 54 - else
55 - = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger"  
56 - = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger" 55 + = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small btn-remove"
  56 + = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small btn-remove"
57 57
58 = paginate @admin_users, theme: "admin" 58 = paginate @admin_users, theme: "admin"
app/views/admin/users/show.html.haml
  Diff comments   View file @033aa1a
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 %td= select_tag :project_access, options_for_select(Project.access_options), class: "project-access-select chosen span3" 86 %td= select_tag :project_access, options_for_select(Project.access_options), class: "project-access-select chosen span3"
87 87
88 %tr 88 %tr
89 - %td= submit_tag 'Add', class: "btn primary" 89 + %td= submit_tag 'Add', class: "btn btn-primary"
90 %td 90 %td
91 Read more about project permissions 91 Read more about project permissions
92 %strong= link_to "here", help_permissions_path, class: "vlink" 92 %strong= link_to "here", help_permissions_path, class: "vlink"
@@ -124,4 +124,4 @@ @@ -124,4 +124,4 @@
124 %td= link_to project.name_with_namespace, admin_project_path(project) 124 %td= link_to project.name_with_namespace, admin_project_path(project)
125 %td= tm.project_access_human 125 %td= tm.project_access_human
126 %td= link_to 'Edit Access', edit_admin_project_member_path(project, tm.user), class: "btn small" 126 %td= link_to 'Edit Access', edit_admin_project_member_path(project, tm.user), class: "btn small"
127 - %td= link_to 'Remove from team', admin_project_member_path(project, tm.user), confirm: 'Are you sure?', method: :delete, class: "btn small danger" 127 + %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
  Diff comments   View file @033aa1a
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 %ul.dropdown-menu 13 %ul.dropdown-menu
14 %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch) 14 %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
15 %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff) 15 %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
16 - = link_to project_tree_path(@project, @commit), class: "btn primary grouped" do 16 + = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
17 %span Browse Code » 17 %span Browse Code »
18 %h3.commit-title.page_title 18 %h3.commit-title.page_title
19 = gfm escape_once(@commit.title) 19 = gfm escape_once(@commit.title)
app/views/compare/_form.html.haml
  Diff comments   View file @033aa1a
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" 19 = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
20 .pull-left 20 .pull-left
21   21  
22 - = submit_tag "Compare", class: "btn primary wide commits-compare-btn" 22 + = submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
23 - if @refs_are_same 23 - if @refs_are_same
24 .alert 24 .alert
25 %span Refs are the same 25 %span Refs are the same
app/views/dashboard/_zero_authorized_projects.html.haml
  Diff comments   View file @033aa1a
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 = current_user.projects_limit 6 = current_user.projects_limit
7 projects. Click on button below to add a new one 7 projects. Click on button below to add a new one
8 .link_holder 8 .link_holder
9 - = link_to new_project_path, class: "btn primary" do 9 + = link_to new_project_path, class: "btn btn-primary" do
10 New Project » 10 New Project »
11 - else 11 - else
12 If you will be added to project - it will be displayed here 12 If you will be added to project - it will be displayed here
app/views/deploy_keys/_form.html.haml
  Diff comments   View file @033aa1a
@@ -18,6 +18,6 @@ @@ -18,6 +18,6 @@
18 = link_to "here", help_ssh_path 18 = link_to "here", help_ssh_path
19 19
20 .actions 20 .actions
21 - = f.submit 'Save', class: "save-btn btn"  
22 - = link_to "Cancel", project_deploy_keys_path(@project), class: "btn cancel-btn" 21 + = f.submit 'Save', class: "btn-save btn"
  22 + = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
23 23
app/views/devise/passwords/edit.html.haml
  Diff comments   View file @033aa1a
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
8 %div 8 %div
9 = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password" 9 = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
10 %div 10 %div
11 - = f.submit "Change my password", class: "btn primary" 11 + = f.submit "Change my password", class: "btn btn-primary"
12 .right= render partial: "devise/shared/links" 12 .right= render partial: "devise/shared/links"
app/views/devise/passwords/new.html.erb
  Diff comments   View file @033aa1a
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 <%= f.email_field :email, :placeholder => "Email", :class => "text" %> 4 <%= f.email_field :email, :placeholder => "Email", :class => "text" %>
5 <br/> 5 <br/>
6 <br/> 6 <br/>
7 - <%= f.submit "Reset password", :class => "primary btn" %> 7 + <%= f.submit "Reset password", :class => "btn-primary btn" %>
8 <div class="right"> <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br /></div> 8 <div class="right"> <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br /></div>
9 <% end %> 9 <% end %>
app/views/devise/registrations/new.html.haml
  Diff comments   View file @033aa1a
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %div 12 %div
13 = f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm password", :required => true 13 = f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm password", :required => true
14 %div 14 %div
15 - = f.submit "Sign up", :class => "primary btn wide" 15 + = f.submit "Sign up", :class => "btn-primary btn wide"
16 %br 16 %br
17 %hr 17 %hr
18 = link_to "Sign in", new_session_path(resource_name) 18 = link_to "Sign in", new_session_path(resource_name)
app/views/devise/sessions/_new_ldap.html.haml
  Diff comments   View file @033aa1a
@@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
3 = text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"} 3 = text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"}
4 = password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} 4 = password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"}
5 %br/ 5 %br/
6 - = submit_tag "LDAP Sign in", :class => "primary btn" 6 + = submit_tag "LDAP Sign in", :class => "btn-primary btn"
7 - if devise_mapping.omniauthable? 7 - if devise_mapping.omniauthable?
8 - (resource_class.omniauth_providers - [:ldap]).each do |provider| 8 - (resource_class.omniauth_providers - [:ldap]).each do |provider|
9 %hr/ 9 %hr/
10 - = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" 10 + = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn btn-primary"
11 %br/ 11 %br/
12 %hr/ 12 %hr/
13 %a#other_form_toggle{:href => "#", :onclick => "javascript:$('#new_user').toggle();"} Other Sign in 13 %a#other_form_toggle{:href => "#", :onclick => "javascript:$('#new_user').toggle();"} Other Sign in
@@ -24,6 +24,6 @@ @@ -24,6 +24,6 @@
24 = f.check_box :remember_me 24 = f.check_box :remember_me
25 %span Remember me 25 %span Remember me
26 %br/ 26 %br/
27 - = f.submit "Sign in", :class => "primary btn" 27 + = f.submit "Sign in", :class => "btn-primary btn"
28 .right 28 .right
29 = render :partial => "devise/shared/links" 29 = render :partial => "devise/shared/links"
app/views/devise/sessions/new.html.haml
  Diff comments   View file @033aa1a
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 = f.check_box :remember_me 11 = f.check_box :remember_me
12 %span Remember me 12 %span Remember me
13 %br/ 13 %br/
14 - = f.submit "Sign in", :class => "primary btn wide" 14 + = f.submit "Sign in", :class => "btn-primary btn wide"
15 .right 15 .right
16 = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn" 16 = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
17 %br/ 17 %br/
app/views/groups/_new_group_member.html.haml
  Diff comments   View file @033aa1a
@@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
14 14
15 .form-actions 15 .form-actions
16 = hidden_field_tag :redirect_to, people_group_path(@group) 16 = hidden_field_tag :redirect_to, people_group_path(@group)
17 - = f.submit 'Add', class: "btn save-btn" 17 + = f.submit 'Add', class: "btn btn-save"
18 18
app/views/groups/_new_member.html.haml
  Diff comments   View file @033aa1a
@@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
14 14
15 .form-actions 15 .form-actions
16 = hidden_field_tag :redirect_to, people_group_path(@group, project_id: @project.id) 16 = hidden_field_tag :redirect_to, people_group_path(@group, project_id: @project.id)
17 - = f.submit 'Add', class: "btn save-btn" 17 + = f.submit 'Add', class: "btn btn-save"
18 18
app/views/groups/new.html.haml
  Diff comments   View file @033aa1a
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12 &nbsp; 12 &nbsp;
13 - = f.submit 'Create group', class: "btn primary" 13 + = f.submit 'Create group', class: "btn btn-primary"
14 %hr 14 %hr
15 .padded 15 .padded
16 %ul 16 %ul
app/views/groups/search.html.haml
  Diff comments   View file @033aa1a
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 %strong Looking for 4 %strong Looking for
5 .input 5 .input
6 = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" 6 = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
7 - = submit_tag 'Search', class: "btn primary wide" 7 + = submit_tag 'Search', class: "btn btn-primary wide"
8 - if params[:search].present? 8 - if params[:search].present?
9 = render 'search/result' 9 = render 'search/result'
app/views/hooks/index.html.haml
  Diff comments   View file @033aa1a
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 .input 18 .input
19 = f.text_field :url, class: "text_field xxlarge" 19 = f.text_field :url, class: "text_field xxlarge"
20 &nbsp; 20 &nbsp;
21 - = f.submit "Add Web Hook", class: "btn primary" 21 + = f.submit "Add Web Hook", class: "btn btn-primary"
22 %hr 22 %hr
23 23
24 -if @hooks.any? 24 -if @hooks.any?
app/views/issues/_form.html.haml
  Diff comments   View file @033aa1a
@@ -44,12 +44,12 @@ @@ -44,12 +44,12 @@
44 44
45 .actions 45 .actions
46 - if @issue.new_record? 46 - if @issue.new_record?
47 - = f.submit 'Submit new issue', class: "btn success" 47 + = f.submit 'Submit new issue', class: "btn btn-create"
48 -else 48 -else
49 - = f.submit 'Save changes', class: "save-btn btn" 49 + = f.submit 'Save changes', class: "btn-save btn"
50 50
51 - cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue) 51 - cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue)
52 - = link_to "Cancel", cancel_path, class: 'btn cancel-btn' 52 + = link_to "Cancel", cancel_path, class: 'btn btn-cancel'
53 53
54 54
55 55
app/views/issues/index.html.haml
  Diff comments   View file @033aa1a
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 .right 6 .right
7 .span5 7 .span5
8 - if can? current_user, :write_issue, @project 8 - if can? current_user, :write_issue, @project
9 - = 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 9 + = 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
10 %i.icon-plus 10 %i.icon-plus
11 New Issue 11 New Issue
12 = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do 12 = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 = select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone") 33 = select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone")
34 = hidden_field_tag 'update[issues_ids]', [] 34 = hidden_field_tag 'update[issues_ids]', []
35 = hidden_field_tag :status, params[:status] 35 = hidden_field_tag :status, params[:status]
36 - = button_tag "Save", class: "btn update_selected_issues btn-small save-btn" 36 + = button_tag "Save", class: "btn update_selected_issues btn-small btn-save"
37 .issues_filters 37 .issues_filters
38 = form_tag project_issues_path(@project), method: :get do 38 = form_tag project_issues_path(@project), method: :get do
39 = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels") 39 = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels")
app/views/keys/_form.html.haml
  Diff comments   View file @033aa1a
@@ -19,6 +19,6 @@ @@ -19,6 +19,6 @@
19 19
20 20
21 .actions 21 .actions
22 - = f.submit 'Save', class: "btn save-btn"  
23 - = link_to "Cancel", keys_path, class: "btn cancel-btn" 22 + = f.submit 'Save', class: "btn btn-save"
  23 + = link_to "Cancel", keys_path, class: "btn btn-cancel"
24 24
app/views/keys/_show.html.haml
  Diff comments   View file @033aa1a
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
8 = time_ago_in_words(key.created_at) 8 = time_ago_in_words(key.created_at)
9 ago 9 ago
10 %td 10 %td
11 - = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn small danger delete-key right" 11 + = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove delete-key right"
12 12
app/views/keys/show.html.haml
  Diff comments   View file @033aa1a
@@ -11,4 +11,4 @@ @@ -11,4 +11,4 @@
11 11
12 %pre= @key.key 12 %pre= @key.key
13 .right 13 .right
14 - = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn danger delete-key" 14 + = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
app/views/merge_requests/_form.html.haml
  Diff comments   View file @033aa1a
@@ -51,19 +51,19 @@ @@ -51,19 +51,19 @@
51 51
52 .form-actions 52 .form-actions
53 - if @merge_request.new_record? 53 - if @merge_request.new_record?
54 - = f.submit 'Submit merge request', class: "btn success" 54 + = f.submit 'Submit merge request', class: "btn btn-create"
55 -else 55 -else
56 - = f.submit 'Save changes', class: "save-btn btn" 56 + = f.submit 'Save changes', class: "btn btn-save"
57 - if @merge_request.new_record? 57 - if @merge_request.new_record?
58 - = link_to project_merge_requests_path(@project), class: "btn cancel-btn" do 58 + = link_to project_merge_requests_path(@project), class: "btn btn-cancel" do
59 Cancel 59 Cancel
60 - else 60 - else
61 - = link_to project_merge_request_path(@project, @merge_request), class: "btn cancel-btn" do 61 + = link_to project_merge_request_path(@project, @merge_request), class: "btn btn-cancel" do
62 Cancel 62 Cancel
63 63
64 :javascript 64 :javascript
65 $(function(){ 65 $(function(){
66 - disableButtonIfEmptyField("#merge_request_title", ".save-btn"); 66 + disableButtonIfEmptyField("#merge_request_title", ".btn-save");
67 67
68 var source_branch = $("#merge_request_source_branch") 68 var source_branch = $("#merge_request_source_branch")
69 , target_branch = $("#merge_request_target_branch"); 69 , target_branch = $("#merge_request_target_branch");
app/views/merge_requests/index.html.haml
  Diff comments   View file @033aa1a
1 - if can? current_user, :write_merge_request, @project 1 - if can? current_user, :write_merge_request, @project
2 - = link_to new_project_merge_request_path(@project), class: "right btn primary", title: "New Merge Request" do 2 + = link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
3 %i.icon-plus 3 %i.icon-plus
4 New Merge Request 4 New Merge Request
5 %h3.page_title 5 %h3.page_title
app/views/milestones/_form.html.haml
  Diff comments   View file @033aa1a
@@ -32,16 +32,16 @@ @@ -32,16 +32,16 @@
32 32
33 .form-actions 33 .form-actions
34 - if @milestone.new_record? 34 - if @milestone.new_record?
35 - = f.submit 'Create milestone', class: "save-btn btn"  
36 - = link_to "Cancel", project_milestones_path(@project), class: "btn cancel-btn" 35 + = f.submit 'Create milestone', class: "btn-save btn"
  36 + = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
37 -else 37 -else
38 - = f.submit 'Save changes', class: "save-btn btn"  
39 - = link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn cancel-btn" 38 + = f.submit 'Save changes', class: "btn-save btn"
  39 + = link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel"
40 40
41 41
42 :javascript 42 :javascript
43 $(function() { 43 $(function() {
44 - disableButtonIfEmptyField("#milestone_title", ".save-btn"); 44 + disableButtonIfEmptyField("#milestone_title", ".btn-save");
45 $( ".datepicker" ).datepicker({ 45 $( ".datepicker" ).datepicker({
46 dateFormat: "yy-mm-dd", 46 dateFormat: "yy-mm-dd",
47 onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) } 47 onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) }
app/views/milestones/show.html.haml
  Diff comments   View file @033aa1a
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 %hr 25 %hr
26 %p 26 %p
27 %span All issues for this milestone are closed. You may close milestone now. 27 %span All issues for this milestone are closed. You may close milestone now.
28 - = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small danger" 28 + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small btn-remove"
29 29
30 .ui-box.ui-box-show 30 .ui-box.ui-box-show
31 .ui-box-head 31 .ui-box-head
app/views/profiles/account.html.haml
  Diff comments   View file @033aa1a
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 %p.cgray 24 %p.cgray
25 - if current_user.private_token 25 - if current_user.private_token
26 = text_field_tag "token", current_user.private_token, class: "xxlarge large_text" 26 = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
27 - = f.submit 'Reset', confirm: "Are you sure?", class: "btn primary btn-build-token" 27 + = f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token"
28 - else 28 - else
29 %span You don`t have one yet. Click generate to fix it. 29 %span You don`t have one yet. Click generate to fix it.
30 = f.submit 'Generate', class: "btn success btn-build-token" 30 = f.submit 'Generate', class: "btn success btn-build-token"
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 = f.password_field :password_confirmation, required: true 49 = f.password_field :password_confirmation, required: true
50 .clearfix 50 .clearfix
51 .input 51 .input
52 - = f.submit 'Save password', class: "btn save-btn" 52 + = f.submit 'Save password', class: "btn btn-save"
53 53
54 54
55 55
@@ -75,6 +75,6 @@ @@ -75,6 +75,6 @@
75 %li It will change web url for personal projects. 75 %li It will change web url for personal projects.
76 %li It will change the git path to repositories for personal projects. 76 %li It will change the git path to repositories for personal projects.
77 .input 77 .input
78 - = f.submit 'Save username', class: "btn save-btn" 78 + = f.submit 'Save username', class: "btn btn-save"
79 79
80 80
app/views/profiles/show.html.haml
  Diff comments   View file @033aa1a
@@ -93,4 +93,4 @@ @@ -93,4 +93,4 @@
93 = link_to "Add Public Key", new_key_path, class: "btn small" 93 = link_to "Add Public Key", new_key_path, class: "btn small"
94 94
95 .form-actions 95 .form-actions
96 - = f.submit 'Save', class: "btn save-btn" 96 + = f.submit 'Save', class: "btn btn-save"
app/views/projects/_form.html.haml
  Diff comments   View file @033aa1a
@@ -77,9 +77,9 @@ @@ -77,9 +77,9 @@
77 %br 77 %br
78 78
79 .actions 79 .actions
80 - = f.submit 'Save', class: "btn save-btn" 80 + = f.submit 'Save', class: "btn btn-save"
81 = link_to 'Cancel', @project, class: "btn" 81 = link_to 'Cancel', @project, class: "btn"
82 - unless @project.new_record? 82 - unless @project.new_record?
83 - if can?(current_user, :remove_project, @project) 83 - if can?(current_user, :remove_project, @project)
84 .right 84 .right
85 - = link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn danger" 85 + = link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
app/views/projects/_new_form.html.haml
  Diff comments   View file @033aa1a
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 Project name is 7 Project name is
8 .input 8 .input
9 = f.text_field :name, placeholder: "Example Project", class: "xxlarge" 9 = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
10 - = f.submit 'Create project', class: "btn success project-submit" 10 + = f.submit 'Create project', class: "btn btn-create project-submit"
11 11
12 - if current_user.can_select_namespace? 12 - if current_user.can_select_namespace?
13 .clearfix 13 .clearfix
app/views/projects/empty.html.haml
  Diff comments   View file @033aa1a
@@ -31,4 +31,4 @@ @@ -31,4 +31,4 @@
31 31
32 - if can? current_user, :remove_project, @project 32 - if can? current_user, :remove_project, @project
33 .prepend-top-20 33 .prepend-top-20
34 - = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn danger right" 34 + = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove right"
app/views/projects/teams/available.html.haml
  Diff comments   View file @033aa1a
@@ -17,6 +17,6 @@ @@ -17,6 +17,6 @@
17 17
18 18
19 .actions 19 .actions
20 - = submit_tag 'Assign', class: "btn save-btn"  
21 - = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn" 20 + = submit_tag 'Assign', class: "btn btn-create"
  21 + = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
22 22
app/views/protected_branches/index.html.haml
  Diff comments   View file @033aa1a
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 .span3 24 .span3
25 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"}) 25 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
26 &nbsp; 26 &nbsp;
27 - = f.submit 'Protect', class: "primary btn" 27 + = f.submit 'Protect', class: "btn-primary btn"
28 28
29 - unless @branches.empty? 29 - unless @branches.empty?
30 %table 30 %table
app/views/search/show.html.haml
  Diff comments   View file @033aa1a
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 %span Looking for 4 %span Looking for
5 .input 5 .input
6 = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" 6 = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
7 - = submit_tag 'Search', class: "btn primary wide" 7 + = submit_tag 'Search', class: "btn btn-primary wide"
8 .clearfix 8 .clearfix
9 .row 9 .row
10 .span3 10 .span3
app/views/services/_gitlab_ci.html.haml
  Diff comments   View file @033aa1a
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 40
41 41
42 .form-actions 42 .form-actions
43 - = f.submit 'Save', class: 'btn save-btn' 43 + = f.submit 'Save', class: 'btn btn-save'
44 &nbsp; 44 &nbsp;
45 - if @service.valid? && @service.active 45 - if @service.valid? && @service.active
46 = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small' 46 = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small'
app/views/snippets/_form.html.haml
  Diff comments   View file @033aa1a
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 = f.hidden_field :content, class: 'snippet-file-content' 27 = f.hidden_field :content, class: 'snippet-file-content'
28 28
29 .form-actions 29 .form-actions
30 - = f.submit 'Save', class: "save-btn btn" 30 + = f.submit 'Save', class: "btn-save btn"
31 = link_to "Cancel", project_snippets_path(@project), class: " btn" 31 = link_to "Cancel", project_snippets_path(@project), class: " btn"
32 - unless @snippet.new_record? 32 - unless @snippet.new_record?
33 .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" 33 .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
app/views/team_members/_form.html.haml
  Diff comments   View file @033aa1a
@@ -19,5 +19,5 @@ @@ -19,5 +19,5 @@
19 .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" 19 .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
20 20
21 .actions 21 .actions
22 - = f.submit 'Save', class: "btn save-btn"  
23 - = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn" 22 + = f.submit 'Save', class: "btn btn-save"
  23 + = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
app/views/team_members/_show.html.haml
  Diff comments   View file @033aa1a
@@ -23,6 +23,6 @@ @@ -23,6 +23,6 @@
23 - elsif user.blocked 23 - elsif user.blocked
24 %span.btn.disabled.blocked Blocked 24 %span.btn.disabled.blocked Blocked
25 - elsif allow_admin 25 - elsif allow_admin
26 - = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "very_small btn danger" do 26 + = 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
27 %i.icon-minus.icon-white 27 %i.icon-minus.icon-white
28 28
app/views/team_members/_show_team.html.haml
  Diff comments   View file @033aa1a
@@ -11,5 +11,5 @@ @@ -11,5 +11,5 @@
11 .right 11 .right
12 - if allow_admin 12 - if allow_admin
13 .left 13 .left
14 - = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn danger small" do 14 + = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do
15 %i.icon-minus.icon-white 15 %i.icon-minus.icon-white
app/views/team_members/import.html.haml
  Diff comments   View file @033aa1a
@@ -12,6 +12,6 @@ @@ -12,6 +12,6 @@
12 .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true) 12 .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
13 13
14 .actions 14 .actions
15 - = submit_tag 'Import', class: "btn save-btn"  
16 - = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn" 15 + = submit_tag 'Import', class: "btn btn-save"
  16 + = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
17 17
app/views/team_members/index.html.haml
  Diff comments   View file @033aa1a
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 Import team from another project 12 Import team from another project
13 = link_to available_project_teams_path(@project), class: "btn small grouped", title: "Assign project to team of users" do 13 = link_to available_project_teams_path(@project), class: "btn small grouped", title: "Assign project to team of users" do
14 Assign project to Team of users 14 Assign project to Team of users
15 - = link_to new_project_team_member_path(@project), class: "btn success small grouped", title: "New Team Member" do 15 + = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
16 New Team Member 16 New Team Member
17 17
18 %hr 18 %hr
app/views/team_members/show.html.haml
  Diff comments   View file @033aa1a
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 .team_member_show 3 .team_member_show
4 - if can? current_user, :admin_project, @project 4 - if can? current_user, :admin_project, @project
5 - = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn danger" 5 + = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
6 .profile_avatar_holder 6 .profile_avatar_holder
7 = image_tag gravatar_icon(@member.email, 60), class: "borders" 7 = image_tag gravatar_icon(@member.email, 60), class: "borders"
8 %h3.page_title 8 %h3.page_title
app/views/teams/edit.html.haml
  Diff comments   View file @033aa1a
@@ -17,6 +17,6 @@ @@ -17,6 +17,6 @@
17 = f.text_field :path, placeholder: "opensource", class: "xxlarge left" 17 = f.text_field :path, placeholder: "opensource", class: "xxlarge left"
18 .clearfix 18 .clearfix
19 .input.span3.center 19 .input.span3.center
20 - = f.submit 'Save team changes', class: "btn primary" 20 + = f.submit 'Save team changes', class: "btn btn-primary"
21 .input.span3.center 21 .input.span3.center
22 - = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn danger" 22 + = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn btn-remove"
app/views/teams/members/_form.html.haml
  Diff comments   View file @033aa1a
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 16
17 %br 17 %br
18 .actions 18 .actions
19 - = submit_tag 'Save', class: "btn primary" 19 + = submit_tag 'Save', class: "btn btn-save"
20 = link_to 'Cancel', :back, class: "btn" 20 = link_to 'Cancel', :back, class: "btn"
app/views/teams/members/_show.html.haml
  Diff comments   View file @033aa1a
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium project-access-select span2" 17 = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium project-access-select span2"
18 .left.span2 18 .left.span2
19 %span 19 %span
20 - Admin access  
21 = check_box_tag :group_admin, true, @team.admin?(user) 20 = check_box_tag :group_admin, true, @team.admin?(user)
  21 + Admin access
22 .right 22 .right
23 - if current_user == user 23 - if current_user == user
24 %span.btn.disabled This is you! 24 %span.btn.disabled This is you!
@@ -27,5 +27,5 @@ @@ -27,5 +27,5 @@
27 - elsif user.blocked 27 - elsif user.blocked
28 %span.btn.disabled.blocked Blocked 28 %span.btn.disabled.blocked Blocked
29 - elsif allow_admin 29 - elsif allow_admin
30 - = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "very_small btn danger" do 30 + = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "very_small btn btn-remove" do
31 %i.icon-minus.icon-white 31 %i.icon-minus.icon-white
app/views/teams/members/index.html.haml
  Diff comments   View file @033aa1a
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 - if can? current_user, :manage_user_team, @team 8 - if can? current_user, :manage_user_team, @team
9 %span.right 9 %span.right
10 - = link_to new_team_member_path(@team), class: "btn success small grouped", title: "New Team Member" do 10 + = link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
11 New Team Member 11 New Team Member
12 %hr 12 %hr
13 13
app/views/teams/members/new.html.haml
  Diff comments   View file @033aa1a
@@ -25,4 +25,4 @@ @@ -25,4 +25,4 @@
25 %td 25 %td
26 %span= check_box_tag :group_admin 26 %span= check_box_tag :group_admin
27 %span Admin? 27 %span Admin?
28 - %td= submit_tag 'Add', class: "btn primary", id: :add_members_to_team 28 + %td= submit_tag 'Add User', class: "btn btn-create", id: :add_members_to_team
app/views/teams/members/show.html.haml
  Diff comments   View file @033aa1a
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 .team_member_show 4 .team_member_show
5 - if can? current_user, :admin_project, @project 5 - if can? current_user, :admin_project, @project
6 - = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn danger" 6 + = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
7 .profile_avatar_holder 7 .profile_avatar_holder
8 = image_tag gravatar_icon(user.email, 60), class: "borders" 8 = image_tag gravatar_icon(user.email, 60), class: "borders"
9 %h3.page_title 9 %h3.page_title
app/views/teams/new.html.haml
  Diff comments   View file @033aa1a
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
12 &nbsp; 12 &nbsp;
13 - = f.submit 'Create team', class: "btn primary" 13 + = f.submit 'Create team', class: "btn btn-primary"
14 %hr 14 %hr
15 .padded 15 .padded
16 %ul 16 %ul
app/views/teams/projects/_form.html.haml
  Diff comments   View file @033aa1a
@@ -12,5 +12,5 @@ @@ -12,5 +12,5 @@
12 12
13 %br 13 %br
14 .actions 14 .actions
15 - = submit_tag 'Save', class: "btn primary"  
16 - = link_to 'Cancel', :back, class: "btn" 15 + = submit_tag 'Save', class: "btn btn-save"
  16 + = link_to 'Cancel', :back, class: "btn btn-cancel"
app/views/teams/projects/edit.html.haml
  Diff comments   View file @033aa1a
1 -%h3  
2 - Edit max access in #{@project.name} for #{@team.name} team 1 +%h3.page_title
  2 + Edit max access in #{link_to @project.name_with_namespace, @project} for #{link_to(@team.name, team_path(@team))} team
3 3
4 %hr 4 %hr
5 -%table.zebra-striped  
6 - %tr  
7 - %td Project:  
8 - %td= @project.name  
9 - %tr  
10 - %td Team:  
11 - %td= @team.name  
12 - %tr  
13 - %td Since:  
14 - %td= assigned_since(@team, @project).stamp("Nov 11, 2010")  
15 5
16 = render 'form' 6 = render 'form'
app/views/teams/projects/index.html.haml
  Diff comments   View file @033aa1a
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any? 7 - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any?
8 %span.right 8 %span.right
9 - = link_to new_team_project_path(@team), class: "btn success small grouped", title: "New Team Member" do 9 + = link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
10 Assign project to Team 10 Assign project to Team
11 11
12 %hr 12 %hr
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 - if current_user.can?(:admin_user_team, @team) 30 - if current_user.can?(:admin_user_team, @team)
31 %td.bgred 31 %td.bgred
32 = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn small" 32 = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn small"
33 - = 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 danger small" 33 + = 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"
34 34
35 - else 35 - else
36 %p.nothing_here_message This team has no projects yet 36 %p.nothing_here_message This team has no projects yet
app/views/teams/projects/new.html.haml
  Diff comments   View file @033aa1a
@@ -20,4 +20,4 @@ @@ -20,4 +20,4 @@
20 %tr 20 %tr
21 %td= select_tag :project_ids, options_from_collection_for_select(@avaliable_projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' 21 %td= select_tag :project_ids, options_from_collection_for_select(@avaliable_projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
22 %td= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" } 22 %td= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" }
23 - %td= submit_tag 'Add', class: "btn primary", id: :assign_projects_to_team 23 + %td= submit_tag 'Add Project', class: "btn btn-create", id: :assign_projects_to_team
app/views/tree/edit.html.haml
  Diff comments   View file @033aa1a
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %strong= @ref 10 %strong= @ref
11 %span.options 11 %span.options
12 .btn-group.tree-btn-group 12 .btn-group.tree-btn-group
13 - = link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small cancel-btn", confirm: "Are you sure?" 13 + = link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small btn-cancel", confirm: "Are you sure?"
14 .file_content.code 14 .file_content.code
15 %pre#editor= @tree.data 15 %pre#editor= @tree.data
16 16
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 .message 27 .message
28 to branch 28 to branch
29 %strong= @ref 29 %strong= @ref
30 - = link_to "Cancel", project_tree_path(@project, @id), class: "btn cancel-btn", confirm: "Are you sure?" 30 + = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?"
31 31
32 :javascript 32 :javascript
33 var ace_mode = "#{@tree.language.try(:ace_mode)}"; 33 var ace_mode = "#{@tree.language.try(:ace_mode)}";
app/views/wikis/_form.html.haml
  Diff comments   View file @033aa1a
@@ -23,5 +23,5 @@ @@ -23,5 +23,5 @@
23 = f.label :content 23 = f.label :content
24 .input= f.text_area :content, class: 'span8 js-gfm-input' 24 .input= f.text_area :content, class: 'span8 js-gfm-input'
25 .actions 25 .actions
26 - = f.submit 'Save', class: "save-btn btn"  
27 - = link_to "Cancel", project_wiki_path(@project, :index), class: "btn cancel-btn" 26 + = f.submit 'Save', class: "btn-save btn"
  27 + = link_to "Cancel", project_wiki_path(@project, :index), class: "btn btn-cancel"
app/views/wikis/edit.html.haml
  Diff comments   View file @033aa1a
@@ -4,5 +4,5 @@ @@ -4,5 +4,5 @@
4 4
5 .right 5 .right
6 - if can? current_user, :admin_wiki, @project 6 - if can? current_user, :admin_wiki, @project
7 - = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn small danger" do 7 + = 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
8 Delete this page 8 Delete this page
9 \ No newline at end of file 9 \ No newline at end of file