Convert remaining pull-* to float-*
This commit is contained in:
parent
ff575b782e
commit
4d6f6f9347
|
@ -43,7 +43,7 @@ export default {
|
||||||
return `${this.changedIcon}-solid`;
|
return `${this.changedIcon}-solid`;
|
||||||
},
|
},
|
||||||
changedIconClass() {
|
changedIconClass() {
|
||||||
return `multi-${this.changedIcon} pull-left`;
|
return `multi-${this.changedIcon} float-left`;
|
||||||
},
|
},
|
||||||
tooltipTitle() {
|
tooltipTitle() {
|
||||||
if (!this.showTooltip) return undefined;
|
if (!this.showTooltip) return undefined;
|
||||||
|
|
|
@ -144,14 +144,14 @@ export default {
|
||||||
<loading-button
|
<loading-button
|
||||||
:loading="submitCommitLoading"
|
:loading="submitCommitLoading"
|
||||||
:disabled="commitButtonDisabled"
|
:disabled="commitButtonDisabled"
|
||||||
container-class="btn btn-success btn-sm pull-left"
|
container-class="btn btn-success btn-sm float-left"
|
||||||
:label="__('Commit')"
|
:label="__('Commit')"
|
||||||
@click="commitChanges"
|
@click="commitChanges"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
v-if="!discardDraftButtonDisabled"
|
v-if="!discardDraftButtonDisabled"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-default btn-sm pull-right"
|
class="btn btn-default btn-sm float-right"
|
||||||
@click="discardDraft"
|
@click="discardDraft"
|
||||||
>
|
>
|
||||||
{{ __('Discard draft') }}
|
{{ __('Discard draft') }}
|
||||||
|
@ -159,7 +159,7 @@ export default {
|
||||||
<button
|
<button
|
||||||
v-else
|
v-else
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-default btn-sm pull-right"
|
class="btn btn-default btn-sm float-right"
|
||||||
@click="toggleIsSmall"
|
@click="toggleIsSmall"
|
||||||
>
|
>
|
||||||
{{ __('Collapse') }}
|
{{ __('Collapse') }}
|
||||||
|
|
|
@ -169,7 +169,7 @@ export default {
|
||||||
:show-tooltip="true"
|
:show-tooltip="true"
|
||||||
:show-staged-icon="true"
|
:show-staged-icon="true"
|
||||||
:force-modified-icon="true"
|
:force-modified-icon="true"
|
||||||
class="pull-right"
|
class="float-right"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<new-dropdown
|
<new-dropdown
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
= link_to edit_group_runner_path(@group, runner) do
|
= link_to edit_group_runner_path(@group, runner) do
|
||||||
= icon('edit')
|
= icon('edit')
|
||||||
|
|
||||||
.pull-right
|
.float-right
|
||||||
- if runner.active?
|
- if runner.active?
|
||||||
= link_to _('Pause'), pause_group_runner_path(@group, runner), method: :post, class: 'btn btn-sm btn-danger', data: { confirm: _("Are you sure?") }
|
= link_to _('Pause'), pause_group_runner_path(@group, runner), method: :post, class: 'btn btn-sm btn-danger', data: { confirm: _("Are you sure?") }
|
||||||
- else
|
- else
|
||||||
= link_to _('Resume'), resume_group_runner_path(@group, runner), method: :post, class: 'btn btn-success btn-sm'
|
= link_to _('Resume'), resume_group_runner_path(@group, runner), method: :post, class: 'btn btn-success btn-sm'
|
||||||
= link_to _('Remove Runner'), group_runner_path(@group, runner), data: { confirm: _("Are you sure?") }, method: :delete, class: 'btn btn-danger btn-sm'
|
= link_to _('Remove Runner'), group_runner_path(@group, runner), data: { confirm: _("Are you sure?") }, method: :delete, class: 'btn btn-danger btn-sm'
|
||||||
.pull-right
|
.float-right
|
||||||
%small.light
|
%small.light
|
||||||
\##{runner.id}
|
\##{runner.id}
|
||||||
- if runner.description.present?
|
- if runner.description.present?
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
- is_current_session = active_session.current?(session)
|
- is_current_session = active_session.current?(session)
|
||||||
|
|
||||||
%li.list-group-item
|
%li.list-group-item
|
||||||
.pull-left.append-right-10{ data: { toggle: 'tooltip' }, title: active_session.human_device_type }
|
.float-left.append-right-10{ data: { toggle: 'tooltip' }, title: active_session.human_device_type }
|
||||||
= active_session_device_type_icon(active_session)
|
= active_session_device_type_icon(active_session)
|
||||||
|
|
||||||
.description.pull-left
|
.description.float-left
|
||||||
%div
|
%div
|
||||||
%strong= active_session.ip_address
|
%strong= active_session.ip_address
|
||||||
- if is_current_session
|
- if is_current_session
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
= l(active_session.created_at, format: :short)
|
= l(active_session.created_at, format: :short)
|
||||||
|
|
||||||
- unless is_current_session
|
- unless is_current_session
|
||||||
.pull-right
|
.float-right
|
||||||
= link_to profile_active_session_path(active_session.session_id), data: { confirm: 'Are you sure? The device will be signed out of GitLab.' }, method: :delete, class: "btn btn-danger prepend-left-10" do
|
= link_to profile_active_session_path(active_session.session_id), data: { confirm: 'Are you sure? The device will be signed out of GitLab.' }, method: :delete, class: "btn btn-danger prepend-left-10" do
|
||||||
%span.sr-only Revoke
|
%span.sr-only Revoke
|
||||||
Revoke
|
Revoke
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#{h(@remote_mirror.last_error.strip)}
|
#{h(@remote_mirror.last_error.strip)}
|
||||||
= f.fields_for :remote_mirrors, @remote_mirror do |rm_form|
|
= f.fields_for :remote_mirrors, @remote_mirror do |rm_form|
|
||||||
.form-group
|
.form-group
|
||||||
= rm_form.check_box :enabled, class: "pull-left"
|
= rm_form.check_box :enabled, class: "float-left"
|
||||||
.prepend-left-20
|
.prepend-left-20
|
||||||
= rm_form.label :enabled, "Remote mirror repository", class: "label-light append-bottom-0"
|
= rm_form.label :enabled, "Remote mirror repository", class: "label-light append-bottom-0"
|
||||||
%p.light.append-bottom-0
|
%p.light.append-bottom-0
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
= render "projects/mirrors/instructions"
|
= render "projects/mirrors/instructions"
|
||||||
|
|
||||||
.form-group
|
.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
|
.prepend-left-20
|
||||||
= rm_form.label :only_protected_branches, class: 'label-light'
|
= rm_form.label :only_protected_branches, class: 'label-light'
|
||||||
= link_to icon('question-circle'), help_page_path('user/project/protected_branches')
|
= link_to icon('question-circle'), help_page_path('user/project/protected_branches')
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
.form-actions
|
.form-actions
|
||||||
= f.submit s_('Pipeline|Create pipeline'), class: 'btn btn-success js-variables-save-button', tabindex: 3
|
= 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
|
-# haml-lint:disable InlineJavaScript
|
||||||
%script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe
|
%script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
= markdown_field(@term, :terms)
|
= markdown_field(@term, :terms)
|
||||||
.row-content-block.footer-block.clearfix
|
.row-content-block.footer-block.clearfix
|
||||||
- if can?(current_user, :accept_terms, @term)
|
- if can?(current_user, :accept_terms, @term)
|
||||||
.pull-right
|
.float-right
|
||||||
= button_to accept_term_path(@term, redirect_params), class: 'btn btn-success prepend-left-8' do
|
= button_to accept_term_path(@term, redirect_params), class: 'btn btn-success prepend-left-8' do
|
||||||
= _('Accept terms')
|
= _('Accept terms')
|
||||||
- if can?(current_user, :decline_terms, @term)
|
- if can?(current_user, :decline_terms, @term)
|
||||||
.pull-right
|
.float-right
|
||||||
= button_to decline_term_path(@term, redirect_params), class: 'btn btn-default prepend-left-8' do
|
= button_to decline_term_path(@term, redirect_params), class: 'btn btn-default prepend-left-8' do
|
||||||
= _('Decline and sign out')
|
= _('Decline and sign out')
|
||||||
|
|
Loading…
Reference in New Issue