diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-30 03:00:57 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-30 03:00:57 +0000 |
| commit | 5b1416aa74c4fa80e0c324fd2907166af5ca479b (patch) | |
| tree | b5c1b8fe79a0779c6018c7d3fb09ad564c0d9e54 /app/views/projects | |
| parent | 8357e4cf6cab8838bc999900cf2e7d887cdfab09 (diff) | |
| parent | 4d6f6f9347ffc60d7fc4c4f8d69087d8f178b942 (diff) | |
| download | gitlab-ce-5b1416aa74c4fa80e0c324fd2907166af5ca479b.tar.gz | |
Merge branch 'bootstrap-pull-float' into 'master'
Convert remaining pull-* to float-*
Closes #46934
See merge request gitlab-org/gitlab-ce!19225
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/mirrors/_push.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/pipelines/new.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/mirrors/_push.html.haml b/app/views/projects/mirrors/_push.html.haml index 4a6aefce351..c3dcd9617a6 100644 --- a/app/views/projects/mirrors/_push.html.haml +++ b/app/views/projects/mirrors/_push.html.haml @@ -30,7 +30,7 @@ #{h(@remote_mirror.last_error.strip)} = f.fields_for :remote_mirrors, @remote_mirror do |rm_form| .form-group - = rm_form.check_box :enabled, class: "pull-left" + = rm_form.check_box :enabled, class: "float-left" .prepend-left-20 = rm_form.label :enabled, "Remote mirror repository", class: "label-light append-bottom-0" %p.light.append-bottom-0 @@ -42,7 +42,7 @@ = render "projects/mirrors/instructions" .form-group - = rm_form.check_box :only_protected_branches, class: 'pull-left' + = rm_form.check_box :only_protected_branches, class: 'float-left' .prepend-left-20 = rm_form.label :only_protected_branches, class: 'label-light' = link_to icon('question-circle'), help_page_path('user/project/protected_branches') diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index d1e8e9d0d60..956f8fef6b8 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -29,7 +29,7 @@ .form-actions = f.submit s_('Pipeline|Create pipeline'), class: 'btn btn-success js-variables-save-button', tabindex: 3 - = link_to 'Cancel', project_pipelines_path(@project), class: 'btn btn-default pull-right' + = link_to 'Cancel', project_pipelines_path(@project), class: 'btn btn-default float-right' -# haml-lint:disable InlineJavaScript %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe |