summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril <jv.cyril@gmail.com>2012-08-23 23:04:43 +0200
committerCyril <jv.cyril@gmail.com>2012-08-23 23:04:43 +0200
commite2f19befbcc2c0b347507171ef94047426aba5b0 (patch)
treea8d723d48780b88847679176df4b530f15a32f07
parent4b2e151fc69db11b1772d234a233be7cf6eac671 (diff)
downloadgitlab-ce-e2f19befbcc2c0b347507171ef94047426aba5b0.tar.gz
fix inline forms
-rw-r--r--app/assets/stylesheets/sections/projects.scss1
-rw-r--r--app/views/admin/hooks/index.html.haml2
-rw-r--r--app/views/admin/projects/index.html.haml2
-rw-r--r--app/views/admin/users/index.html.haml2
-rw-r--r--app/views/hooks/index.html.haml2
-rw-r--r--app/views/search/show.html.haml2
6 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 1269ac8a242..0866b43f71d 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -35,6 +35,7 @@
.btn {
padding:6px;
margin-left:10px;
+ margin-bottom:8px;
}
}
}
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index d34acffe9e6..43288424e8e 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -5,7 +5,7 @@
Read more about system hooks
%strong #{link_to "here", help_system_hooks_path, class: "vlink"}
-= form_for @hook, as: :hook, url: admin_hooks_path do |f|
+= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
-if @hook.errors.any?
.alert-message.block-message.error
- @hook.errors.full_messages.each do |msg|
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 4512bb7e493..882b2ab5ff2 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -2,7 +2,7 @@
Projects
= link_to 'New Project', new_admin_project_path, class: "btn small right"
%br
-= form_tag admin_projects_path, method: :get do
+= form_tag admin_projects_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "xlarge"
= submit_tag "Search", class: "btn submit primary"
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 5edca312cc5..3d0272179c4 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -3,7 +3,7 @@
= link_to 'New User', new_admin_user_path, class: "btn small right"
%br
-= form_tag admin_users_path, method: :get do
+= form_tag admin_users_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "xlarge"
= submit_tag "Search", class: "btn submit primary"
%ul.nav.nav-pills
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 4e15dc50ee8..3d2a381e746 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -8,7 +8,7 @@
Read more about web hooks
%strong #{link_to "here", help_web_hooks_path, class: "vlink"}
-= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project) do |f|
+= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
-if @hook.errors.any?
.alert-message.block-message.error
- @hook.errors.full_messages.each do |msg|
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index ed9da1f0753..9a0b4789588 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -1,4 +1,4 @@
-= form_tag search_path, method: :get do |f|
+= form_tag search_path, method: :get, class: 'form-inline' do |f|
.padded
= label_tag :search do
%strong Looking for