Download as
Browse Code »

Commit 4d9c3f3123f43978702c60bb2d87885377b3d837

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

Bootstrap: btn replacing

Showing 16 changed files with 53 additions and 63 deletions   Show diff stats
app/views/admin/projects/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -31,7 +31,7 @@
31 31 .clear
32 32 %br
33 33 .actions
34   - = f.submit 'Save', :class => "grey-button"
  34 + = f.submit 'Save', :class => "btn"
35 35  
36 36 :javascript
37 37 $(function(){
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -19,4 +19,4 @@
19 19 %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
20 20  
21 21 = paginate @admin_projects
22   -= link_to 'New Project', new_admin_project_path, :class => "grey-button"
  22 += link_to 'New Project', new_admin_project_path, :class => "btn"
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -31,7 +31,7 @@
31 31 = @admin_project.description
32 32 %tr
33 33 %td{:colspan => 2}
34   - = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "grey-button"
  34 + = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "btn"
35 35  
36 36  
37 37 .span-14
... ... @@ -53,7 +53,7 @@
53 53  
54 54 %tr
55 55 %td{ :colspan => 3 }
56   - = submit_tag 'Add', :class => "positive-button"
  56 + = submit_tag 'Add', :class => "btn primary"
57 57  
58 58 %table.round-borders
59 59 %thead
... ...
app/views/admin/team_members/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -27,7 +27,7 @@
27 27 = f.select :repo_access, options_for_select(Repository.access_options, @admin_team_member.repo_access), {}, :class => "repo-access-select"
28 28 %br
29 29 .actions
30   - = f.submit 'Save', :class => "grey-button"
  30 + = f.submit 'Save', :class => "btn"
31 31  
32 32 :css
33 33 form select {
... ...
app/views/admin/team_members/index.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -25,4 +25,4 @@
25 25 %br
26 26  
27 27 = paginate @admin_team_members
28   -= link_to 'New Team Member', new_admin_team_member_path, :class => "grey-button"
  28 += link_to 'New Team Member', new_admin_team_member_path, :class => "btn"
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -46,4 +46,4 @@
46 46 .clear
47 47 %br
48 48 .actions
49   - = f.submit 'Save', :class => "grey-button"
  49 + = f.submit 'Save', :class => "btn"
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -18,4 +18,4 @@
18 18  
19 19 = paginate @admin_users
20 20 %br
21   -= link_to 'New User', new_admin_user_path, :class => "grey-button"
  21 += link_to 'New User', new_admin_user_path, :class => "btn"
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -41,7 +41,7 @@
41 41 = @admin_user.twitter
42 42 %tr
43 43 %td{:colspan => 2}
44   - = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "grey-button"
  44 + = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "btn"
45 45  
46 46 .span-14
47 47 %h2 Projects
... ... @@ -66,4 +66,4 @@
66 66 %td= link_to 'Edit', edit_admin_team_member_path(tm)
67 67 %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
68 68  
69   - = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "grey-button"
  69 + = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "btn"
... ...
app/views/deploy_keys/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -14,5 +14,5 @@
14 14 %td= f.text_area :key, :style => "width:300px; height:130px"
15 15 %br
16 16 .merge-tabs
17   - = f.submit 'Save', :class => "positive-button"
  17 + = f.submit 'Save', :class => "primary btn"
18 18  
... ...
app/views/issues/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -44,7 +44,7 @@
44 44 %br
45 45 %br
46 46 .merge-tabs
47   - = f.submit 'Save', :class => "positive-button"
  47 + = f.submit 'Save', :class => "primary btn"
48 48  
49 49 - unless @issue.new_record?
50 50 .right
... ...
app/views/merge_requests/_head.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -2,11 +2,4 @@
2 2 = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
3 3 %span
4 4 Merge Requests
5   -
6   -
7   - - if current_page?(project_merge_requests_path(@project))
8   - - if can? current_user, :write_merge_request, @project
9   - = link_to new_project_merge_request_path(@project), :class => "add_new", :title => "New Merge request" do
10   - Add new
11   -
12 5  
... ...
app/views/merge_requests/index.html.haml
  Diff comments   View file @4d9c3f3
1   -= render "merge_requests/head"
2   -
3 1 .left.issues_filter
4 2 = form_tag project_merge_requests_path(@project), :method => :get do
5 3 .left
... ... @@ -14,17 +12,17 @@
14 12 .clear
15 13 %hr
16 14  
17   -- if @merge_requests.count > 0
18   - %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
19   - .data
20   - = render @merge_requests
21   -
22   - .clear
23   - %br
24 15  
25   -- unless @merge_requests.count > 0 || params[:f] == "2"
26   - .notice_holder
27   - %li Merge Requests do not exist yet.
  16 +.row
  17 + .span10
  18 + - if @merge_requests.count > 0
  19 + %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
  20 + .data
  21 + = render @merge_requests
  22 + .span4
28 23 - if can? current_user, :write_merge_request, @project
29   - %li You can add a new one by clicking on "Add New" button
30   -
  24 + .alert-message.block-message.info
  25 + %p You can open a new merge request.
  26 + - if current_page?(project_merge_requests_path(@project))
  27 + = link_to new_project_merge_request_path(@project), :class => "btn small", :title => "New Merge request" do
  28 + Add new
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @4d9c3f3
1   -%div
  1 += form_for [@project, @note], :remote => "true", :multipart => true do |f|
2 2 %h3 Leave a note
3   - = form_for [@project, @note], :remote => "true", :multipart => true do |f|
4   - -if @note.errors.any?
5   - .errors.error
6   - - @note.errors.full_messages.each do |msg|
7   - %div= msg
  3 + -if @note.errors.any?
  4 + .alert-message.block-message.error
  5 + - @note.errors.full_messages.each do |msg|
  6 + %div= msg
8 7  
9   - = f.hidden_field :noteable_id
10   - = f.hidden_field :noteable_type
11   - = f.text_area :note, :size => 255
  8 + = f.hidden_field :noteable_id
  9 + = f.hidden_field :noteable_type
  10 + = f.text_area :note, :size => 255
12 11  
13   - .row
14   - .span6
15   - %h5 Notify via email:
16   - .clearfix
17   - = label_tag :notify do
18   - = check_box_tag :notify, 1, @note.noteable_type != "Commit"
19   - %span Project team
  12 + .row
  13 + .span6
  14 + %h5 Notify via email:
  15 + .clearfix
  16 + = label_tag :notify do
  17 + = check_box_tag :notify, 1, @note.noteable_type != "Commit"
  18 + %span Project team
20 19  
21   - -if @note.noteable_type == "Commit"
22   - = label_tag :notify_author do
23   - = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
24   - %span Commit author
25   - .span6
26   - %h5 Attachment:
27   - .clearfix
28   - = f.label :attachment, "Any file, < 10 MB"
29   - .input= f.file_field :attachment, :class => "input-file"
  20 + -if @note.noteable_type == "Commit"
  21 + = label_tag :notify_author do
  22 + = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
  23 + %span Commit author
  24 + .span6
  25 + %h5 Attachment:
  26 + .clearfix
  27 + = f.label :attachment, "Any file, < 10 MB"
  28 + .input= f.file_field :attachment, :class => "input-file"
30 29  
31 30  
32   - = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
  31 + = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
... ...
app/views/profile/design.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -18,5 +18,5 @@
18 18 Dark code preview
19 19 .clear
20 20 .buttons
21   - = f.submit 'Save', :class => "grey-button"
  21 + = f.submit 'Save', :class => "btn"
22 22  
... ...
app/views/profile/password.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -18,7 +18,7 @@
18 18 %br
19 19 = f.password_field :password_confirmation
20 20 .buttons
21   - = f.submit 'Save', :class => "grey-button"
  21 + = f.submit 'Save', :class => "btn"
22 22 .clear
23 23  
24 24 .ui-box.width-100p
... ... @@ -40,5 +40,5 @@
40 40 - if current_user.private_token
41 41 = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
42 42 - else
43   - = f.submit 'Generate', :class => "positive-button"
  43 + = f.submit 'Generate', :class => "btn"
44 44  
... ...
app/views/projects/_form.html.haml
  Diff comments   View file @4d9c3f3
... ... @@ -47,7 +47,7 @@
47 47 %h3.prepend-top Updating project &amp; repository. Please wait for few minutes
48 48  
49 49 .merge-tabs
50   - = f.submit 'Save', :class => "grey-button"
  50 + = f.submit 'Save', :class => "btn primary"
51 51 &nbsp;
52 52 - unless @project.new_record?
53 53 .right
... ...