From 846e59505eefab7bd04227edcdc55c6033d42ec5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 7 Aug 2013 23:35:24 +0300
Subject: [PATCH] Replace .actions with .form-actions

---
 app/assets/stylesheets/gitlab_bootstrap/forms.scss | 15 ++++-----------
 app/views/admin/users/_form.html.haml              |  2 +-
 app/views/profiles/keys/_form.html.haml            |  2 +-
 app/views/projects/deploy_keys/_form.html.haml     |  2 +-
 app/views/projects/issues/_form.html.haml          |  2 +-
 app/views/projects/team_members/_form.html.haml    |  2 +-
 app/views/projects/team_members/import.html.haml   |  2 +-
 app/views/projects/wikis/_form.html.haml           |  2 +-
 8 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
index 20564cc..b498ce1 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
@@ -1,21 +1,14 @@
 form {
   @extend .form-horizontal;
 
-  .actions {
-    @extend .form-actions;
-  }
-
-  .clearfix {
-    @extend .control-group;
+  label {
+    @extend .control-label;
   }
 
-  .input {
-    @extend .controls;
+  .actions {
+    @extend .form-actions;
   }
 
-  label {
-    @extend .control-label;
-  }
   .xlarge {
     @extend .input-xlarge;
   }
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 0e7f5cb..1365404 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -85,7 +85,7 @@
         = f.label :twitter
         .controls= f.text_field :twitter
 
-    .actions
+    .form-actions
       - if @user.new_record?
         = f.submit 'Create user', class: "btn btn-create"
         = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index 292dda4..f41ae1c 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -17,7 +17,7 @@
         = f.text_area :key, class: [:xxlarge, :thin_area]
 
 
-    .actions
+    .form-actions
       = f.submit 'Add key', class: "btn btn-create"
       = link_to "Cancel", profile_keys_path, class: "btn btn-cancel"
 
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index d3e517b..84a81ac 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -17,7 +17,7 @@
           Paste a machine public key here. Read more about how generate it
           = link_to "here", help_ssh_path
 
-    .actions
+    .form-actions
       = f.submit 'Create', class: "btn-create btn"
       = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
 
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index b3a1bb4..a03453c 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -47,7 +47,7 @@
             %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
 
 
-    .actions
+    .form-actions
       - if @issue.new_record?
         = f.submit 'Submit new issue', class: "btn btn-create"
       -else
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index d7dba22..8dd2faa 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -19,6 +19,6 @@
     = f.label :project_access, "Project Access"
     .controls= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
 
-  .actions
+  .form-actions
     = f.submit 'Add users', class: "btn btn-create"
     = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index f6ca345..36ebe27 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -8,7 +8,7 @@
     = label_tag :source_project_id, "Project"
     .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)
 
-  .actions
+  .form-actions
     = submit_tag 'Import project members', class: "btn btn-create"
     = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
 
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 85c3b72..c8c0281 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -28,7 +28,7 @@
     .ui-box-bottom
       = f.label :commit_message
       .controls= f.text_field :message, class: 'span8'
-  .actions
+  .form-actions
     - if @wiki && @wiki.persisted?
       = f.submit 'Save changes', class: "btn-save btn"
       = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
--
libgit2 0.21.2