Download as
Browse Code »

Commit 846e59505eefab7bd04227edcdc55c6033d42ec5

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

Replace .actions with .form-actions

Showing 8 changed files with 11 additions and 18 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/forms.scss
  Diff comments   View file @846e595
1 form { 1 form {
2 @extend .form-horizontal; 2 @extend .form-horizontal;
3 3
4 - .actions {  
5 - @extend .form-actions;  
6 - }  
7 -  
8 - .clearfix {  
9 - @extend .control-group; 4 + label {
  5 + @extend .control-label;
10 } 6 }
11 7
12 - .input {  
13 - @extend .controls; 8 + .actions {
  9 + @extend .form-actions;
14 } 10 }
15 11
16 - label {  
17 - @extend .control-label;  
18 - }  
19 .xlarge { 12 .xlarge {
20 @extend .input-xlarge; 13 @extend .input-xlarge;
21 } 14 }
app/views/admin/users/_form.html.haml
  Diff comments   View file @846e595
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 = f.label :twitter 85 = f.label :twitter
86 .controls= f.text_field :twitter 86 .controls= f.text_field :twitter
87 87
88 - .actions 88 + .form-actions
89 - if @user.new_record? 89 - if @user.new_record?
90 = f.submit 'Create user', class: "btn btn-create" 90 = f.submit 'Create user', class: "btn btn-create"
91 = link_to 'Cancel', admin_users_path, class: "btn btn-cancel" 91 = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
app/views/profiles/keys/_form.html.haml
  Diff comments   View file @846e595
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 = f.text_area :key, class: [:xxlarge, :thin_area] 17 = f.text_area :key, class: [:xxlarge, :thin_area]
18 18
19 19
20 - .actions 20 + .form-actions
21 = f.submit 'Add key', class: "btn btn-create" 21 = f.submit 'Add key', class: "btn btn-create"
22 = link_to "Cancel", profile_keys_path, class: "btn btn-cancel" 22 = link_to "Cancel", profile_keys_path, class: "btn btn-cancel"
23 23
app/views/projects/deploy_keys/_form.html.haml
  Diff comments   View file @846e595
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 Paste a machine public key here. Read more about how generate it 17 Paste a machine public key here. Read more about how generate it
18 = link_to "here", help_ssh_path 18 = link_to "here", help_ssh_path
19 19
20 - .actions 20 + .form-actions
21 = f.submit 'Create', class: "btn-create btn" 21 = f.submit 'Create', class: "btn-create btn"
22 = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel" 22 = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
23 23
app/views/projects/issues/_form.html.haml
  Diff comments   View file @846e595
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. 47 %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
48 48
49 49
50 - .actions 50 + .form-actions
51 - if @issue.new_record? 51 - if @issue.new_record?
52 = f.submit 'Submit new issue', class: "btn btn-create" 52 = f.submit 'Submit new issue', class: "btn btn-create"
53 -else 53 -else
app/views/projects/team_members/_form.html.haml
  Diff comments   View file @846e595
@@ -19,6 +19,6 @@ @@ -19,6 +19,6 @@
19 = f.label :project_access, "Project Access" 19 = f.label :project_access, "Project Access"
20 .controls= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" 20 .controls= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
21 21
22 - .actions 22 + .form-actions
23 = f.submit 'Add users', class: "btn btn-create" 23 = f.submit 'Add users', class: "btn btn-create"
24 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel" 24 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
app/views/projects/team_members/import.html.haml
  Diff comments   View file @846e595
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 = label_tag :source_project_id, "Project" 8 = label_tag :source_project_id, "Project"
9 .controls= 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) 9 .controls= 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)
10 10
11 - .actions 11 + .form-actions
12 = submit_tag 'Import project members', class: "btn btn-create" 12 = submit_tag 'Import project members', class: "btn btn-create"
13 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel" 13 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
14 14
app/views/projects/wikis/_form.html.haml
  Diff comments   View file @846e595
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 .ui-box-bottom 28 .ui-box-bottom
29 = f.label :commit_message 29 = f.label :commit_message
30 .controls= f.text_field :message, class: 'span8' 30 .controls= f.text_field :message, class: 'span8'
31 - .actions 31 + .form-actions
32 - if @wiki && @wiki.persisted? 32 - if @wiki && @wiki.persisted?
33 = f.submit 'Save changes', class: "btn-save btn" 33 = f.submit 'Save changes', class: "btn-save btn"
34 = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel" 34 = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"