Skip to content

G
gitlab-ce
Commit 95c4b344 authored by Taurie Davis's avatar Taurie Davis Committed by Jose Vargas
Browse files
Options

Revert justified-content-end settings buttons 

Corrects positioning of buttons in admin, group, and project settings
parent 243aa5ab
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 306 deletions
app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue
View file @ 95c4b344
......@@ -180,11 +180,9 @@ export default {
/>
</span>
</div>
<span class="gl-display-flex gl-justify-content-end">
<gl-button v-gl-modal.authKeyModal class="gl-mt-2" :disabled="isDisabled">{{
$options.RESET_KEY
}}</gl-button>
</span>
<gl-button v-gl-modal.authKeyModal class="gl-mt-2" :disabled="isDisabled">{{
$options.RESET_KEY
}}</gl-button>
<gl-modal
modal-id="authKeyModal"
:title="$options.RESET_KEY"
......
app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
View file @ 95c4b344
......@@ -511,16 +511,11 @@ export default {
max-rows="10"
/>
</gl-form-group>
<div class="gl-display-flex gl-justify-content-end">
<gl-button :disabled="!canTestAlert" @click="validateTestAlert">{{
$options.i18n.testAlertInfo
}}</gl-button>
</div>
<gl-button :disabled="!canTestAlert" @click="validateTestAlert">{{
$options.i18n.testAlertInfo
}}</gl-button>
</template>
<div class="footer-block row-content-block gl-display-flex gl-justify-content-space-between">
<gl-button category="primary" :disabled="!canSaveConfig" @click="onReset">
{{ __('Cancel') }}
</gl-button>
<gl-button
variant="success"
category="primary"
......@@ -529,6 +524,9 @@ export default {
>
{{ __('Save changes') }}
</gl-button>
<gl-button category="primary" :disabled="!canSaveConfig" @click="onReset">
{{ __('Cancel') }}
</gl-button>
</div>
</gl-form>
</div>
......
app/assets/javascripts/badges/components/badge_form.vue
View file @ 95c4b344
......@@ -218,7 +218,7 @@ export default {
</p>
</div>
<div v-if="isEditing" class="row-content-block gl-display-flex gl-justify-content-end">
<div v-if="isEditing" class="row-content-block">
<gl-button class="btn-cancel gl-mr-4" data-testid="cancelEditing" @click="onCancel">
{{ __('Cancel') }}
</gl-button>
......@@ -232,7 +232,7 @@ export default {
{{ s__('Badges|Save changes') }}
</gl-button>
</div>
<div v-else class="gl-display-flex gl-justify-content-end form-group">
<div v-else class="form-group">
<gl-button :loading="isSaving" type="submit" variant="success" category="primary">
{{ s__('Badges|Add badge') }}
</gl-button>
......
app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
View file @ 95c4b344
......@@ -163,10 +163,7 @@ export default {
</p>
</template>
</gl-table>
<div
class="ci-variable-actions d-flex justify-content-end"
:class="{ 'justify-content-center': !tableIsNotEmpty }"
>
<div class="ci-variable-actions" :class="{ 'justify-content-center': !tableIsNotEmpty }">
<gl-button
v-if="tableIsNotEmpty"
ref="secret-value-reveal-button"
......
app/assets/javascripts/deploy_freeze/components/deploy_freeze_table.vue
View file @ 95c4b344
......@@ -69,15 +69,13 @@ export default {
</p>
</template>
</gl-table>
<div class="gl-display-flex gl-justify-content-center">
<gl-button
v-gl-modal.deploy-freeze-modal
data-testid="add-deploy-freeze"
category="primary"
variant="success"
>
{{ $options.translations.addDeployFreeze }}
</gl-button>
</div>
<gl-button
v-gl-modal.deploy-freeze-modal
data-testid="add-deploy-freeze"
category="primary"
variant="success"
>
{{ $options.translations.addDeployFreeze }}
</gl-button>
</div>
</template>
app/assets/javascripts/error_tracking_settings/components/app.vue
View file @ 95c4b344
......@@ -92,15 +92,13 @@ export default {
@select-project="updateSelectedProject"
/>
</div>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
:disabled="settingsLoading"
class="js-error-tracking-button"
variant="success"
@click="handleSubmit"
>
{{ __('Save changes') }}
</gl-button>
</div>
<gl-button
:disabled="settingsLoading"
class="js-error-tracking-button"
variant="success"
@click="handleSubmit"
>
{{ __('Save changes') }}
</gl-button>
</div>
</template>
app/assets/javascripts/grafana_integration/components/grafana_integration.vue
View file @ 95c4b344
......@@ -92,11 +92,9 @@ export default {
</a>
</p>
</gl-form-group>
<div class="gl-display-flex gl-justify-content-end">
<gl-button variant="success" category="primary" @click="updateGrafanaIntegration">
{{ __('Save Changes') }}
</gl-button>
</div>
<gl-button variant="success" category="primary" @click="updateGrafanaIntegration">
{{ __('Save Changes') }}
</gl-button>
</form>
</div>
</section>
......
app/assets/javascripts/incidents_settings/components/alerts_form.vue
View file @ 95c4b344
......@@ -130,18 +130,16 @@ export default {
<span>{{ $options.i18n.autoCloseIncidents.label }}</span>
</gl-form-checkbox>
</gl-form-group>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
ref="submitBtn"
data-qa-selector="save_changes_button"
:disabled="loading"
variant="success"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</div>
<gl-button
ref="submitBtn"
data-qa-selector="save_changes_button"
:disabled="loading"
variant="success"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</form>
</div>
</template>
app/assets/javascripts/incidents_settings/components/pagerduty_form.vue
View file @ 95c4b344
......@@ -149,17 +149,15 @@ export default {
</template>
</gl-sprintf>
</div>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
v-gl-modal.resetWebhookModal
class="gl-mt-3"
:disabled="loading"
:loading="resettingWebhook"
data-testid="webhook-reset-btn"
>
{{ $options.i18n.webhookUrl.resetWebhookUrl }}
</gl-button>
</div>
<gl-button
v-gl-modal.resetWebhookModal
class="gl-mt-3"
:disabled="loading"
:loading="resettingWebhook"
data-testid="webhook-reset-btn"
>
{{ $options.i18n.webhookUrl.resetWebhookUrl }}
</gl-button>
<gl-modal
modal-id="resetWebhookModal"
:title="$options.i18n.webhookUrl.resetWebhookUrl"
......@@ -170,17 +168,15 @@ export default {
{{ $options.i18n.webhookUrl.restKeyInfo }}
</gl-modal>
</gl-form-group>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
ref="submitBtn"
:disabled="isSaveDisabled"
variant="success"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</div>
<gl-button
ref="submitBtn"
:disabled="isSaveDisabled"
variant="success"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</form>
</div>
</template>
app/assets/javascripts/operation_settings/components/metrics_settings.vue
View file @ 95c4b344
......@@ -44,11 +44,9 @@ export default {
<form>
<dashboard-timezone />
<external-dashboard />
<div class="gl-display-flex gl-justify-content-end">
<gl-button variant="success" category="primary" @click="saveChanges">
{{ __('Save Changes') }}
</gl-button>
</div>
<gl-button variant="success" category="primary" @click="saveChanges">
{{ __('Save Changes') }}
</gl-button>
</form>
</div>
</section>
......
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
View file @ 95c4b344
......@@ -157,16 +157,14 @@ export default {
}}
</span>
</template>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
variant="success"
class="gl-mt-5"
:disabled="isTemplateSaving"
@click="onSaveTemplate"
>
{{ __('Save changes') }}
</gl-button>
</div>
<gl-button
variant="success"
class="gl-mt-5"
:disabled="isTemplateSaving"
@click="onSaveTemplate"
>
{{ __('Save changes') }}
</gl-button>
</div>
</div>
</div>
......
app/assets/javascripts/registry/settings/components/settings_form.vue
View file @ 95c4b344
......@@ -103,27 +103,25 @@ export default {
/>
</template>
<template #footer>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
ref="cancel-button"
type="reset"
class="gl-mr-3 gl-display-block"
:disabled="isCancelButtonDisabled"
>
{{ __('Cancel') }}
</gl-button>
<gl-button
ref="save-button"
type="submit"
:disabled="isSubmitButtonDisabled"
variant="success"
category="primary"
class="gl-display-flex gl-justify-content-center gl-align-items-center js-no-auto-disable"
>
{{ $options.i18n.SET_CLEANUP_POLICY_BUTTON }}
<gl-loading-icon v-if="isLoading" class="gl-ml-3" />
</gl-button>
</div>
<gl-button
ref="cancel-button"
type="reset"
class="gl-mr-3 gl-display-block float-right"
:disabled="isCancelButtonDisabled"
>
{{ __('Cancel') }}
</gl-button>
<gl-button
ref="save-button"
type="submit"
:disabled="isSubmitButtonDisabled"
variant="success"
category="primary"
class="js-no-auto-disable"
>
{{ $options.i18n.SET_CLEANUP_POLICY_BUTTON }}
<gl-loading-icon v-if="isLoading" class="gl-ml-3" />
</gl-button>
</template>
</gl-card>
</form>
......
app/views/admin/application_settings/_account_and_limit.html.haml
View file @ 95c4b344
......@@ -60,5 +60,4 @@
= render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f
= render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'
= f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'
app/views/admin/application_settings/_diff_limits.html.haml
View file @ 95c4b344
......@@ -12,5 +12,4 @@
= link_to sprite_icon('question-o'),
help_page_path('user/admin_area/diff_limits',
anchor: 'maximum-diff-patch-size')
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success'
= f.submit _('Save changes'), class: 'btn btn-success'
app/views/admin/application_settings/_external_authorization_service_form.html.haml
View file @ 95c4b344
......@@ -47,5 +47,4 @@
.form-group
= f.label :external_authorization_service_default_label, _('Default classification label'), class: 'label-bold'
= f.text_field :external_authorization_service_default_label, class: 'form-control'
.gl-display-flex.gl-justify-content-end
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_initial_branch_name.html.haml
View file @ 95c4b344
......@@ -10,5 +10,4 @@
%span.form-text.text-muted
= (_("Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name } ).html_safe
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'gl-button btn-success'
= f.submit _('Save changes'), class: 'gl-button btn-success'
app/views/admin/application_settings/_repository_check.html.haml
View file @ 95c4b344
......@@ -18,8 +18,7 @@
If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
- clear_repository_checks_link = _('Clear all repository checks')
- clear_repository_checks_message = _('This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?')
.gl-display-flex.gl-justify-content-end
= link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "btn btn-sm btn-remove"
= link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "btn btn-sm btn-remove"
.sub-section
%h4 Housekeeping
......@@ -56,5 +55,4 @@
.form-text.text-muted
Number of Git pushes after which 'git gc' is run.
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/admin/application_settings/_repository_mirrors_form.html.haml
View file @ 95c4b344
......@@ -14,5 +14,4 @@
= render_if_exists 'admin/application_settings/mirror_settings', form: f
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/admin/application_settings/_repository_static_objects.html.haml
View file @ 95c4b344
......@@ -15,5 +15,4 @@
%span.form-text.text-muted#static_objects_external_storage_auth_token_help_block
= _('A secure token that identifies an external storage request.')
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/admin/application_settings/_repository_storage.html.haml
View file @ 95c4b344
......@@ -22,5 +22,4 @@
= f.text_field attribute[:name], class: 'form-text-input', value: attribute[:value]
= f.label attribute[:label], attribute[:label], class: 'label-bold form-check-label'
%br
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
= f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
app/views/admin/application_settings/_signin.html.haml
View file @ 95c4b344
......@@ -57,5 +57,4 @@
= f.label :sign_in_text, class: 'label-bold'
= f.text_area :sign_in_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled
.gl-display-flex.gl-justify-content-end
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_signup.html.haml
View file @ 95c4b344
......@@ -67,5 +67,4 @@
= f.label :after_sign_up_text, class: 'label-bold'
= f.text_area :after_sign_up_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled
.gl-display-flex.gl-justify-content-end
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_terminal.html.haml
View file @ 95c4b344
......@@ -8,5 +8,4 @@
.form-text.text-muted
Maximum time for web terminal websocket connection (in seconds).
0 for unlimited.
.gl-display-flex.gl-justify-content-end
= f.submit 'Save changes', class: "btn btn-success"
= f.submit 'Save changes', class: "btn btn-success"
app/views/admin/application_settings/_terms.html.haml
View file @ 95c4b344
......@@ -15,5 +15,4 @@
= f.text_area :terms, class: 'form-control', rows: 8
.form-text.text-muted
= _("Markdown enabled")
.gl-display-flex.gl-justify-content-end
= f.submit _("Save changes"), class: "btn btn-success"
= f.submit _("Save changes"), class: "btn btn-success"
app/views/admin/application_settings/_visibility_and_access.html.haml
View file @ 95c4b344
......@@ -66,5 +66,4 @@
.form-group
= f.label field_name, "#{type.upcase} SSH keys", class: 'label-bold'
= f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/admin/application_settings/general.html.haml
View file @ 95c4b344
......@@ -101,8 +101,7 @@
= s_('IDE|Live Preview')
%span.form-text.text-muted
= s_('IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview.')
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
- if Feature.enabled?(:maintenance_mode)
%section.settings.no-animate#js-maintenance-mode-toggle{ class: ('expanded' if expanded_by_default?) }
......
app/views/clusters/clusters/_advanced_settings.html.haml
View file @ 95c4b344
......@@ -24,8 +24,7 @@
.text-muted
= html_escape(s_('ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes %{code_open}cluster-admin%{code_close} privileges.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
= link_to _('More information'), help_page_path('user/clusters/management_project.md'), target: '_blank'
.gl-display-flex.gl-justify-content-end
= field.submit _('Save changes'), class: 'btn btn-success'
= field.submit _('Save changes'), class: 'btn btn-success'
- if @cluster.managed?
.sub-section.form-group
......@@ -33,8 +32,7 @@
= s_('ClusterIntegration|Clear cluster cache')
%p
= s_("ClusterIntegration|Clear the local cache of namespace and service accounts. This is necessary if your integration has become out of sync. The cache is repopulated during the next CI job that requires namespace and service accounts.")
.gl-display-flex.gl-justify-content-end
= link_to(s_('ClusterIntegration|Clear cluster cache'), clusterable.clear_cluster_cache_path(@cluster), method: :delete, class: 'btn btn-primary')
= link_to(s_('ClusterIntegration|Clear cluster cache'), clusterable.clear_cluster_cache_path(@cluster), method: :delete, class: 'btn btn-primary')
.sub-section.form-group
%h4.text-danger
......
app/views/clusters/clusters/_provider_details_form.html.haml
View file @ 95c4b344
......@@ -48,5 +48,5 @@
- if cluster.allow_user_defined_namespace?
= render('clusters/clusters/namespace', platform_field: platform_field)
.form-group.gl-display-flex.gl-justify-content-end
.form-group
= field.submit s_('ClusterIntegration|Save changes'), class: 'btn btn-success'
app/views/groups/settings/_advanced.html.haml
View file @ 95c4b344
......@@ -22,8 +22,7 @@
pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS,
title: s_('GroupSettings|Please choose a group URL with no special characters.'),
"data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
.gl-display-flex.gl-justify-content-end
= f.submit s_('GroupSettings|Change group URL'), class: 'btn btn-warning'
= f.submit s_('GroupSettings|Change group URL'), class: 'btn btn-warning'
.sub-section
%h4.warning-title= s_('GroupSettings|Transfer group')
......@@ -39,8 +38,7 @@
%li= s_('GroupSettings|You can only transfer the group to a group you manage.')
%li= s_('GroupSettings|You will need to update your local repositories to point to the new location.')
%li= s_("GroupSettings|If the parent group's visibility is lower than the group current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.")
.gl-display-flex.gl-justify-content-end
= f.submit s_('GroupSettings|Transfer group'), class: 'btn btn-warning'
= f.submit s_('GroupSettings|Transfer group'), class: 'btn btn-warning'
= render 'groups/settings/remove', group: @group
= render_if_exists 'groups/settings/restore', group: @group
app/views/groups/settings/_export.html.haml
View file @ 95c4b344
......@@ -24,6 +24,5 @@
= link_to _('Download export'), download_export_group_path(group),
rel: 'nofollow', method: :get, class: 'btn btn-default', data: { qa_selector: 'download_export_link' }
- else
.gl-display-flex.gl-justify-content-end
= link_to _('Export group'), export_group_path(group),
method: :post, class: 'btn btn-default', data: { qa_selector: 'export_group_link' }
= link_to _('Export group'), export_group_path(group),
method: :post, class: 'btn btn-default', data: { qa_selector: 'export_group_link' }
app/views/groups/settings/_general.html.haml
View file @ 95c4b344
......@@ -29,5 +29,4 @@
= link_to _('Remove avatar'), group_avatar_path(@group.to_param), data: { confirm: _('Avatar will be removed. Are you sure?')}, method: :delete, class: 'btn btn-link'
= render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success mt-4 js-dirty-submit', data: { qa_selector: 'save_name_visibility_settings_button' }
= f.submit _('Save changes'), class: 'btn btn-success mt-4 js-dirty-submit', data: { qa_selector: 'save_name_visibility_settings_button' }
app/views/groups/settings/_permanent_deletion.html.haml
View file @ 95c4b344
......@@ -5,5 +5,4 @@
= _('Removing this group also removes all child projects, including archived projects, and their resources.')
%br
%strong= _('Removed group can not be restored!')
.gl-display-flex.gl-justify-content-end
= button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }
= button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }
app/views/groups/settings/_permissions.html.haml
View file @ 95c4b344
......@@ -41,5 +41,4 @@
= render 'groups/settings/two_factor_auth', f: f
= render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
= render_if_exists 'groups/member_lock_setting', f: f, group: @group
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
= f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
app/views/projects/_export.html.haml
View file @ 95c4b344
......@@ -26,6 +26,5 @@
= link_to _('Generate new export'), generate_new_export_project_path(project),
method: :post, class: "btn btn-default"
- else
.gl-display-flex.gl-justify-content-end
= link_to _('Export project'), export_project_path(project),
method: :post, class: "btn btn-default", data: { qa_selector: 'export_project_link' }
= link_to _('Export project'), export_project_path(project),
method: :post, class: "btn btn-default", data: { qa_selector: 'export_project_link' }
app/views/projects/_visibility_modal.html.haml
View file @ 95c4b344
......@@ -23,7 +23,7 @@
= ("To confirm, type %{phrase_code}").html_safe % { phrase_code: '<code class="js-confirm-danger-match">%{phrase_name}</code>'.html_safe % { phrase_name: @project.full_path } }
.form-group
= text_field_tag 'confirm_path_input', '', class: 'form-control js-confirm-danger-input qa-confirm-input'
.form-actions.gl-display-flex.gl-justify-content-end
.form-actions
%button.btn.btn-default.gl-mr-4{ type: "button", "data-dismiss": "modal" }
= _('Cancel')
= submit_tag _('Reduce project visibility'), class: "btn btn-danger js-confirm-danger-submit qa-confirm-button", disabled: true
app/views/projects/cleanup/_show.html.haml
View file @ 95c4b344
......@@ -26,5 +26,4 @@
.form-text.text-muted
= _("The maximum file size allowed is %{size}.") % { size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes) }
.gl-display-flex.gl-justify-content-end
= f.submit _('Start cleanup'), class: 'btn btn-success'
= f.submit _('Start cleanup'), class: 'btn btn-success'
app/views/projects/default_branch/_show.html.haml
View file @ 95c4b344
......@@ -28,5 +28,4 @@
= _("Issues referenced by merge requests and commits within the default branch will be closed automatically")
= link_to sprite_icon('question-o'), help_page_path('user/project/issues/managing_issues.md', anchor: 'disabling-automatic-issue-closing'), target: '_blank'
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/projects/edit.html.haml
View file @ 95c4b344
......@@ -21,10 +21,9 @@
%input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' }
%template.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data_json(@project)
.js-project-permissions-form
.gl-display-flex.gl-justify-content-end
- if show_visibility_confirm_modal?(@project)
= render "visibility_modal"
= f.submit _('Save changes'), class: "btn btn-success #{('js-confirm-danger' if show_visibility_confirm_modal?(@project))}", data: { qa_selector: 'visibility_features_permissions_save_button', check_field_name: ("project[visibility_level]" if show_visibility_confirm_modal?(@project)), check_compare_value: @project.visibility_level }
- if show_visibility_confirm_modal?(@project)
= render "visibility_modal"
= f.submit _('Save changes'), class: "btn btn-success #{('js-confirm-danger' if show_visibility_confirm_modal?(@project))}", data: { qa_selector: 'visibility_features_permissions_save_button', check_field_name: ("project[visibility_level]" if show_visibility_confirm_modal?(@project)), check_compare_value: @project.visibility_level }
%section.qa-merge-request-settings.rspec-merge-request-settings.settings.merge-requests-feature.no-animate#js-merge-request-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
.settings-header
......@@ -38,8 +37,7 @@
= form_for @project, remote: true, html: { multipart: true, class: "merge-request-settings-form js-mr-settings-form" }, authenticity_token: true do |f|
%input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' }
= render 'projects/merge_request_settings', form: f
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success qa-save-merge-request-changes rspec-save-merge-request-changes"
= f.submit _('Save changes'), class: "btn btn-succes qa-save-merge-request-changes rspec-save-merge-request-changes"
= render_if_exists 'projects/merge_request_approvals_settings', expanded: expanded
......@@ -70,9 +68,8 @@
.sub-section
%h4= _('Housekeeping')
%p= _('Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects.')
.gl-display-flex.gl-justify-content-end
= link_to _('Run housekeeping'), housekeeping_project_path(@project),
method: :post, class: "btn btn-default"
= link_to _('Run housekeeping'), housekeeping_project_path(@project),
method: :post, class: "btn btn-default"
= render 'export', project: @project
......@@ -94,8 +91,7 @@
%li= _('You will need to update your local repositories to point to the new location.')
- if @project.deployment_platform.present?
%li= _('Your deployment services will be broken, you will need to manually fix the services after renaming.')
.gl-display-flex.gl-justify-content-end
= f.submit _('Change path'), class: "btn btn-warning qa-change-path-button"
= f.submit _('Change path'), class: "btn btn-warning qa-change-path-button"
- if can?(current_user, :change_namespace, @project)
.sub-section
......@@ -111,8 +107,7 @@
%li= _('You can only transfer the project to namespaces you manage.')
%li= _('You will need to update your local repositories to point to the new location.')
%li= _('Project visibility level will be changed to match namespace rules when transferring to a group.')
.gl-display-flex.gl-justify-content-end
= f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger qa-transfer-button", data: { "confirm-danger-message" => transfer_project_message(@project) }
= f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger qa-transfer-button", data: { "confirm-danger-message" => transfer_project_message(@project) }
- if @project.forked? && can?(current_user, :remove_fork_project, @project)
.sub-section
......
app/views/projects/hooks/index.html.haml
View file @ 95c4b344
......@@ -9,7 +9,6 @@
.col-lg-8.gl-mb-3
= form_for @hook, as: :hook, url: polymorphic_path([@project, :hooks]) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
.gl-display-flex.gl-justify-content-end
= f.submit 'Add webhook', class: 'btn btn-success'
= f.submit 'Add webhook', class: 'btn btn-success'
= render 'shared/web_hooks/index', hooks: @hooks, hook_class: @hook.class
app/views/projects/mirrors/_mirror_repos.html.haml
View file @ 95c4b344
......@@ -32,7 +32,7 @@
= label_tag :only_protected_branches, _('Only mirror protected branches'), class: 'form-check-label'
= link_to sprite_icon('question-o'), help_page_path('user/project/protected_branches'), target: '_blank'
.panel-footer.gl-display-flex.gl-justify-content-end
.panel-footer
= f.submit _('Mirror repository'), class: 'btn btn-success js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror
- else
.gl-alert.gl-alert-info{ role: 'alert' }
......
app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
View file @ 95c4b344
......@@ -24,5 +24,5 @@
.create_access_levels-container
= yield :create_access_levels
.card-footer.gl-display-flex.gl-justify-content-end
.card-footer
= f.submit _('Protect'), class: 'btn-success btn', disabled: true, data: { qa_selector: 'protect_tag_button' }
app/views/projects/settings/_archive.html.haml
View file @ 95c4b344
......@@ -13,7 +13,6 @@
method: :post, class: "btn btn-success"
- else
%p= _("Archiving the project will make it entirely read only. It is hidden from the dashboard and doesn't show up in searches. %{strong_start}The repository cannot be committed to, and no issues, comments, or other entities can be created.%{strong_end}").html_safe % { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
.gl-display-flex.gl-justify-content-end
= link_to _('Archive project'), archive_project_path(@project),
data: { confirm: _("Are you sure that you want to archive this project?"), qa_selector: 'archive_project_link' },
method: :post, class: "btn btn-warning"
= link_to _('Archive project'), archive_project_path(@project),
data: { confirm: _("Are you sure that you want to archive this project?"), qa_selector: 'archive_project_link' },
method: :post, class: "btn btn-warning"
app/views/projects/settings/_general.html.haml
View file @ 95c4b344
......@@ -40,5 +40,4 @@
%hr
= link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _('Avatar will be removed. Are you sure?')}, method: :delete, class: 'btn btn-link'
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success mt-4 qa-save-naming-topics-avatar-button"
= f.submit _('Save changes'), class: "btn btn-success mt-4 qa-save-naming-topics-avatar-button"
app/views/shared/_confirm_modal.html.haml
View file @ 95c4b344
......@@ -17,5 +17,5 @@
.form-group
= text_field_tag 'confirm_name_input', '', class: 'form-control js-confirm-danger-input qa-confirm-input'
.form-actions.gl-display-flex.gl-justify-content-end
.form-actions
= submit_tag _('Confirm'), class: "btn btn-danger js-confirm-danger-submit qa-confirm-button"
app/views/shared/deploy_keys/_project_group_form.html.haml
View file @ 95c4b344
......@@ -20,5 +20,5 @@
%p.light.gl-mb-0
= _('Allow this key to push to repository as well? (Default only allows pull access.)')
.form-group.row.gl-display-flex.gl-justify-content-end
.form-group.row
= f.submit _("Add key"), class: "btn-success btn"
app/views/shared/deploy_tokens/_form.html.haml
View file @ 95c4b344
......@@ -46,5 +46,5 @@
= label_tag ("deploy_token_write_package_registry"), 'write_package_registry', class: 'label-bold form-check-label'
.text-secondary= s_('DeployTokens|Allows write access to the package registry')
.gl-mt-3.gl-display-flex.gl-justify-content-end
.gl-mt-3
= f.submit s_('DeployTokens|Create deploy token'), class: 'btn btn-success qa-create-deploy-token'
changelogs/unreleased/246783-setting-button-position.yml 0 → 100644
View file @ 95c4b344
---
title: Revert justified-content-end settings buttons
merge_request: 42273
author:
type: changed
ee/app/assets/javascripts/approvals/components/app.vue
View file @ 95c4b344
......@@ -67,18 +67,17 @@ export default {
<slot name="rules"></slot>
</div>
<div v-if="settings.canEdit && settings.allowMultiRule" class="border-bottom py-3 px-2">
<div class="d-flex">
<div class="gl-display-flex">
<gl-button
v-if="targetBranch"
:disabled="isLoading"
class="gl-ml-auto"
data-testid="reset-to-defaults"
@click="resetToProjectDefaults"
>
{{ __('Reset to project defaults') }}
</gl-button>
<gl-button
:class="{ 'gl-ml-3': targetBranch, 'gl-ml-auto': !targetBranch }"
:class="{ 'gl-ml-3': targetBranch, 'gl-ml-0': !targetBranch }"
:disabled="isLoading"
category="secondary"
variant="info"
......
ee/app/assets/javascripts/status_page_settings/components/settings_form.vue
View file @ 95c4b344
......@@ -180,18 +180,16 @@ export default {
>
<gl-form-input id="status-page-aws-secret-access-key " v-model="awsSecretKey" />
</gl-form-group>
<div class="gl-display-flex gl-justify-content-end">
<gl-button
ref="submitBtn"
:disabled="loading"
variant="success"
category="primary"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</div>
<gl-button
ref="submitBtn"
:disabled="loading"
variant="success"
category="primary"
type="submit"
class="js-no-auto-disable"
>
{{ $options.i18n.saveBtnLabel }}
</gl-button>
</form>
</div>
</section>
......
ee/app/views/projects/_merge_request_approvals_settings.html.haml
View file @ 95c4b344
......@@ -13,5 +13,4 @@
= form_for @project, remote: true, html: { class: "merge-request-approval-settings-form js-mr-approvals-form" }, authenticity_token: true do |f|
%input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-approval-settings' }
= render 'projects/merge_request_approvals_settings_form', form: f, project: @project
.gl-display-flex.gl-justify-content-end
= f.submit _("Save changes"), class: "btn btn-success qa-save-merge-request-approval-settings-button"
= f.submit _("Save changes"), class: "btn btn-success qa-save-merge-request-approval-settings-button"
ee/app/views/projects/_remove.html.haml
View file @ 95c4b344
......@@ -20,8 +20,7 @@
%p= permanent_delete_message(project)
%p
%strong= _('Are you ABSOLUTELY SURE you wish to delete this project?')
.gl-display-flex.gl-justify-content-end
#js-project-delete-button{ data: { form_path: project_path(project), confirm_phrase: confirm_phrase } }
#js-project-delete-button{ data: { form_path: project_path(project), confirm_phrase: confirm_phrase } }
- else
= render 'projects/settings/restore', project: project
ee/app/views/projects/settings/_default_issue_template.html.haml
View file @ 95c4b344
......@@ -18,5 +18,4 @@
.text-secondary
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }
= _('Description parsed with %{link_start}GitLab Flavored Markdown%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: "btn btn-success"
= f.submit _('Save changes'), class: "btn btn-success"
ee/app/views/projects/settings/operations/_tracing.html.haml
View file @ 95c4b344
......@@ -32,5 +32,4 @@
- link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
- link_end_tag = "#{sprite_icon('external-link', css_class: 'ml-1 vertical-align-middle')}</a>".html_safe
= _("For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}").html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
.gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success'
= f.submit _('Save changes'), class: 'btn btn-success'
ee/app/views/projects/settings/subscriptions/_index.html.haml
View file @ 95c4b344
......@@ -6,7 +6,7 @@
= f.label :upstream_project_path do
= _("Project path")
= f.text_field :upstream_project_path, class: "form-control"
= f.submit _('Subscribe'), class: "btn btn-success float-right"
= f.submit _('Subscribe'), class: "btn btn-success"
.row.gl-mt-3.gl-mb-3
.col-lg-12
......
ee/app/views/shared/promotions/_promotion_link_project.html.haml
View file @ 95c4b344
......@@ -20,7 +20,6 @@
- if License.current&.expired?
= link_to (!short_form ? s_('Promotions|Buy GitLab Enterprise Edition') : s_('Promotions|Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'
- else
.gl-display-flex.gl-justify-content-end
= link_to s_('Promotions|Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary'
= link_to s_('Promotions|Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary'
- else
%p= s_('Promotions|Contact your Administrator to upgrade your license.')
ee/app/views/shared/push_rules/_form.html.haml
View file @ 95c4b344
......@@ -79,5 +79,4 @@
Set to 0 to allow files of any size.
Files tracked by Git LFS are exempted.
.gl-display-flex.gl-justify-content-end
= f.submit _("Save Push Rules"), class: "btn btn-success", data: { qa_selector: 'submit_settings_button' }
= f.submit _("Save Push Rules"), class: "btn btn-success", data: { qa_selector: 'submit_settings_button' }
ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap
View file @ 95c4b344
......@@ -145,23 +145,19 @@ exports[`Status Page settings form default state should match the default snapsh
/>
</gl-form-group-stub>
<div
class="gl-display-flex gl-justify-content-end"
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
icon=""
size="medium"
type="submit"
variant="success"
>
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
icon=""
size="medium"
type="submit"
variant="success"
>
Save changes
</gl-button-stub>
</div>
Save changes
</gl-button-stub>
</form>
</div>
</section>
......
spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap
View file @ 95c4b344
......@@ -34,16 +34,14 @@ exports[`AlertsSettingsForm with default values renders the initial template 1`]
<gl-form-group-stub label=\\"Alert test payload\\" label-for=\\"alert-json\\" label-class=\\"label-bold\\">
<gl-form-textarea-stub noresize=\\"true\\" id=\\"alert-json\\" disabled=\\"true\\" state=\\"true\\" placeholder=\\"Enter test alert JSON....\\" rows=\\"6\\" max-rows=\\"10\\"></gl-form-textarea-stub>
</gl-form-group-stub>
<div class=\\"gl-display-flex gl-justify-content-end\\">
<gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">Test alert payload</gl-button-stub>
</div>
<gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">Test alert payload</gl-button-stub>
<div class=\\"footer-block row-content-block gl-display-flex gl-justify-content-space-between\\">
<gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">
Cancel
</gl-button-stub>
<gl-button-stub category=\\"primary\\" variant=\\"success\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">
Save changes
</gl-button-stub>
<gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" buttontextclasses=\\"\\" disabled=\\"true\\">
Cancel
</gl-button-stub>
</div>
</gl-form-stub>
</div>"
......
spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
View file @ 95c4b344
......@@ -93,21 +93,17 @@ exports[`grafana integration component default state to match the default snapsh
</p>
</gl-form-group-stub>
<div
class="gl-display-flex gl-justify-content-end"
<gl-button-stub
buttontextclasses=""
category="primary"
icon=""
size="medium"
variant="success"
>
<gl-button-stub
buttontextclasses=""
category="primary"
icon=""
size="medium"
variant="success"
>
Save Changes
</gl-button-stub>
</div>
Save Changes
</gl-button-stub>
</form>
</div>
</section>
......
spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
View file @ 95c4b344
......@@ -93,24 +93,20 @@ exports[`Alert integration settings form default state should match the default
</gl-form-checkbox-stub>
</gl-form-group-stub>
<div
class="gl-display-flex gl-justify-content-end"
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
data-qa-selector="save_changes_button"
icon=""
size="medium"
type="submit"
variant="success"
>
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
data-qa-selector="save_changes_button"
icon=""
size="medium"
type="submit"
variant="success"
>
Save changes
</gl-button-stub>
</div>
Save changes
</gl-button-stub>
</form>
</div>
`;
spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
View file @ 95c4b344
......@@ -42,25 +42,21 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
/>
</div>
<div
class="gl-display-flex gl-justify-content-end"
<gl-button-stub
buttontextclasses=""
category="primary"
class="gl-mt-3"
data-testid="webhook-reset-btn"
icon=""
role="button"
size="medium"
tabindex="0"
variant="default"
>
<gl-button-stub
buttontextclasses=""
category="primary"
class="gl-mt-3"
data-testid="webhook-reset-btn"
icon=""
role="button"
size="medium"
tabindex="0"
variant="default"
>
Reset webhook URL
</gl-button-stub>
</div>
Reset webhook URL
</gl-button-stub>
<gl-modal-stub
modalclass=""
......@@ -77,23 +73,19 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
</gl-modal-stub>
</gl-form-group-stub>
<div
class="gl-display-flex gl-justify-content-end"
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
icon=""
size="medium"
type="submit"
variant="success"
>
<gl-button-stub
buttontextclasses=""
category="primary"
class="js-no-auto-disable"
icon=""
size="medium"
type="submit"
variant="success"
>
Save changes
</gl-button-stub>
</div>
Save changes
</gl-button-stub>
</form>
</div>
`;
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7