Commit 1788fe3a authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'mw-cleanup-pull-classes' into 'master'

Replace pull-left with float-left and pull-right with float-right

See merge request gitlab-org/gitlab!38033
parents 552c1c88 eae43c92
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
</template> </template>
<template v-else> <template v-else>
<graph-bar :count="behindCount" :max-commits="maxCommits" position="left" /> <graph-bar :count="behindCount" :max-commits="maxCommits" position="left" />
<div class="graph-separator pull-left mt-1"></div> <div class="graph-separator float-left mt-1"></div>
<graph-bar :count="aheadCount" :max-commits="maxCommits" position="right" /> <graph-bar :count="aheadCount" :max-commits="maxCommits" position="right" />
</template> </template>
</div> </div>
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
</script> </script>
<template> <template>
<div :class="{ full: isFullWidth }" class="position-relative pull-left pt-1 graph-side h-100"> <div :class="{ full: isFullWidth }" class="position-relative float-left pt-1 graph-side h-100">
<div <div
:style="style" :style="style"
:class="[roundedClass, positionSideClass]" :class="[roundedClass, positionSideClass]"
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
</div> </div>
<i <i
v-if="findVersionId(version.node.id) === currentVersionId" v-if="findVersionId(version.node.id) === currentVersionId"
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
></i> ></i>
</router-link> </router-link>
</gl-new-dropdown-item> </gl-new-dropdown-item>
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
</div> </div>
<i <i
v-if="findVersionId(version.node.id) === currentVersionId" v-if="findVersionId(version.node.id) === currentVersionId"
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
></i> ></i>
</router-link> </router-link>
</gl-dropdown-item> </gl-dropdown-item>
......
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
<div class="alert alert-warning"> <div class="alert alert-warning">
<h4> <h4>
{{ __('Too many changes to show.') }} {{ __('Too many changes to show.') }}
<div class="pull-right"> <div class="float-right">
<a :href="plainDiffPath" class="btn btn-sm"> {{ __('Plain diff') }} </a> <a :href="plainDiffPath" class="btn btn-sm"> {{ __('Plain diff') }} </a>
<a :href="emailPatchPath" class="btn btn-sm"> {{ __('Email patch') }} </a> <a :href="emailPatchPath" class="btn btn-sm"> {{ __('Email patch') }} </a>
</div> </div>
......
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
<ul class="content-list"> <ul class="content-list">
<li v-for="(item, index) in information" :key="index"> <li v-for="(item, index) in information" :key="index">
<span class="text-secondary">{{ item.label }}</span> <span class="text-secondary">{{ item.label }}</span>
<div class="pull-right w-75 gl-text-right"> <div class="float-right w-75 gl-text-right">
<gl-link <gl-link
v-if="item.type === $options.informationType.LINK" v-if="item.type === $options.informationType.LINK"
:href="item.value" :href="item.value"
......
...@@ -34,6 +34,6 @@ export default { ...@@ -34,6 +34,6 @@ export default {
<span class="dropdown-toggle-text flex-fill"> <span class="dropdown-toggle-text flex-fill">
{{ dropdownButtonText }} {{ dropdownButtonText }}
</span> </span>
<gl-icon name="chevron-down" class="pull-right" /> <gl-icon name="chevron-down" class="float-right" />
</gl-button> </gl-button>
</template> </template>
...@@ -105,13 +105,13 @@ export default { ...@@ -105,13 +105,13 @@ export default {
:disabled="disableCreate" :disabled="disableCreate"
category="primary" category="primary"
variant="success" variant="success"
class="pull-left d-flex align-items-center" class="float-left d-flex align-items-center"
@click="handleCreateClick" @click="handleCreateClick"
> >
<gl-loading-icon v-show="labelCreateInProgress" :inline="true" class="mr-1" /> <gl-loading-icon v-show="labelCreateInProgress" :inline="true" class="mr-1" />
{{ __('Create') }} {{ __('Create') }}
</gl-button> </gl-button>
<gl-button class="pull-right js-btn-cancel-create" @click="toggleDropdownContentsCreateView"> <gl-button class="float-right js-btn-cancel-create" @click="toggleDropdownContentsCreateView">
{{ __('Cancel') }} {{ __('Cancel') }}
</gl-button> </gl-button>
</div> </div>
......
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
<gl-loading-icon v-show="labelsSelectInProgress" inline /> <gl-loading-icon v-show="labelsSelectInProgress" inline />
<gl-button <gl-button
variant="link" variant="link"
class="pull-right js-sidebar-dropdown-toggle" class="float-right js-sidebar-dropdown-toggle"
data-qa-selector="labels_edit_button" data-qa-selector="labels_edit_button"
@click="toggleDropdownContents" @click="toggleDropdownContents"
>{{ __('Edit') }}</gl-button >{{ __('Edit') }}</gl-button
......
...@@ -51,24 +51,6 @@ ...@@ -51,24 +51,6 @@
text-align: center; text-align: center;
} }
.fa.fa-pull-left {
margin-right: 0.3em;
}
.fa.fa-pull-right {
margin-left: 0.3em;
}
.fa-pull-right,
.pull-right {
float: right;
}
.fa-pull-left,
.pull-left {
float: left;
}
.fa-spin { .fa-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.form-group .form-group
= text_field_tag 'confirm_path_input', '', class: 'form-control js-confirm-danger-input qa-confirm-input' = text_field_tag 'confirm_path_input', '', class: 'form-control js-confirm-danger-input qa-confirm-input'
.form-actions.clearfix .form-actions.clearfix
.pull-right .float-right
%button.btn.btn-default{ type: "button", "data-dismiss": "modal" } %button.btn.btn-default{ type: "button", "data-dismiss": "modal" }
= _('Cancel') = _('Cancel')
= submit_tag _('Reduce project visibility'), class: "btn btn-danger js-confirm-danger-submit qa-confirm-button", disabled: true = submit_tag _('Reduce project visibility'), class: "btn btn-danger js-confirm-danger-submit qa-confirm-button", disabled: true
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
= sprite_icon('fork', size: 12) = sprite_icon('fork', size: 12)
= ref = ref
- if current_action?(:edit) || current_action?(:update) - if current_action?(:edit) || current_action?(:update)
%span.pull-left.gl-mr-3 %span.float-left.gl-mr-3
= text_field_tag 'file_path', (params[:file_path] || @path), = text_field_tag 'file_path', (params[:file_path] || @path),
class: 'form-control new-file-path js-file-path-name-input' class: 'form-control new-file-path js-file-path-name-input'
= render 'template_selectors' = render 'template_selectors'
- if current_action?(:new) || current_action?(:create) - if current_action?(:new) || current_action?(:create)
%span.pull-left.gl-mr-3 %span.float-left.gl-mr-3
\/ \/
= text_field_tag 'file_name', params[:file_name], placeholder: "File name", = text_field_tag 'file_name', params[:file_name], placeholder: "File name",
required: true, class: 'form-control new-file-name js-file-path-name-input', value: params[:file_name] || (should_suggest_gitlab_ci_yml? ? '.gitlab-ci.yml' : '') required: true, class: 'form-control new-file-name js-file-path-name-input', value: params[:file_name] || (should_suggest_gitlab_ci_yml? ? '.gitlab-ci.yml' : '')
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true', qa_selector: 'mirror_error_badge' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error') .badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true', qa_selector: 'mirror_error_badge' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error')
%td %td
- if mirror_settings_enabled - if mirror_settings_enabled
.btn-group.mirror-actions-group.pull-right{ role: 'group' } .btn-group.mirror-actions-group.float-right{ role: 'group' }
- if mirror.ssh_key_auth? - if mirror.ssh_key_auth?
= clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button') = clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button')
= render 'shared/remote_mirror_update_button', remote_mirror: mirror = render 'shared/remote_mirror_update_button', remote_mirror: mirror
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.table-mobile-header{ role: "rowheader" } .table-mobile-header{ role: "rowheader" }
.table-mobile-content .table-mobile-content
- if can_destroy_package - if can_destroy_package
.pull-right .float-right
= link_to project_package_path(@project, package), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-remove", title: _('Delete Package') do = link_to project_package_path(@project, package), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-remove", title: _('Delete Package') do
= icon('trash') = icon('trash')
= paginate @packages, theme: "gitlab" = paginate @packages, theme: "gitlab"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= button_to accept_term_path(@term, redirect_params), class: 'btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do = button_to accept_term_path(@term, redirect_params), class: 'btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do
= _('Accept terms') = _('Accept terms')
- else - else
.pull-right .float-right
= link_to root_path, class: 'btn btn-success gl-ml-3' do = link_to root_path, class: 'btn btn-success gl-ml-3' do
= _('Continue') = _('Continue')
- if can?(current_user, :decline_terms, @term) - if can?(current_user, :decline_terms, @term)
......
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
</template> </template>
</gl-sprintf> </gl-sprintf>
</span> </span>
<span class="js-security-dashboard-right pull-right"> <span class="js-security-dashboard-right float-right">
<icon name="branch" /> <icon name="branch" />
<gl-link :href="branch.path" class="monospace">{{ branch.id }}</gl-link> <gl-link :href="branch.path" class="monospace">{{ branch.id }}</gl-link>
<span class="text-muted gl-ml-2 gl-mr-2">&middot;</span> <span class="text-muted gl-ml-2 gl-mr-2">&middot;</span>
......
...@@ -52,5 +52,5 @@ ...@@ -52,5 +52,5 @@
.mt-3 .mt-3
= f.submit _("Save changes"), class: 'btn btn-success', data: { qa_selector: 'save_changes_button' } = f.submit _("Save changes"), class: 'btn btn-success', data: { qa_selector: 'save_changes_button' }
#js-saml-test-button.has-tooltip.pull-right #js-saml-test-button.has-tooltip.float-right
= render 'test_button', saml_provider: @saml_provider = render 'test_button', saml_provider: @saml_provider
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- if import_state&.last_error.present? - if import_state&.last_error.present?
.badge.badge-danger{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(import_state.last_error.try(:strip)) }= _('Error') .badge.badge-danger{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(import_state.last_error.try(:strip)) }= _('Error')
%td.mirror-action-buttons %td.mirror-action-buttons
.btn-group.mirror-actions-group.pull-right{ role: 'group' } .btn-group.mirror-actions-group.float-right{ role: 'group' }
- ssh_public_key = @project.import_data.ssh_public_key - ssh_public_key = @project.import_data.ssh_public_key
- if ssh_public_key - if ssh_public_key
= clipboard_button(text: ssh_public_key, class: 'btn btn-default rspec-copy-ssh-public-key', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button') = clipboard_button(text: ssh_public_key, class: 'btn btn-default rspec-copy-ssh-public-key', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.card-header.font-weight-bold.p-3 .card-header.font-weight-bold.p-3
= plan.name = plan.name
- if is_current_plan - if is_current_plan
.pull-right.text-muted .float-right.text-muted
= _("Current Plan") = _("Current Plan")
.card-body .card-body
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
- if purchase_link - if purchase_link
.card-footer.p-3 .card-footer.p-3
.pull-right{ class: ("invisible" unless purchase_link.action == 'upgrade' || is_current_plan) } .float-right{ class: ("invisible" unless purchase_link.action == 'upgrade' || is_current_plan) }
- upgrade_button_class = "disabled" if is_current_plan && !namespace.trial_active? - upgrade_button_class = "disabled" if is_current_plan && !namespace.trial_active?
- cta_class = '-new' if use_new_purchase_flow?(namespace) - cta_class = '-new' if use_new_purchase_flow?(namespace)
= link_to s_('BillingPlan|Upgrade'), plan_purchase_or_upgrade_url(namespace, plan, current_plan), class: "btn btn-success #{upgrade_button_class} billing-cta-purchase#{cta_class}" = link_to s_('BillingPlan|Upgrade'), plan_purchase_or_upgrade_url(namespace, plan, current_plan), class: "btn btn-success #{upgrade_button_class} billing-cta-purchase#{cta_class}"
...@@ -15,7 +15,7 @@ Object { ...@@ -15,7 +15,7 @@ Object {
exports[`Project Security Dashboard component Headline renders renders branch and commit information 1`] = ` exports[`Project Security Dashboard component Headline renders renders branch and commit information 1`] = `
<span <span
class="js-security-dashboard-right pull-right" class="js-security-dashboard-right float-right"
> >
<svg <svg
aria-hidden="true" aria-hidden="true"
......
...@@ -12,7 +12,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] = ...@@ -12,7 +12,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] =
/> />
<div <div
class="graph-separator pull-left mt-1" class="graph-separator float-left mt-1"
/> />
<graph-bar-stub <graph-bar-stub
......
...@@ -37,7 +37,7 @@ exports[`Design management design version dropdown component renders design vers ...@@ -37,7 +37,7 @@ exports[`Design management design version dropdown component renders design vers
</div> </div>
<i <i
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
/> />
</router-link-stub> </router-link-stub>
</gl-new-dropdown-item-stub> </gl-new-dropdown-item-stub>
...@@ -107,7 +107,7 @@ exports[`Design management design version dropdown component renders design vers ...@@ -107,7 +107,7 @@ exports[`Design management design version dropdown component renders design vers
</div> </div>
<i <i
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
/> />
</router-link-stub> </router-link-stub>
</gl-new-dropdown-item-stub> </gl-new-dropdown-item-stub>
......
...@@ -28,7 +28,7 @@ exports[`Design management design version dropdown component renders design vers ...@@ -28,7 +28,7 @@ exports[`Design management design version dropdown component renders design vers
</div> </div>
<i <i
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
/> />
</router-link-stub> </router-link-stub>
</gl-dropdown-item-stub> </gl-dropdown-item-stub>
...@@ -83,7 +83,7 @@ exports[`Design management design version dropdown component renders design vers ...@@ -83,7 +83,7 @@ exports[`Design management design version dropdown component renders design vers
</div> </div>
<i <i
class="fa fa-check pull-right" class="fa fa-check float-right gl-mr-2"
/> />
</router-link-stub> </router-link-stub>
</gl-dropdown-item-stub> </gl-dropdown-item-stub>
......
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