Commit ffd11f2c authored by Ammar Alakkad's avatar Ammar Alakkad

Limit subscription page container to 990px

Changelog: other
EE: true
parent d3bae310
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
v-on="$options.activationListeners" v-on="$options.activationListeners"
/> />
<div v-else class="row"> <div v-else class="row">
<div class="col-12 col-lg-8 offset-lg-2"> <div class="col-12">
<h3 class="gl-mb-7 gl-mt-6 gl-text-center" data-testid="subscription-activation-title"> <h3 class="gl-mb-7 gl-mt-6 gl-text-center" data-testid="subscription-activation-title">
{{ $options.i18n.noActiveSubscription }} {{ $options.i18n.noActiveSubscription }}
</h3> </h3>
......
...@@ -181,47 +181,53 @@ export default { ...@@ -181,47 +181,53 @@ export default {
data-testid="subscription-details" data-testid="subscription-details"
> >
<template v-if="shouldShowFooter" #footer> <template v-if="shouldShowFooter" #footer>
<gl-button <div class="gl-display-flex gl-flex-wrap gl-align-items-flex-start">
v-if="canSyncSubscription" <gl-button
category="primary" v-if="canSyncSubscription"
:loading="hasAsyncActivity" category="primary"
variant="confirm" :loading="hasAsyncActivity"
data-testid="subscription-sync-action" variant="confirm"
@click="syncSubscription" data-testid="subscription-sync-action"
> class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
{{ $options.i18n.syncSubscriptionButtonText }} @click="syncSubscription"
</gl-button> >
<gl-button {{ $options.i18n.syncSubscriptionButtonText }}
v-if="canActivateSubscription" </gl-button>
v-gl-modal="$options.modal.id" <gl-button
category="primary" v-if="canActivateSubscription"
variant="confirm" v-gl-modal="$options.modal.id"
data-testid="subscription-activate-subscription-action" category="primary"
> variant="confirm"
{{ $options.i18n.activateCloudLicense }} class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
</gl-button> data-testid="subscription-activate-subscription-action"
<gl-button >
v-if="canManageSubscription" {{ $options.i18n.activateCloudLicense }}
:href="customersPortalUrl" </gl-button>
target="_blank" <gl-button
category="secondary" v-if="canManageSubscription"
variant="confirm" :href="customersPortalUrl"
data-testid="subscription-manage-action" target="_blank"
> category="secondary"
{{ $options.i18n.manageSubscriptionButtonText }} variant="confirm"
</gl-button> class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
<gl-button data-testid="subscription-manage-action"
v-if="canRemoveLicense" >
category="secondary" {{ $options.i18n.manageSubscriptionButtonText }}
variant="danger" </gl-button>
:href="licenseRemovePath" <gl-button
:data-confirm="$options.i18n.removeLicenseConfirm" v-if="canRemoveLicense"
data-method="delete" category="secondary"
data-testid="license-remove-action" variant="danger"
data-qa-selector="remove_license_link" class="gl-mr-3"
> :href="licenseRemovePath"
{{ $options.i18n.removeLicense }} :data-confirm="$options.i18n.removeLicenseConfirm"
</gl-button> data-method="delete"
data-testid="license-remove-action"
data-qa-selector="remove_license_link"
>
{{ $options.i18n.removeLicense }}
</gl-button>
</div>
</template> </template>
</subscription-details-card> </subscription-details-card>
</div> </div>
......
...@@ -6,5 +6,7 @@ class Admin::SubscriptionsController < Admin::ApplicationController ...@@ -6,5 +6,7 @@ class Admin::SubscriptionsController < Admin::ApplicationController
feature_category :license feature_category :license
def show; end def show
@content_class = 'limit-container-width'
end
end end
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