diff --git a/app/assets/javascripts/admin/statistics_panel/components/app.vue b/app/assets/javascripts/admin/statistics_panel/components/app.vue index 5e7b7e959e00407922a8a371c5772211522c7e3c..47ec4af373c33389ad957e83e58d7dbd3b04c770 100644 --- a/app/assets/javascripts/admin/statistics_panel/components/app.vue +++ b/app/assets/javascripts/admin/statistics_panel/components/app.vue @@ -39,7 +39,7 @@ export default { class="js-stats" > {{ statistic.label }} - <span class="light float-right">{{ statistic.value }}</span> + <span class="light gl-float-right">{{ statistic.value }}</span> </p> </template> </slot> diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue index 78d0a9da79ad42fc2c59b9c7a2009f8b8bca46e9..f8cd47dad7b62bdb086c3d3c1574231f8863ade2 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue @@ -79,7 +79,7 @@ export default { <gl-button variant="confirm" category="primary" :disabled="!formIsValid" @click="submit"> {{ saveButtonText }} </gl-button> - <gl-button class="float-right" :href="editIntegrationPath">{{ __('Cancel') }}</gl-button> + <gl-button class="gl-float-right" :href="editIntegrationPath">{{ __('Cancel') }}</gl-button> <delete-custom-metric-modal v-if="metricPersisted" :delete-metric-url="customMetricsPath" diff --git a/app/assets/javascripts/custom_metrics/components/delete_custom_metric_modal.vue b/app/assets/javascripts/custom_metrics/components/delete_custom_metric_modal.vue index 7c4117d7e8b6eb018e074849dff850d65f2f9af3..0f0cfce86a6eb79e68fcc3f4114ffb392f29908a 100644 --- a/app/assets/javascripts/custom_metrics/components/delete_custom_metric_modal.vue +++ b/app/assets/javascripts/custom_metrics/components/delete_custom_metric_modal.vue @@ -32,7 +32,7 @@ export default { }; </script> <template> - <div class="d-inline-block float-right mr-3"> + <div class="d-inline-block gl-float-right mr-3"> <gl-button v-gl-modal="$options.modalId" variant="danger" category="primary"> {{ __('Delete') }} </gl-button> diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue index 926c556966c2efd1f82f08ac184e3197969a9de6..786dc74ec062f029bd4bacab31e97876e408d1c0 100644 --- a/app/assets/javascripts/environments/components/environment_actions.vue +++ b/app/assets/javascripts/environments/components/environment_actions.vue @@ -106,7 +106,7 @@ export default { > <template #list-item> <span class="gl-flex-grow-1">{{ item.text }}</span> - <span v-if="item.scheduledAt" class="gl-text-gray-500 float-right"> + <span v-if="item.scheduledAt" class="gl-text-gray-500 gl-float-right"> <gl-icon name="clock" /> {{ remainingTime(item) }} </span> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index 708b5d84e5b599fe7ae481038534c4ad77b6f8b9..b469317bb967fa9ebecc8a387c6f74708fa2bf5d 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -195,7 +195,7 @@ export default { </div> <gl-button v-if="!discardDraftButtonDisabled" - class="float-right" + class="gl-float-right" data-testid="discard-draft" @click="discardDraft" > @@ -204,7 +204,7 @@ export default { <gl-button v-else type="button" - class="float-right" + class="gl-float-right" category="secondary" variant="default" @click="toggleIsCompact" diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index d2d53ece4c59e58352657766091186a780d57ade..a998a110bbce5c583ae4435f673b3ffd0b144885 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -65,7 +65,7 @@ export default { </script> <template> - <div class="float-right ide-file-icon-holder"> + <div class="gl-float-right ide-file-icon-holder"> <mr-file-icon v-if="file.mrChange" /> <span v-if="showTreeChangesCount" class="ide-tree-changes"> {{ changesCount }} diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue index 745122afb4a1f653717eb86850397a6dad05fde8..1cc64d376f57531f32e633e4b231d87bdc7c001c 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue @@ -44,7 +44,7 @@ export default { <gl-loading-icon v-if="loading" size="sm" inline class="align-bottom" /> <a v-if="editable" - class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary float-right" + class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary gl-float-right" href="#" data-test-id="edit-link" data-track-action="click_edit_button" diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_button.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_button.vue index 33299ab56e0b39fec4cfc2bba436ee71974e4419..f6a55c055bad51116f48f486662106a8f86550e6 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_button.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_button.vue @@ -41,6 +41,6 @@ export default { <span class="dropdown-toggle-text gl-pointer-events-none flex-fill"> {{ dropdownButtonText }} </span> - <gl-icon name="chevron-down" class="gl-pointer-events-none float-right" /> + <gl-icon name="chevron-down" class="gl-pointer-events-none gl-float-right" /> </gl-button> </template> diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue index 8a8b2c9b447360d39f2dd257630c9d194b4a69c3..0946eac4055b00a2db63f2fc324f4d9137683fc0 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue @@ -121,7 +121,10 @@ export default { <gl-loading-icon v-show="labelCreateInProgress" size="sm" :inline="true" class="mr-1" /> {{ __('Create') }} </gl-button> - <gl-button class="float-right js-btn-cancel-create" @click="toggleDropdownContentsCreateView"> + <gl-button + class="gl-float-right js-btn-cancel-create" + @click="toggleDropdownContentsCreateView" + > {{ __('Cancel') }} </gl-button> </div> diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_title.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_title.vue index 478d261d06cab7b4ce2c2f2d7b351dbd477fd6de..8d2203b4f3c898f2f3527884c173a64f9eacfe88 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_title.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_title.vue @@ -36,7 +36,7 @@ export default { <gl-button category="tertiary" size="small" - class="float-right js-sidebar-dropdown-toggle gl-mr-n2" + class="gl-float-right js-sidebar-dropdown-toggle gl-mr-n2" @click="toggleDropdownContents" > {{ __('Edit') }} diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue index 9246118371170e36c035d1a1b347991512e3a91d..ee767446fb5a06d1eafeed2948f664d190ed1768 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue @@ -38,7 +38,7 @@ export default { <gl-loading-icon v-if="loading" size="sm" inline class="align-bottom" /> <a v-if="editable" - class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary float-right" + class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary gl-float-right" href="#" data-track-action="click_edit_button" data-track-label="right_sidebar" diff --git a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue index 3d0e7db6a68e424d5aa99cd953a64441e7584df9..9cce54127c95853b8a3e674ccd14ce03f82fb255 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue @@ -183,7 +183,7 @@ export default { :title="$options.i18n.reRequestReview" :aria-label="$options.i18n.reRequestReview" :loading="loadingStates[user.id] === $options.LOADING_STATE" - class="float-right gl-text-gray-500! gl-mr-2" + class="gl-float-right gl-text-gray-500! gl-mr-2" size="small" icon="redo" variant="link" @@ -195,7 +195,7 @@ export default { v-gl-tooltip.top.viewport :title="reviewStateIcon(user).title" :class="reviewStateIcon(user).class" - class="float-right gl-my-2 gl-ml-auto gl-flex-shrink-0" + class="gl-float-right gl-my-2 gl-ml-auto gl-flex-shrink-0" > <gl-icon :size="reviewStateIcon(user).size || 16" @@ -212,7 +212,7 @@ export default { :size="16" :title="approvedByTooltipTitle(user)" name="status-success" - class="float-right gl-my-2 gl-ml-auto gl-text-green-500 gl-flex-shrink-0" + class="gl-float-right gl-my-2 gl-ml-auto gl-text-green-500 gl-flex-shrink-0" :class="approveAnimation(user.id)" data-testid="approved" /> @@ -222,7 +222,7 @@ export default { :size="16" :title="reviewedButNotApprovedTooltip(user)" name="dotted-circle" - class="float-right gl-my-2 gl-ml-auto gl-text-gray-400 gl-flex-shrink-0" + class="gl-float-right gl-my-2 gl-ml-auto gl-text-gray-400 gl-flex-shrink-0" data-testid="reviewed-not-approved" /> </template> diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue index 2c8c23c1152922b8886e738d10af9734d21ed2f3..2439b18dae3ee735cea63575870e6f4b12c2b79d 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue @@ -43,7 +43,7 @@ export default { buttonClasses() { return this.collapsed ? 'btn-blank btn-todo sidebar-collapsed-icon js-dont-change-state' - : 'gl-button btn btn-default btn-todo issuable-header-btn float-right'; + : 'gl-button btn btn-default btn-todo issuable-header-btn gl-float-right'; }, buttonLabel() { return this.isTodo ? MARK_TEXT : TODO_TEXT; diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 5343b009f6d918720a3dab0b68a261215c455b37..b911a2b38060e3ac5bc4511f676f9d1479e733e8 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -111,7 +111,7 @@ flex-flow: row wrap; width: 100%; - .float-right { + .gl-float-right { // Flexbox quirk to make sure right-aligned items stay right-aligned. margin-left: auto; } diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index 89f6d61ef4452f066d6458a4b11177c4f4450e36..ad4c51ee5489dc43fbfe33d44b16d0e4bcfc2cb0 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -15,7 +15,7 @@ def feature_entry(title, href: nil, enabled: true, doc_href: nil) tag.p(aria: { label: label }) do concat(link_or_title) - concat(tag.span(class: %w[light float-right]) do + concat(tag.span(class: %w[light gl-float-right]) do boolean_to_icon(enabled) end) diff --git a/app/views/admin/application_settings/appearances/_form.html.haml b/app/views/admin/application_settings/appearances/_form.html.haml index e8bf25b8da6ad42d7910e621047f31bca4b8735b..43bb5fc3e278d0b95da3007d1f2164ac686b43a7 100644 --- a/app/views/admin/application_settings/appearances/_form.html.haml +++ b/app/views/admin/application_settings/appearances/_form.html.haml @@ -141,7 +141,7 @@ = link_to _('New project page'), new_project_path, class: 'btn', target: '_blank', rel: 'noopener noreferrer' - if @appearance.updated_at - %span.float-right + %span.gl-float-right Last edit #{time_ago_with_tooltip(@appearance.updated_at)} .settings-sticky-footer diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 4834f41b8d600ad38fee880e6a7db047f8ce86bc..239023b009dd9112623af8593ef0ef5da096386f 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -122,29 +122,29 @@ %h4.gl-heading-4 = s_('AdminArea|Components') - if show_version_check? - .float-right + .gl-float-right .js-gitlab-version-check-badge{ data: { "size": "lg", "actionable": "true", "version": gitlab_version_check.to_json } } = link_to(sprite_icon('question-o'), "https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md", class: 'gl-ml-2', target: '_blank', rel: 'noopener noreferrer') %p = link_to _('GitLab'), general_admin_application_settings_path - %span.float-right + %span.gl-float-right = link_to_version %p = _('GitLab Shell') - %span.float-right + %span.gl-float-right = Gitlab::Shell.version %p = _('GitLab Workhorse') - %span.float-right + %span.gl-float-right = gitlab_workhorse_version %p = _('GitLab API') - %span.float-right + %span.gl-float-right = API::API::version - if Gitlab.config.pages.enabled %p = _('GitLab Pages') - %span.float-right + %span.gl-float-right = Gitlab::Pages::VERSION - if Gitlab::Kas.enabled? %p @@ -156,20 +156,20 @@ %p = _('Ruby') - %span.float-right + %span.gl-float-right #{RUBY_VERSION}p#{RUBY_PATCHLEVEL} %p = _('Rails') - %span.float-right + %span.gl-float-right #{Rails::VERSION::STRING} - database_versions.each do |database_name, database| %p #{database[:adapter_name]} (#{database_name}) - %span.float-right + %span.gl-float-right = database[:version] %p = _('Redis') - %span.float-right + %span.gl-float-right = @redis_versions&.join(", ") %p = link_to _("Gitaly Servers"), admin_gitaly_servers_path diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index f7a49c88d782842f8c2818c6b65398a62bcd1437..74549b8b688435cbdf5b839ffe3f9d867ea871e1 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -79,7 +79,7 @@ %strong = link_to project.full_name, [:admin, project] = gl_badge_tag storage_counter(project.statistics.storage_size) - %span.float-right.light + %span.gl-float-right.light %span.monospace= project.full_path + '.git' - unless @projects.size < Kaminari.config.default_per_page - c.with_footer do @@ -98,7 +98,7 @@ %strong = link_to project.full_name, [:admin, project] = gl_badge_tag storage_counter(project.statistics.storage_size) - %span.float-right.light + %span.gl-float-right.light %span.monospace= project.full_path + '.git' .col-md-6 diff --git a/app/views/admin/runners/edit.html.haml b/app/views/admin/runners/edit.html.haml index 6ce094bacf1a595220a16ede0d53bce931e6204c..85b82969fe3769e6025f754bf1972308b89499cb 100644 --- a/app/views/admin/runners/edit.html.haml +++ b/app/views/admin/runners/edit.html.haml @@ -48,7 +48,7 @@ %td = project.full_name %td - .float-right + .gl-float-right = gitlab_ui_form_for project.runner_projects.new, url: admin_namespace_project_runner_projects_path(project.namespace, project), method: :post do |f| = f.hidden_field :runner_id, value: @runner.id = render Pajamas::ButtonComponent.new(size: :small, type: :submit) do diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml index bbf1e3b0b2fb9888f69d6935d153cc0f5c6bf371..c5ff11fb126946635ac3d6d3de3defb8e5b06614 100644 --- a/app/views/admin/users/projects.html.haml +++ b/app/views/admin/users/projects.html.haml @@ -16,7 +16,7 @@ %strong= link_to group.name, admin_group_path(group) – access to #{pluralize(group.projects.count, 'project')} - .float-right + .gl-float-right %span.light.vertical-align-middle= group_member.human_access - unless group_member.owner? = link_button_to nil, group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member), confirm_btn_variant: 'danger', testid: 'remove-user' }, aria: { label: _('Remove') }, method: :delete, remote: true, class: 'gl-ml-3', title: _('Remove user from group'), variant: :danger, size: :small, icon: 'remove' @@ -43,7 +43,7 @@ = project.full_name - if member - .float-right + .gl-float-right - if member.owner? %span.light= _('Owner') - else diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 8eb946d533d5175c023f1d5555b7ef4c3af3b75d..682ae4403bed62433d164d78a986dfb24553fa46 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -42,7 +42,7 @@ %span.light= _('Secondary email:') %strong = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? } - = link_button_to nil, remove_email_admin_user_path(@user, email), data: { confirm: _("Are you sure you want to remove %{email}?") % { email: email.email }, 'confirm-btn-variant': 'danger' }, method: :delete, class: 'float-right', title: _('Remove secondary email'), id: "remove_email_#{email.id}", variant: :danger, size: :small, icon: 'close' + = link_button_to nil, remove_email_admin_user_path(@user, email), data: { confirm: _("Are you sure you want to remove %{email}?") % { email: email.email }, 'confirm-btn-variant': 'danger' }, method: :delete, class: 'gl-float-right', title: _('Remove secondary email'), id: "remove_email_#{email.id}", variant: :danger, size: :small, icon: 'close' %li %span.light ID: %strong{ data: { testid: 'user-id-content' } } @@ -57,7 +57,7 @@ %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' } - if @user.two_factor_enabled? = _('Enabled') - = link_button_to _('Disable'), disable_two_factor_admin_user_path(@user), aria: { label: _('Disable') }, data: { confirm: _('Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :patch, class: 'float-right', title: _('Disable Two-factor Authentication'), variant: :danger, size: :small + = link_button_to _('Disable'), disable_two_factor_admin_user_path(@user), aria: { label: _('Disable') }, data: { confirm: _('Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :patch, class: 'gl-float-right', title: _('Disable Two-factor Authentication'), variant: :danger, size: :small - else = _('Disabled') diff --git a/app/views/profiles/chat_names/_chat_name.html.haml b/app/views/profiles/chat_names/_chat_name.html.haml index 0ac8ede3c6218731f456303597a115b140ecbc61..350ea35ab0bd7da88e1f3ba0083ebc22a12dee7c 100644 --- a/app/views/profiles/chat_names/_chat_name.html.haml +++ b/app/views/profiles/chat_names/_chat_name.html.haml @@ -10,4 +10,4 @@ = _('Never') %td - = link_button_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'float-right', aria: { label: _('Remove') }, data: { confirm: _('Are you sure you want to remove this nickname?'), confirm_btn_variant: 'danger' }, variant: :danger + = link_button_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'gl-float-right', aria: { label: _('Remove') }, data: { confirm: _('Are you sure you want to remove this nickname?'), confirm_btn_variant: 'danger' }, variant: :danger diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 408daef6034b57eae6ce14466f5afd84cd31b6b4..2d35ba988c6a031f30ac74d5658d2c29cdf21954 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -105,7 +105,7 @@ = render Pajamas::ButtonComponent.new(variant: :danger, href: registration[:delete_path], method: :delete, - button_options: { class: 'float-right', data: { confirm: _('Are you sure you want to delete this device? This action cannot be undone.'), confirm_btn_variant: "danger" }, aria: { label: _('Delete') }}) do + button_options: { class: 'gl-float-right', data: { confirm: _('Are you sure you want to delete this device? This action cannot be undone.'), confirm_btn_variant: "danger" }, aria: { label: _('Delete') }}) do = _('Delete') - else diff --git a/app/views/projects/commits/_inline_commit.html.haml b/app/views/projects/commits/_inline_commit.html.haml index 56bebeca581cd4c2dfce5cee6c5989289ed78dab..d4c430b7f579e8ced12eb03570e673b603b155bc 100644 --- a/app/views/projects/commits/_inline_commit.html.haml +++ b/app/views/projects/commits/_inline_commit.html.haml @@ -4,5 +4,5 @@ %span.str-truncated = link_to_markdown_field(commit, :title, project_commit_path(project, commit.id), class: "commit-row-message cgray") - .float-right + .gl-float-right #{time_ago_with_tooltip(commit.committed_date)} diff --git a/app/views/projects/hook_logs/show.html.haml b/app/views/projects/hook_logs/show.html.haml index f8025f7c4620c618eae90b30f68be6c4fd74e36c..ce547be6eb280251fc3b918c842d30619fb5b944 100644 --- a/app/views/projects/hook_logs/show.html.haml +++ b/app/views/projects/hook_logs/show.html.haml @@ -7,9 +7,9 @@ %hr - if @hook_log.oversize? - = render Pajamas::ButtonComponent.new(button_options: { class: "float-right gl-ml-3 has-tooltip", disabled: true, title: _("Request data is too large") }) do + = render Pajamas::ButtonComponent.new(button_options: { class: "gl-float-right gl-ml-3 has-tooltip", disabled: true, title: _("Request data is too large") }) do = _("Resend Request") - else - = link_button_to _("Resend Request"), @hook_log.present.retry_path, method: :post, class: 'float-right gl-ml-3' + = link_button_to _("Resend Request"), @hook_log.present.retry_path, method: :post, class: 'gl-float-right gl-ml-3' = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log } diff --git a/app/views/projects/issues/service_desk/_issue.html.haml b/app/views/projects/issues/service_desk/_issue.html.haml index dbc6e613e8b8e6147bc6ed40cdb94ecbd0141070..1bf43567d5f35bbb847833561cbdd1b3eabe23b0 100644 --- a/app/views/projects/issues/service_desk/_issue.html.haml +++ b/app/views/projects/issues/service_desk/_issue.html.haml @@ -59,7 +59,7 @@ = render 'shared/issuable_meta_data', issuable: issue - .float-right.issuable-timestamp.d-none.d-sm-inline-block + .gl-float-right.issuable-timestamp.d-none.d-sm-inline-block %span - if issue.closed? && issue.closed_at = _('closed %{timeago}').html_safe % { timeago: time_ago_with_tooltip(issue.closed_at, placement: 'bottom') } diff --git a/app/views/projects/mattermosts/_no_teams.html.haml b/app/views/projects/mattermosts/_no_teams.html.haml index c53e805fae1aba7a6782f25f0801066d3ed7acf4..90e26067959c29d3a28e5d653d6f375ca3d08943 100644 --- a/app/views/projects/mattermosts/_no_teams.html.haml +++ b/app/views/projects/mattermosts/_no_teams.html.haml @@ -9,4 +9,4 @@ and try again. %hr .clearfix - = link_button_to 'Go back', edit_project_settings_integration_path(@project, @integration), class: 'float-right' + = link_button_to 'Go back', edit_project_settings_integration_path(@project, @integration), class: 'gl-float-right' diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml index 397f96d68460f47d9ab941d4b4dc93bf82f86a3f..ba2d6585a92e943abe564bed7133774ca26e3bf5 100644 --- a/app/views/projects/mattermosts/_team_selection.html.haml +++ b/app/views/projects/mattermosts/_team_selection.html.haml @@ -41,7 +41,7 @@ = sprite_icon('external-link') %hr .clearfix - .float-right + .gl-float-right = render Pajamas::ButtonComponent.new(href: edit_project_settings_integration_path(@project, @integration)) do = _('Cancel') = f.submit s_('MattermostService|Install'), pajamas_button: true diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 29ab06a036e30e8e208398f978e329d12029c7ad..c73884d7b5c7f225ef0f082744939e54b793a262 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -68,6 +68,6 @@ = render 'shared/issuable_meta_data', issuable: merge_request - if merge_request.updated_at != merge_request.created_at - .float-right.issuable-updated-at.d-none.d-sm-inline-block.gl-text-gray-500 + .gl-float-right.issuable-updated-at.d-none.d-sm-inline-block.gl-text-gray-500 %span = _('updated %{time_ago}').html_safe % { time_ago: time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago') } diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 115382c0e30173ca012e65630a55f08d80fad0e2..04c41d3b72935484715d43200c49af52fb14a929 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -19,7 +19,7 @@ - unless hide_gutter_toggle %div - = render Pajamas::ButtonComponent.new(icon: "chevron-double-lg-left", button_options: { class: "btn-icon float-right gl-display-block gutter-toggle issuable-gutter-toggle js-sidebar-toggle gl-md-display-none!" }) + = render Pajamas::ButtonComponent.new(icon: "chevron-double-lg-left", button_options: { class: "btn-icon gl-float-right gl-display-block gutter-toggle issuable-gutter-toggle js-sidebar-toggle gl-md-display-none!" }) .detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex - if can_update_merge_request diff --git a/app/views/projects/no_repo.html.haml b/app/views/projects/no_repo.html.haml index 3abec75b971f3babf799de917b99a8392fb130fd..0e2aacbd9c1e35b978bc9af0a491ff768903c32e 100644 --- a/app/views/projects/no_repo.html.haml +++ b/app/views/projects/no_repo.html.haml @@ -23,4 +23,4 @@ - if can? current_user, :remove_project, @project .prepend-top-20 - = link_button_to _('Delete project'), project_path(@project), data: { confirm: remove_project_message(@project), confirm_btn_variant: 'danger' }, aria: { label: _('Delete project') }, method: :delete, class: 'float-right', variant: :danger + = link_button_to _('Delete project'), project_path(@project), data: { confirm: remove_project_message(@project), confirm_btn_variant: 'danger' }, aria: { label: _('Delete project') }, method: :delete, class: 'gl-float-right', variant: :danger diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml index a811dabf399420f8d93b801155316121a259567b..82288f8af7ebca843d520e8eeb5349c4981f700c 100644 --- a/app/views/search/results/_snippet_title.html.haml +++ b/app/views/search/results/_snippet_title.html.haml @@ -3,10 +3,10 @@ = link_to gitlab_snippet_path(snippet_title) do = truncate(snippet_title.title, length: 60) = snippet_badge(snippet_title) - %span.cgray.monospace.tiny.float-right.term + %span.cgray.monospace.tiny.gl-float-right.term = snippet_title.file_name - %small.float-right.cgray + %small.gl-float-right.cgray - if snippet_title.project_id? = link_to snippet_title.project.full_name, project_path(snippet_title.project) diff --git a/app/views/shared/issuable/_bulk_update_sidebar.html.haml b/app/views/shared/issuable/_bulk_update_sidebar.html.haml index 8df13ec83fe4627f64688e84d68f39abc7601a7e..5738d5efdbf7bce6f0c722d6261eb88fa181fe1a 100644 --- a/app/views/shared/issuable/_bulk_update_sidebar.html.haml +++ b/app/views/shared/issuable/_bulk_update_sidebar.html.haml @@ -9,7 +9,7 @@ .filter-item.inline.update-issues-btn.float-left = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { type: 'submit', disabled: true, class: 'js-update-selected-issues' }) do = _('Update all') - = render Pajamas::ButtonComponent.new(button_options: { class: 'js-bulk-update-menu-hide float-right' }) do + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-bulk-update-menu-hide gl-float-right' }) do = _('Cancel') - if params[:state] != 'merged' .block diff --git a/app/views/shared/issuable/_label_page_create.html.haml b/app/views/shared/issuable/_label_page_create.html.haml index 96167db80b4805a9f28ce265e89336f28b63e7cc..56ec1581bc4e99acd9fc0cde418f595a8d5e3343 100644 --- a/app/views/shared/issuable/_label_page_create.html.haml +++ b/app/views/shared/issuable/_label_page_create.html.haml @@ -21,5 +21,5 @@ .clearfix = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { class: 'float-left js-new-label-btn' }) do = _('Create') - = render Pajamas::ButtonComponent.new(button_options: { class: 'float-right js-cancel-label-btn' }) do + = render Pajamas::ButtonComponent.new(button_options: { class: 'gl-float-right js-cancel-label-btn' }) do = _('Cancel') diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 5a3c6791ff929b45ee9bd3958bd849c9068f4da7..ad116513fb06c415b461cf8efba11d966f3723dd 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -13,7 +13,7 @@ %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { always_show_toggle: true, signed: { in: signed_in }, issuable_type: issuable_type }, class: "#{sidebar_gutter_collapsed_class(is_merge_request)} #{'right-sidebar-merge-requests' if is_merge_request}", 'aria-live' => 'polite', 'aria-label': issuable_type } .issuable-sidebar{ class: "#{'is-merge-request' if is_merge_request}" } .issuable-sidebar-header{ class: "#{'gl-pb-2! gl-md-display-flex gl-justify-content-end gl-lg-display-none!' if is_merge_request}" } - = render Pajamas::ButtonComponent.new(button_options: { class: "gutter-toggle float-right js-sidebar-toggle has-tooltip gl-shadow-none! gl-display-block #{'gl-mt-2' if notifications_todos_buttons_enabled?}" , type: 'button', 'aria-label' => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }) do + = render Pajamas::ButtonComponent.new(button_options: { class: "gutter-toggle gl-float-right js-sidebar-toggle has-tooltip gl-shadow-none! gl-display-block #{'gl-mt-2' if notifications_todos_buttons_enabled?}" , type: 'button', 'aria-label' => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }) do = sidebar_gutter_toggle_icon - if signed_in - if !is_merge_request diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml index 1abf4b46d095e7188efa6b232b50a4d898fe36f9..e55089cabc67a7b758a1ba95e899c12b26cc17ed 100644 --- a/app/views/shared/milestones/_labels_tab.html.haml +++ b/app/views/shared/milestones/_labels_tab.html.haml @@ -9,7 +9,7 @@ %span.prepend-description-left = markdown_field(label, :description) - .float-right.d-none.d-lg-block + .gl-float-right.d-none.d-lg-block = link_button_to milestones_issues_path(options.merge(state: 'opened')), category: :tertiary do = n_('open issue', 'open issues', milestone_issues_by_label_count(@milestone, label, state: :opened)) = link_button_to milestones_issues_path(options.merge(state: 'closed')), category: :tertiary do diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 2e2c0300ae1b50ae67524dadb6fd41734736e037..f3fc4f32a31d7ac9eba9bb8ce97f435b8741ed67 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -4,7 +4,7 @@ %aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class(false), 'aria-live' => 'polite', 'aria-label': _('Milestone') } .issuable-sidebar.milestone-sidebar .block.milestone-progress.issuable-sidebar-header - %a.gutter-toggle.float-right.js-sidebar-toggle.has-tooltip{ role: "button", href: "#", "aria-label" => s_('MilestoneSidebar|Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } } + %a.gutter-toggle.gl-float-right.js-sidebar-toggle.has-tooltip{ role: "button", href: "#", "aria-label" => s_('MilestoneSidebar|Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } } = sidebar_gutter_toggle_icon .title.hide-collapsed %strong.bold== #{milestone.percent_complete}% @@ -22,7 +22,7 @@ .title = s_('MilestoneSidebar|Start date') - if @project && can?(current_user, :admin_milestone, @project) - = link_to s_('MilestoneSidebar|Edit'), edit_project_milestone_path(@project, @milestone), class: 'js-sidebar-dropdown-toggle edit-link float-right' + = link_to s_('MilestoneSidebar|Edit'), edit_project_milestone_path(@project, @milestone), class: 'js-sidebar-dropdown-toggle edit-link gl-float-right' .value %span.value-content{ data: { testid: 'start-date-content' } } - if milestone.start_date @@ -59,7 +59,7 @@ .title.hide-collapsed = s_('MilestoneSidebar|Due date') - if @project && can?(current_user, :admin_milestone, @project) - = link_to s_('MilestoneSidebar|Edit'), edit_project_milestone_path(@project, @milestone), class: 'js-sidebar-dropdown-toggle edit-link float-right' + = link_to s_('MilestoneSidebar|Edit'), edit_project_milestone_path(@project, @milestone), class: 'js-sidebar-dropdown-toggle edit-link gl-float-right' .value.hide-collapsed %span.value-content{ data: { testid: 'due-date-content' } } - if milestone.due_date @@ -81,7 +81,7 @@ = s_('MilestoneSidebar|Issues') = gl_badge_tag milestone.issues_visible_to_user(current_user).count, variant: :muted, size: :sm - if show_new_issue_link?(project) - = link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: s_('MilestoneSidebar|New Issue') do + = link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "gl-float-right", title: s_('MilestoneSidebar|New Issue') do = s_('MilestoneSidebar|New issue') .value.hide-collapsed.bold %span.milestone-stat diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 56cdc30e76016b470cef20a291a5706c53870da9..702f101b48ecf28935bf028b68793cea020219bf 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -33,5 +33,5 @@ - else = _('created %{timeAgo} by %{author}').html_safe % { timeAgo: created_at, author: author } - .float-right + .gl-float-right = _('updated %{timeAgo}').html_safe % { timeAgo: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') } diff --git a/app/views/shared/wikis/_pages_wiki_page.html.haml b/app/views/shared/wikis/_pages_wiki_page.html.haml index 23931bbbc32454fef4a8921e20afeafbb290929b..5bb001b4b599c5d27260615e548c8a69c1b8f473 100644 --- a/app/views/shared/wikis/_pages_wiki_page.html.haml +++ b/app/views/shared/wikis/_pages_wiki_page.html.haml @@ -1,6 +1,6 @@ %li = link_to wiki_page.human_title, wiki_page_path(@wiki, wiki_page), data: { testid: 'wiki-page-link', qa_page_name: wiki_page.slug } %small (#{wiki_page.format}) - .float-right + .gl-float-right - if wiki_page.last_version %small= (s_("Last edited %{date}") % { date: time_ago_with_tooltip(wiki_page.last_version.authored_date) }).html_safe diff --git a/app/views/shared/wikis/_sidebar.html.haml b/app/views/shared/wikis/_sidebar.html.haml index dd4ea9e72abe540328cf37934732508c590b1413..7d9fbfbc57df3d431f97fdb22ed6b75aa91e494f 100644 --- a/app/views/shared/wikis/_sidebar.html.haml +++ b/app/views/shared/wikis/_sidebar.html.haml @@ -3,7 +3,7 @@ %aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" }, 'aria-label': _('Wiki') } .sidebar-container .block.wiki-sidebar-header.gl-mb-3.w-100 - %a.gutter-toggle.float-right.d-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } + %a.gutter-toggle.gl-float-right.d-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } = sprite_icon('chevron-double-lg-right', css_class: 'gl-icon') .gl-display-flex.gl-flex-wrap diff --git a/app/views/user_settings/active_sessions/_active_session.html.haml b/app/views/user_settings/active_sessions/_active_session.html.haml index e91c28e6e84ddb8c994bc0aa3c0c99b33047061b..90a02a8aac8bb6bb271aa7b5bbd32947a87796b7 100644 --- a/app/views/user_settings/active_sessions/_active_session.html.haml +++ b/app/views/user_settings/active_sessions/_active_session.html.haml @@ -26,6 +26,6 @@ = l(active_session.created_at, format: :short) - unless is_current_session - .float-right + .gl-float-right = link_button_to revoke_session_path(active_session), data: { confirm: _('Are you sure? The device will be signed out of GitLab and all remember me tokens revoked.'), confirm_btn_variant: :danger }, method: :delete, class: 'gl-ml-3', variant: :danger, 'aria-label': _('Revoke') do = _('Revoke') diff --git a/app/views/user_settings/user_settings/_event_table.haml b/app/views/user_settings/user_settings/_event_table.haml index 67c649a9fceca626d1a422cee5825fb44b878388..5b617815dc0999644a0dca24717f36819c9aaffb 100644 --- a/app/views/user_settings/user_settings/_event_table.haml +++ b/app/views/user_settings/user_settings/_event_table.haml @@ -8,6 +8,6 @@ %span.description = audit_icon('key', css_class: 'gl-mr-2') = _('Signed in with %{authentication} authentication') % { authentication: event.provider } - %span.float-right= time_ago_with_tooltip(event.created_at) + %span.gl-float-right= time_ago_with_tooltip(event.created_at) = paginate events, theme: "gitlab" diff --git a/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue b/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue index 1b568a05879efd1b5c15823476f1326f912dd07c..d331fe2adbfe0d679b1418d14050be2de13f4b20 100644 --- a/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue +++ b/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue @@ -196,7 +196,7 @@ export default { <gl-button v-if="isFilteringByDaysToMerge" ref="clearChartFiltersBtn" - class="btn-link float-right" + class="btn-link gl-float-right" type="button" variant="default" @click="resetMainChartSelection()" diff --git a/ee/app/assets/javascripts/boards/components/assignee_select.vue b/ee/app/assets/javascripts/boards/components/assignee_select.vue index e9d5e7899fd954ccefa5d66c1181bfae3a2ae07f..6da64bdb1b1d001494a92acd8eb259fc011a087d 100644 --- a/ee/app/assets/javascripts/boards/components/assignee_select.vue +++ b/ee/app/assets/javascripts/boards/components/assignee_select.vue @@ -138,7 +138,7 @@ export default { v-if="canEdit" category="tertiary" size="small" - class="edit-link float-right" + class="edit-link gl-float-right" @click="toggleEdit" > {{ $options.i18n.edit }} diff --git a/ee/app/assets/javascripts/boards/components/iteration_select.vue b/ee/app/assets/javascripts/boards/components/iteration_select.vue index bb158889323537c3db7d58c23aeb1b9d889e6439..a932fe1b00898a6e939dbe98516ff6f1d4b82ca0 100644 --- a/ee/app/assets/javascripts/boards/components/iteration_select.vue +++ b/ee/app/assets/javascripts/boards/components/iteration_select.vue @@ -215,7 +215,7 @@ export default { v-if="canEdit" category="tertiary" size="small" - class="edit-link float-right" + class="edit-link gl-float-right" @click="toggleEdit" > {{ $options.i18n.edit }} diff --git a/ee/app/assets/javascripts/boards/components/labels_select.vue b/ee/app/assets/javascripts/boards/components/labels_select.vue index d2a60dd9660db675f4cd442cd2329481fd613f5c..0d84b2c874d111c1d2d55d7f36d5b50ccfeefc0e 100644 --- a/ee/app/assets/javascripts/boards/components/labels_select.vue +++ b/ee/app/assets/javascripts/boards/components/labels_select.vue @@ -176,7 +176,7 @@ export default { v-if="canEdit" category="tertiary" size="small" - class="edit-link float-right" + class="edit-link gl-float-right" data-testid="labels-edit-button" @click="toggleEdit" > diff --git a/ee/app/assets/javascripts/boards/components/milestone_select.vue b/ee/app/assets/javascripts/boards/components/milestone_select.vue index 5a62e8b24267951118e953eb9e5fc6d515e52232..82eaa4ceb4fe3418012de8a3559e7e86c06ea66d 100644 --- a/ee/app/assets/javascripts/boards/components/milestone_select.vue +++ b/ee/app/assets/javascripts/boards/components/milestone_select.vue @@ -126,7 +126,7 @@ export default { v-if="canEdit" category="tertiary" size="small" - class="edit-link float-right" + class="edit-link gl-float-right" @click="toggleEdit" > {{ $options.i18n.edit }} diff --git a/ee/app/assets/javascripts/boards/components/weight_select.vue b/ee/app/assets/javascripts/boards/components/weight_select.vue index e6ab16f7bb4c3acb365fb2e317bebcbcb1c0ed99..298966bd898a3abf3bdf13729b7384c062de3718 100644 --- a/ee/app/assets/javascripts/boards/components/weight_select.vue +++ b/ee/app/assets/javascripts/boards/components/weight_select.vue @@ -94,7 +94,7 @@ export default { v-if="canEdit" category="tertiary" size="small" - class="edit-link float-right" + class="edit-link gl-float-right" @click="toggleEdit" > {{ $options.i18n.edit }} diff --git a/ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_header.vue b/ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_header.vue index 622428cae52da364cc9cac136e536ddee96be237..f7af89b9f286bd0a4941115be51cfa9d7d59f0dd 100644 --- a/ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_header.vue +++ b/ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_header.vue @@ -24,7 +24,7 @@ export default { <div class="issuable-sidebar-header"> <toggle-sidebar :collapsed="sidebarCollapsed" - css-classes="float-right" + css-classes="gl-float-right" @toggle="toggleSidebar({ sidebarCollapsed })" /> <slot></slot> diff --git a/ee/app/assets/javascripts/sidebar/components/cve_id_request/cve_id_request.vue b/ee/app/assets/javascripts/sidebar/components/cve_id_request/cve_id_request.vue index e436f2738ab36609ee6775b9280484b2478a3686..b5d3d1cf4597a298092b6f348f723e8bc5bb8055 100644 --- a/ee/app/assets/javascripts/sidebar/components/cve_id_request/cve_id_request.vue +++ b/ee/app/assets/javascripts/sidebar/components/cve_id_request/cve_id_request.vue @@ -90,7 +90,7 @@ export default { {{ $options.i18n.action }} <div v-if="!showHelpState" - class="help-button float-right" + class="help-button gl-float-right" data-testid="help-button" @click="toggleHelpState(true)" > @@ -98,7 +98,7 @@ export default { </div> <div v-else - class="close-help-button float-right" + class="close-help-button gl-float-right" data-testid="close-help-button" @click="toggleHelpState(false)" > diff --git a/ee/app/views/admin/dashboard/_geo.html.haml b/ee/app/views/admin/dashboard/_geo.html.haml index f1f483ba0705b51dca6be4cec2dc16fdd93b86b9..65cc10ff4c2b95f17d8b468e181ec698d31327f7 100644 --- a/ee/app/views/admin/dashboard/_geo.html.haml +++ b/ee/app/views/admin/dashboard/_geo.html.haml @@ -2,5 +2,5 @@ %p = link_to _('Geo'), admin_geo_nodes_path - %span.float-right + %span.gl-float-right = pluralize(GeoNode.count, _('site')) diff --git a/ee/app/views/groups/saml_group_links/_saml_group_link.html.haml b/ee/app/views/groups/saml_group_links/_saml_group_link.html.haml index e36dc6d72f10185e19a3fc75af9f04652b4c9f8d..8d4e612f65278cb705bb37f78a6b5ddd6e1f9a7b 100644 --- a/ee/app/views/groups/saml_group_links/_saml_group_link.html.haml +++ b/ee/app/views/groups/saml_group_links/_saml_group_link.html.haml @@ -1,5 +1,5 @@ %li - .float-right + .gl-float-right = link_button_to group_saml_group_link_path(group, saml_group_link), method: :delete, 'aria-label': _('Remove link'), data: { confirm: s_('GroupSAML|Are you sure you want to remove the SAML group link?'), 'confirm-btn-variant': 'danger' }, variant: :danger, icon: 'unlink' do = _('Remove') diff --git a/ee/app/views/groups/saml_providers/_form.html.haml b/ee/app/views/groups/saml_providers/_form.html.haml index 5d67f76bdc7539f375d0e355a3bfc40b316d16db..67223c5a8344b8109a252c33f141a2b2e78915ad 100644 --- a/ee/app/views/groups/saml_providers/_form.html.haml +++ b/ee/app/views/groups/saml_providers/_form.html.haml @@ -37,5 +37,5 @@ .mt-3 = f.submit _("Save changes"), data: { testid: 'save-changes-button' }, pajamas_button: true - #js-saml-test-button.has-tooltip.float-right + #js-saml-test-button.has-tooltip.gl-float-right = render 'test_button', saml_provider: @saml_provider diff --git a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml index 92f40d7b6e1b06c5ba18b49c82610dd03eb511a9..5e628f7060745af969a617baf3c95e41b372e205 100644 --- a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml +++ b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml @@ -1,5 +1,5 @@ %li - .float-right + .gl-float-right = link_button_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, variant: :danger, size: :small, icon: 'unlink' do = _('Remove') %strong= ldap_group_link.cn ? "Group: #{ldap_group_link.cn}" : "Filter: #{ldap_group_link.filter}" diff --git a/spec/frontend/sidebar/components/todo_toggle/__snapshots__/todo_spec.js.snap b/spec/frontend/sidebar/components/todo_toggle/__snapshots__/todo_spec.js.snap index b5d8d31f88f29893d110bb5781a59e94f1ece1a4..b6299a9a4f23ebac0c8b6d0600d2d4b543fa07c9 100644 --- a/spec/frontend/sidebar/components/todo_toggle/__snapshots__/todo_spec.js.snap +++ b/spec/frontend/sidebar/components/todo_toggle/__snapshots__/todo_spec.js.snap @@ -3,7 +3,7 @@ exports[`SidebarTodo template renders component container element with proper data attributes 1`] = ` <button aria-label="Mark as done" - class="btn btn-default btn-todo float-right gl-button issuable-header-btn" + class="btn btn-default btn-todo gl-button gl-float-right issuable-header-btn" data-issuable-id="1" data-issuable-type="epic" type="button" diff --git a/spec/frontend/sidebar/components/todo_toggle/todo_spec.js b/spec/frontend/sidebar/components/todo_toggle/todo_spec.js index 4da915f0dd3edfa82b4b8e0fbd6022a30f552b72..6b096090dcf3748ddbcd336cefdd9157ed711603 100644 --- a/spec/frontend/sidebar/components/todo_toggle/todo_spec.js +++ b/spec/frontend/sidebar/components/todo_toggle/todo_spec.js @@ -23,7 +23,7 @@ describe('SidebarTodo', () => { it.each` state | classes - ${false} | ${['gl-button', 'btn', 'btn-default', 'btn-todo', 'issuable-header-btn', 'float-right']} + ${false} | ${['gl-button', 'btn', 'btn-default', 'btn-todo', 'issuable-header-btn', 'gl-float-right']} ${true} | ${['btn-blank', 'btn-todo', 'sidebar-collapsed-icon', 'js-dont-change-state']} `('returns todo button classes for when `collapsed` prop is `$state`', ({ state, classes }) => { createComponent({ collapsed: state });