Download as
Browse Code »

Commit fb617c61b95aef4615346a5e554db469384d9b6c

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

refactor buttons pt2

Showing 49 changed files with 90 additions and 90 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @fb617c6
... ... @@ -92,7 +92,7 @@
92 92 background-color: #ccc;
93 93 }
94 94  
95   - &.very_small {
  95 + &.btn-tiny {
96 96 font-size: 11px;
97 97 padding: 2px 6px;
98 98 line-height: 16px;
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @fb617c6
... ... @@ -215,10 +215,10 @@ ul.notes {
215 215 */
216 216  
217 217 .comment-btn {
218   - @extend .create-btn;
  218 + @extend .btn-create;
219 219 }
220 220 .reply-btn {
221   - @extend .primary;
  221 + @extend .btn-primary;
222 222 }
223 223 .file .content tr.line_holder:hover > td { background: $hover !important; }
224 224 .file .content tr.line_holder:hover > td .line_note_link {
... ...
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -6,7 +6,7 @@
6 6 = link_to admin_projects_path do
7 7 %h1= Project.count
8 8 %hr
9   - = link_to 'New Project', new_project_path, class: "btn small"
  9 + = link_to 'New Project', new_project_path, class: "btn btn-small"
10 10 .span4
11 11 .ui-box
12 12 %h5.title Groups
... ... @@ -14,7 +14,7 @@
14 14 = link_to admin_groups_path do
15 15 %h1= Group.count
16 16 %hr
17   - = link_to 'New Group', new_admin_group_path, class: "btn small"
  17 + = link_to 'New Group', new_admin_group_path, class: "btn btn-small"
18 18 .span4
19 19 .ui-box
20 20 %h5.title Users
... ... @@ -22,7 +22,7 @@
22 22 = link_to admin_users_path do
23 23 %h1= User.count
24 24 %hr
25   - = link_to 'New User', new_admin_user_path, class: "btn small"
  25 + = link_to 'New User', new_admin_user_path, class: "btn btn-small"
26 26  
27 27 .row
28 28 .span4
... ...
app/views/admin/groups/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,7 +4,7 @@
4 4 allows you to keep projects organized.
5 5 Use groups for uniting related projects.
6 6  
7   - = link_to 'New Group', new_admin_group_path, class: "btn small right"
  7 + = link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
8 8 %br
9 9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
10 10 = text_field_tag :name, params[:name], class: "xlarge"
... ... @@ -30,6 +30,6 @@
30 30 %td
31 31 = link_to group.owner_name, admin_user_path(group.owner_id)
32 32 %td.bgred
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 btn-remove"
  33 + = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
  34 + = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
35 35 = paginate @groups, theme: "admin"
... ...
app/views/admin/hooks/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -33,7 +33,7 @@
33 33 %td
34 34 = link_to admin_hook_path(hook) do
35 35 %strong= hook.url
36   - = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn small right"
  36 + = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
37 37 %td POST
38 38 %td
39   - = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small right"
  39 + = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @fb617c6
1 1 %h3.page_title
2 2 Projects
3   - = link_to 'New Project', new_project_path, class: "btn small right"
  3 + = link_to 'New Project', new_project_path, class: "btn btn-small right"
4 4  
5 5 %hr
6 6  
... ... @@ -52,8 +52,8 @@
52 52 %i.icon-lock.cgreen
53 53 = link_to project.name_with_namespace, [:admin, project]
54 54 .right
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 btn-remove"
  55 + = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
  56 + = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
57 57 - if @projects.blank?
58 58 %p.nothing_here_message 0 projects matches
59 59 - else
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -129,7 +129,7 @@
129 129 %td
130 130 = link_to tm.name, admin_user_path(tm)
131 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 btn-small"
133 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 135 %br
... ...
app/views/admin/teams/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -3,7 +3,7 @@
3 3 %small
4 4 simple Teams description
5 5  
6   - = link_to 'New Team', new_admin_team_path, class: "btn small right"
  6 + = link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
7 7 %br
8 8  
9 9 = form_tag admin_teams_path, method: :get, class: 'form-inline' do
... ... @@ -32,7 +32,7 @@
32 32 %td
33 33 = link_to team.owner.name, admin_user_path(team.owner_id)
34 34 %td.bgred
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 btn-remove"
  35 + = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
  36 + = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
37 37  
38 38 = paginate @teams, theme: "admin"
... ...
app/views/admin/teams/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -42,7 +42,7 @@
42 42 %fieldset
43 43 %legend
44 44 Members (#{@team.members.count})
45   - %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary small right", id: :add_members_to_team
  45 + %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
46 46 - if @team.members.any?
47 47 %table#members_list
48 48 %thead
... ... @@ -60,14 +60,14 @@
60 60 %td= @team.human_default_projects_access(member)
61 61 %td= @team.admin?(member) ? "Admin" : "Member"
62 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 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 btn-remove 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 btn-small", id: "remove_member_#{member.id}"
66 66  
67 67 %fieldset
68 68 %legend
69 69 Projects (#{@team.projects.count})
70   - %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary small right", id: :assign_projects_to_team
  70 + %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
71 71 - if @team.projects.any?
72 72 %table#projects_list
73 73 %thead
... ... @@ -82,7 +82,7 @@
82 82 %td
83 83 %span= @team.human_max_project_access(project)
84 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 btn-small"
86 86  
87 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  
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @fb617c6
... ... @@ -63,10 +63,10 @@
63 63 .alert.alert-error
64 64 - if @admin_user.blocked
65 65 %p This user is blocked and is not able to login to GitLab
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 btn-small"
67 67 - else
68 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 btn-remove"
  69 + = link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
70 70 %fieldset
71 71 %legend Profile
72 72 .clearfix
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @fb617c6
1 1 %h3.page_title
2 2 Users
3   - = link_to 'New User', new_admin_user_path, class: "btn small right"
  3 + = link_to 'New User', new_admin_user_path, class: "btn btn-small right"
4 4 %br
5 5  
6 6 = form_tag admin_users_path, method: :get, class: 'form-inline' do
... ... @@ -44,15 +44,15 @@
44 44 %td= user.username
45 45 %td= user.email
46 46 %td= user.users_projects.count
47   - %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn small"
  47 + %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
48 48 %td.bgred
49 49 - if user == current_user
50 50 %span.cred It's you!
51 51 - else
52 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 btn-small success"
54 54 - else
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"
  55 + = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
  56 + = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"
57 57  
58 58 = paginate @admin_users, theme: "admin"
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -123,5 +123,5 @@
123 123 %tr
124 124 %td= link_to project.name_with_namespace, admin_project_path(project)
125 125 %td= tm.project_access_human
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 btn-remove"
  126 + %td= link_to 'Edit Access', edit_admin_project_member_path(project, tm.user), class: "btn btn-small"
  127 + %td= link_to 'Remove from team', admin_project_member_path(project, tm.user), confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove"
... ...
app/views/commits/_diffs.html.haml
  Diff comments   View file @fb617c6
... ... @@ -33,7 +33,7 @@
33 33 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
34 34 %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
35 35  
36   - = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn very_small right view-file'} do
  36 + = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
37 37 View file @
38 38 %span.commit-short-id= @commit.short_id(6)
39 39  
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 (#{groups.count})
6 6 - if current_user.can_create_group?
7 7 %span.right
8   - = link_to new_group_path, class: "btn very_small info" do
  8 + = link_to new_group_path, class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Group
11 11 %ul.well-list
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 (#{@projects_count})
6 6 - if current_user.can_create_project?
7 7 %span.right
8   - = link_to new_project_path, class: "btn very_small info" do
  8 + = link_to new_project_path, class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Project
11 11  
... ...
app/views/dashboard/_teams.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,7 +4,7 @@
4 4 %small
5 5 (#{@teams.count})
6 6 %span.right
7   - = link_to new_team_path, class: "btn very_small info" do
  7 + = link_to new_team_path, class: "btn btn-tiny info" do
8 8 %i.icon-plus
9 9 New Team
10 10 %ul.well-list
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,7 +4,7 @@
4 4 (#{@projects.total_count})
5 5 - if current_user.can_create_project?
6 6 %span.right
7   - = link_to new_project_path, class: "btn very_small info" do
  7 + = link_to new_project_path, class: "btn btn-tiny info" do
8 8 %i.icon-plus
9 9 New Project
10 10  
... ...
app/views/deploy_keys/_show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -8,5 +8,5 @@
8 8 = time_ago_in_words(key.created_at)
9 9 ago
10 10 %td
11   - = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "danger btn delete-key small right"
  11 + = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small right"
12 12  
... ...
app/views/deploy_keys/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,7 +4,7 @@
4 4 Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
5 5  
6 6 - if can? current_user, :admin_project, @project
7   - = link_to new_project_deploy_key_path(@project), class: "btn small", title: "New Deploy Key" do
  7 + = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
8 8 Add Deploy Key
9 9 - if @keys.any?
10 10 %table
... ...
app/views/deploy_keys/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -11,4 +11,4 @@
11 11 %hr
12 12 %pre= @key.key
13 13 .right
14   - = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "danger btn delete-key"
  14 + = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 (#{projects.count})
6 6 - if can? current_user, :manage_group, @group
7 7 %span.right
8   - = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
  8 + = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Project
11 11 %ul.well-list
... ...
app/views/groups/show.html.haml
  Diff comments   View file @fb617c6
1 1 .projects
2 2 .activities.span8
3 3 = render "events/event_last_push", event: @last_push
4   - = link_to dashboard_path, class: 'btn very_small' do
  4 + = link_to dashboard_path, class: 'btn btn-tiny' do
5 5 ← To dashboard
6 6  
7 7 %span.cgray You will only see events from projects in this group
... ...
app/views/hooks/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -38,5 +38,5 @@
38 38 %span.monospace= hook.url
39 39 %td
40 40 .right
41   - = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small grouped"
42   - = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small grouped"
  41 + = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
  42 + = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,15 +4,15 @@
4 4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
5 5 .right
6 6 - if issue.notes.any?
7   - %span.btn.small.disabled.grouped
  7 + %span.btn.btn-small.disabled.grouped
8 8 %i.icon-comment
9 9 = issue.notes.count
10 10 - if can? current_user, :modify_issue, issue
11 11 - if issue.closed
12   - = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put, class: "btn small grouped reopen_issue", remote: true
  12 + = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put, class: "btn btn-small grouped reopen_issue", remote: true
13 13 - else
14   - = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn small grouped close_issue", remote: true
15   - = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link grouped" do
  14 + = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
  15 + = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
16 16 %i.icon-edit
17 17 Edit
18 18  
... ...
app/views/keys/_show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -8,5 +8,5 @@
8 8 = time_ago_in_words(key.created_at)
9 9 ago
10 10 %td
11   - = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn small btn-remove delete-key right"
  11 + = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
12 12  
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @fb617c6
... ... @@ -2,19 +2,19 @@
2 2 .right
3 3 .left
4 4 - if merge_request.merged?
5   - %span.btn.small.disabled.grouped
  5 + %span.btn.btn-small.disabled.grouped
6 6 %strong
7 7 %i.icon-ok
8 8 = "MERGED"
9 9 - if merge_request.notes.any?
10   - %span.btn.small.disabled.grouped
  10 + %span.btn.btn-small.disabled.grouped
11 11 %i.icon-comment
12 12 = merge_request.mr_and_commit_notes.count
13 13 - if merge_request.milestone_id?
14   - %span.btn.small.disabled.grouped
  14 + %span.btn.btn-small.disabled.grouped
15 15 %i.icon-time
16 16 = merge_request.milestone.title
17   - %span.btn.small.disabled.grouped
  17 + %span.btn.btn-small.disabled.grouped
18 18 = merge_request.source_branch
19 19 →
20 20 = merge_request.target_branch
... ...
app/views/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @fb617c6
... ... @@ -31,7 +31,7 @@
31 31 .automerge_widget.cannot_be_merged{style: "display:none"}
32 32 .alert.alert-info
33 33 %span
34   - = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
  34 + = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
35 35  
36 36 %strong This request can't be merged with GitLab. You should do it manually
37 37  
... ...
app/views/milestones/_milestone.html.haml
  Diff comments   View file @fb617c6
1 1 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
2 2 .right
3 3 - if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
4   - = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn small edit-milestone-link grouped" do
  4 + = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
5 5 %i.icon-edit
6 6 Edit
7 7 %h4
... ...
app/views/milestones/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -3,7 +3,7 @@
3 3 %h3.page_title
4 4 Milestones
5 5 - if can? current_user, :admin_milestone, @project
6   - = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn small", title: "New Milestone"
  6 + = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
7 7 %br
8 8 %div.ui-box
9 9 .title
... ...
app/views/milestones/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -10,12 +10,12 @@
10 10 .span6
11 11 .right
12 12 - unless @milestone.closed
13   - = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn small grouped", title: "New Issue" do
  13 + = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
14 14 %i.icon-plus
15 15 New Issue
16 16 = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
17 17 - if can?(current_user, :admin_milestone, @project)
18   - = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do
  18 + = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
19 19 %i.icon-edit
20 20 Edit
21 21  
... ... @@ -25,7 +25,7 @@
25 25 %hr
26 26 %p
27 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 btn-remove"
  28 + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn btn-small btn-remove"
29 29  
30 30 .ui-box.ui-box-show
31 31 .ui-box-head
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @fb617c6
... ... @@ -26,7 +26,7 @@
26 26 .attachment
27 27 %h6 Attachment:
28 28 .file_name.js-attachment-filename File name...
29   - %a.choose-btn.btn.small.js-choose-note-attachment-button Choose File ...
  29 + %a.choose-btn.btn.btn-small.js-choose-note-attachment-button Choose File ...
30 30 .hint Any file up to 10 MB
31 31  
32 32 = f.file_field :attachment, class: "js-note-attachment-input"
... ...
app/views/profiles/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -65,13 +65,13 @@
65 65 %li
66 66 %p
67 67 Need a group for several dependent projects?
68   - = link_to new_group_path, class: "btn very_small" do
  68 + = link_to new_group_path, class: "btn btn-tiny" do
69 69 Create a group
70 70 - if current_user.can_create_team?
71 71 %li
72 72 %p
73 73 Want to share a team between projects?
74   - = link_to new_team_path, class: "btn very_small" do
  74 + = link_to new_team_path, class: "btn btn-tiny" do
75 75 Create a team
76 76 %fieldset
77 77 %legend
... ... @@ -90,7 +90,7 @@
90 90 %span.right
91 91 = link_to pluralize(current_user.keys.count, 'key'), keys_path
92 92 .padded
93   - = link_to "Add Public Key", new_key_path, class: "btn small"
  93 + = link_to "Add Public Key", new_key_path, class: "btn btn-small"
94 94  
95 95 .form-actions
96 96 = f.submit 'Save', class: "btn btn-save"
... ...
app/views/projects/_new_form.html.haml
  Diff comments   View file @fb617c6
... ... @@ -24,11 +24,11 @@
24 24 .clearfix
25 25 .input.light
26 26 Need a group for several dependent projects?
27   - = link_to new_group_path, class: "btn very_small" do
  27 + = link_to new_group_path, class: "btn btn-tiny" do
28 28 Create a group
29 29 - if current_user.can_create_team?
30 30 .clearfix
31 31 .input.light
32 32 Want to share a project between team?
33   - = link_to new_team_path, class: "btn very_small" do
  33 + = link_to new_team_path, class: "btn btn-tiny" do
34 34 Create a team
... ...
app/views/protected_branches/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -51,4 +51,4 @@
51 51 (branch was removed from repository)
52 52 %td
53 53 - if can? current_user, :admin_project, @project
54   - = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small"
  54 + = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small"
... ...
app/views/snippets/_blob.html.haml
  Diff comments   View file @fb617c6
... ... @@ -3,7 +3,7 @@
3 3 %i.icon-file
4 4 %strong= @snippet.file_name
5 5 %span.options
6   - = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn very_small", target: "_blank"
  6 + = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
7 7 .file_content.code
8 8 - unless @snippet.content.empty?
9 9 %div{class: user_color_scheme_class}
... ...
app/views/snippets/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 %small share code pastes with others out of git repository
6 6  
7 7 - if can? current_user, :write_snippet, @project
8   - = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
  8 + = link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do
9 9 Add new snippet
10 10 %br
11 11 %table
... ...
app/views/snippets/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,7 +4,7 @@
4 4 = @snippet.title
5 5 %small= @snippet.file_name
6 6 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
7   - = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn small right"
  7 + = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right"
8 8  
9 9 %br
10 10 %div= render 'blob'
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -19,10 +19,10 @@
19 19 - if current_user == user
20 20 %span.btn.disabled This is you!
21 21 - if @project.namespace_owner == user
22   - %span.btn.disabled.success Owner
  22 + %span.btn.disabled.btn-success Owner
23 23 - elsif user.blocked
24 24 %span.btn.disabled.blocked Blocked
25 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 btn-remove" do
  26 + = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove" do
27 27 %i.icon-minus.icon-white
28 28  
... ...
app/views/team_members/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -8,9 +8,9 @@
8 8  
9 9 - if can? current_user, :admin_team_member, @project
10 10 %span.right
11   - = link_to import_project_team_members_path(@project), class: "btn small grouped", title: "Import team from another project" do
  11 + = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
12 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 btn-small grouped", title: "Assign project to team of users" do
14 14 Assign project to Team of users
15 15 = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
16 16 New Team Member
... ...
app/views/teams/_projects.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 (#{projects.count})
6 6 - if can? current_user, :manage_user_team, @team
7 7 %span.right
8   - = link_to new_team_project_path(@team), class: "btn very_small info" do
  8 + = link_to new_team_project_path(@team), class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 Assign Project
11 11 %ul.well-list
... ...
app/views/teams/members/_show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -23,9 +23,9 @@
23 23 - if current_user == user
24 24 %span.btn.disabled This is you!
25 25 - if @team.owner == user
26   - %span.btn.disabled.success Owner
  26 + %span.btn.disabled.btn-success Owner
27 27 - elsif user.blocked
28 28 %span.btn.disabled.blocked Blocked
29 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 btn-remove" do
  30 + = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove" do
31 31 %i.icon-minus.icon-white
... ...
app/views/teams/projects/index.html.haml
  Diff comments   View file @fb617c6
... ... @@ -29,7 +29,7 @@
29 29  
30 30 - if current_user.can?(:admin_user_team, @team)
31 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 btn-small"
33 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 35 - else
... ...
app/views/teams/show.html.haml
  Diff comments   View file @fb617c6
1 1 .projects
2 2 .activities.span8
3   - = link_to dashboard_path, class: 'btn very_small' do
  3 + = link_to dashboard_path, class: 'btn btn-tiny' do
4 4 ← To dashboard
5 5  
6 6 %span.cgray Events and projects are filtered in scope of team
... ...
app/views/tree/_blob_actions.html.haml
  Diff comments   View file @fb617c6
1 1 .btn-group.tree-btn-group
2 2 -# only show edit link for text files
3 3 - if @tree.text?
4   - = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small", disabled: !allowed_tree_edit?
5   - = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
  4 + = link_to "edit", edit_project_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
  5 + = link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank"
6 6 -# only show normal/blame view links for text files
7 7 - if @tree.text?
8 8 - if current_page? project_blame_path(@project, @id)
9   - = link_to "normal view", project_tree_path(@project, @id), class: "btn very_small"
  9 + = link_to "normal view", project_tree_path(@project, @id), class: "btn btn-tiny"
10 10 - else
11   - = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
12   - = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
  11 + = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
  12 + = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
... ...
app/views/tree/_tree.html.haml
  Diff comments   View file @fb617c6
... ... @@ -24,7 +24,7 @@
24 24 %th Name
25 25 %th Last Update
26 26 %th Last Commit
27   - %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
  27 + %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right"
28 28  
29 29 - if tree.up_dir?
30 30 %tr.tree-item
... ...
app/views/tree/edit.html.haml
  Diff comments   View file @fb617c6
... ... @@ -10,7 +10,7 @@
10 10 %strong= @ref
11 11 %span.options
12 12 .btn-group.tree-btn-group
13   - = link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small btn-cancel", confirm: "Are you sure?"
  13 + = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
14 14 .file_content.code
15 15 %pre#editor= @tree.data
16 16  
... ...
app/views/users/show.html.haml
  Diff comments   View file @fb617c6
... ... @@ -5,7 +5,7 @@
5 5 = @user.name
6 6 - if @user == current_user
7 7 .right
8   - = link_to profile_path, class: 'btn small' do
  8 + = link_to profile_path, class: 'btn btn-small' do
9 9 %i.icon-edit
10 10 Edit Profile
11 11 %br
... ...
app/views/wikis/edit.html.haml
  Diff comments   View file @fb617c6
... ... @@ -4,5 +4,5 @@
4 4  
5 5 .right
6 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 btn-remove" do
  7 + = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
8 8 Delete this page
9 9 \ No newline at end of file
... ...
app/views/wikis/show.html.haml
  Diff comments   View file @fb617c6
1 1 %h3.page_title
2 2 = @wiki.title
3 3 %span.right
4   - = link_to pages_project_wikis_path(@project), class: "btn small grouped" do
  4 + = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
5 5 Pages
6 6 - if can? current_user, :write_wiki, @project
7   - = link_to history_project_wiki_path(@project, @wiki), class: "btn small grouped" do
  7 + = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
8 8 History
9   - = link_to edit_project_wiki_path(@project, @wiki), class: "btn small grouped" do
  9 + = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
10 10 %i.icon-edit
11 11 Edit
12 12 %br
... ...