Commit 89bcc1ba authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-bootlint-fixes' into 'master'

Random Bootlint fixes

See merge request !822
parents adffe47d 0d7a0675
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
- if @group.new_record? - if @group.new_record?
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
.alert.alert-info .alert.alert-info
= render 'shared/group_tips' = render 'shared/group_tips'
.form-actions .form-actions
......
...@@ -92,8 +92,7 @@ ...@@ -92,8 +92,7 @@
= namespace_select_tag :new_namespace_id, selected: params[:namespace_id], class: 'input-large' = namespace_select_tag :new_namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
= f.submit 'Transfer', class: 'btn btn-primary' = f.submit 'Transfer', class: 'btn btn-primary'
.col-md-6 .col-md-6
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
= render 'shared/group_form', f: f = render 'shared/group_form', f: f
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
= image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160' = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160'
%p.light %p.light
- if @group.avatar? - if @group.avatar?
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
= render 'shared/choose_group_avatar_button', f: f = render 'shared/choose_group_avatar_button', f: f
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
= render 'shared/group_tips' = render 'shared/group_tips'
.form-actions .form-actions
......
#modal-shortcuts.modal.hide{tabindex: -1} #modal-shortcuts.modal{tabindex: -1}
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= brand_header_logo = brand_header_logo
%h3 GitLab %h3 GitLab
.header-content .header-content
%button.navbar-toggle %button.navbar-toggle{type: 'button'}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= icon('bars') = icon('bars')
......
...@@ -109,6 +109,5 @@ ...@@ -109,6 +109,5 @@
.row .row
.col-md-7 .col-md-7
.form-group .form-group
.col-sm-2   .col-sm-offset-2.col-sm-10
.col-sm-10
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
%div#bitbucket_import_modal.modal.hide %div#bitbucket_import_modal.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
%div#github_import_modal.modal.hide %div#github_import_modal.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
%div#gitlab_import_modal.modal.hide %div#gitlab_import_modal.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
- if issuable.errors.any? - if issuable.errors.any?
.row .row
.col-sm-10.col-sm-offset-2 .col-sm-offset-2.col-sm-10
.alert.alert-danger .alert.alert-danger
- issuable.errors.full_messages.each do |msg| - issuable.errors.full_messages.each do |msg|
%span= msg %span= msg
......
#modal-remove-blob.modal.hide #modal-remove-blob.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
= render 'shared/commit_message_container', params: params, = render 'shared/commit_message_container', params: params,
placeholder: 'Removed this file because...' placeholder: 'Removed this file because...'
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
= button_tag 'Remove file', class: 'btn btn-remove btn-remove-file' = button_tag 'Remove file', class: 'btn btn-remove btn-remove-file'
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
......
...@@ -80,8 +80,7 @@ ...@@ -80,8 +80,7 @@
%legend %legend
Project avatar: Project avatar:
.form-group .form-group
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
- if @project.avatar? - if @project.avatar?
= project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160') = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
%p.light %p.light
......
= form_for [@project.namespace.becomes(Namespace), @project, @label], html: { class: 'form-horizontal label-form' } do |f| = form_for [@project.namespace.becomes(Namespace), @project, @label], html: { class: 'form-horizontal label-form' } do |f|
-if @label.errors.any? -if @label.errors.any?
.row .row
.col-sm-10.col-sm-offset-2 .col-sm-offset-2.col-sm-10
.alert.alert-danger .alert.alert-danger
- @label.errors.full_messages.each do |msg| - @label.errors.full_messages.each do |msg|
%span= msg %span= msg
......
%div#modal_merge_info.modal.hide %div#modal_merge_info.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
= f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control" = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control"
.row .row
.col-sm-2 .col-sm-offset-2.col-sm-10
.col-sm-10
%p.cgray %p.cgray
To link to a (new) page you can just type To link to a (new) page you can just type
%code [Link Title](page-slug) %code [Link Title](page-slug)
......
%div#modal-new-wiki.modal.hide %div#modal-new-wiki.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
.input-group-addon.git-protocols .input-group-addon.git-protocols
.input-group-btn .input-group-btn
%button{ | %button{ |
type: 'button', |
class: "btn btn-sm #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", | class: "btn btn-sm #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", |
:"data-clone" => project.ssh_url_to_repo, | :"data-clone" => project.ssh_url_to_repo, |
:"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH", :"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH",
...@@ -11,6 +12,7 @@ ...@@ -11,6 +12,7 @@
SSH SSH
.input-group-btn .input-group-btn
%button{ | %button{ |
type: 'button', |
class: "btn btn-sm #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", | class: "btn btn-sm #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", |
:"data-clone" => project.http_url_to_repo, | :"data-clone" => project.http_url_to_repo, |
:"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}", :"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
......
#modal-confirm-danger.modal.hide{tabindex: -1} #modal-confirm-danger.modal{tabindex: -1}
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
= render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet
.form-group
.file-editor .file-editor
.form-group
= f.label :file_name, "File", class: 'control-label' = f.label :file_name, "File", class: 'control-label'
.col-sm-10 .col-sm-10
.file-holder.snippet .file-holder.snippet
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment