summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-15 18:48:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-16 13:32:32 -0400
commit7400cfc11484b35945cefe8bd42ea02f2675b775 (patch)
tree041d79a33077384775de544e2f3fcf2e71345eb2 /app/views
parentadffe47d3c1549bac13a15868a1fb8071bd0d10d (diff)
downloadgitlab-ce-7400cfc11484b35945cefe8bd42ea02f2675b775.tar.gz
Bootlint: Use offset grid classes instead of empty divs
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/groups/_form.html.haml3
-rw-r--r--app/views/admin/projects/show.html.haml3
-rw-r--r--app/views/groups/edit.html.haml3
-rw-r--r--app/views/groups/new.html.haml3
-rw-r--r--app/views/profiles/show.html.haml3
-rw-r--r--app/views/projects/_issuable_form.html.haml2
-rw-r--r--app/views/projects/blob/_remove.html.haml3
-rw-r--r--app/views/projects/edit.html.haml3
-rw-r--r--app/views/projects/labels/_form.html.haml2
-rw-r--r--app/views/projects/wikis/_form.html.haml3
10 files changed, 10 insertions, 18 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 9e7751830a4..8de2ba74a79 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -12,8 +12,7 @@
- if @group.new_record?
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
.alert.alert-info
= render 'shared/group_tips'
.form-actions
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 4c2865ac3f2..5260eadf95b 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -92,8 +92,7 @@
= namespace_select_tag :new_namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
= f.submit 'Transfer', class: 'btn btn-primary'
.col-md-6
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 85179d4c4a2..aa13ed85b53 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -11,8 +11,7 @@
= render 'shared/group_form', f: f
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
= image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160'
%p.light
- if @group.avatar?
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index edb882bea19..0665cdf387a 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -13,8 +13,7 @@
= render 'shared/choose_group_avatar_button', f: f
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
= render 'shared/group_tips'
.form-actions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 6534afb0e89..37a3952635e 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -109,6 +109,5 @@
.row
.col-md-7
.form-group
- .col-sm-2 &nbsp;
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
= f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml
index 491e2107da4..4d93c89c93a 100644
--- a/app/views/projects/_issuable_form.html.haml
+++ b/app/views/projects/_issuable_form.html.haml
@@ -1,6 +1,6 @@
- if issuable.errors.any?
.row
- .col-sm-10.col-sm-offset-2
+ .col-sm-offset-2.col-sm-10
.alert.alert-danger
- issuable.errors.full_messages.each do |msg|
%span= msg
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml
index 09559a4967b..fb6be0e089f 100644
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
@@ -13,8 +13,7 @@
= render 'shared/commit_message_container', params: params,
placeholder: 'Removed this file because...'
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
= button_tag 'Remove file', class: 'btn btn-remove btn-remove-file'
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 2765f63c6bc..3fecd25c324 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -80,8 +80,7 @@
%legend
Project avatar:
.form-group
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
- if @project.avatar?
= project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
%p.light
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index 261d52dedc1..d791ed3410c 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -1,7 +1,7 @@
= form_for [@project.namespace.becomes(Namespace), @project, @label], html: { class: 'form-horizontal label-form' } do |f|
-if @label.errors.any?
.row
- .col-sm-10.col-sm-offset-2
+ .col-sm-offset-2.col-sm-10
.alert.alert-danger
- @label.errors.full_messages.each do |msg|
%span= msg
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 2a8ceaa2844..904600499ae 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -12,8 +12,7 @@
= f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control"
.row
- .col-sm-2
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
%p.cgray
To link to a (new) page you can just type
%code [Link Title](page-slug)