From 024f6ee24e9b40b7c755503ba4eaba27c5ad42eb Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Thu, 17 Nov 2022 09:31:23 -0600 Subject: [PATCH] Merge pull request #10467 from overleaf/ds-btn-info-new-css-part-2 Updating`btn-info` to `btn-info-secondary` - part 2 GitOrigin-RevId: 934dd633494454277432810c4a1e70bb17829bd7 --- .../dashboard/_personal_subscription_recurly.pug | 10 +++++----- .../js/features/project-list/components/load-more.tsx | 4 ++-- .../components/emails/actions/make-primary.tsx | 8 +++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug b/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug index 2621c5cbd2..d9096977f2 100644 --- a/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug +++ b/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug @@ -30,9 +30,9 @@ div(ng-controller="RecurlySubscriptionController") include ./../_price_exceptions p.pull-right p - a(href=personalSubscription.recurly.billingDetailsLink, target="_blank").btn.btn-info #{translate("update_your_billing_details")} + a(href=personalSubscription.recurly.billingDetailsLink, target="_blank").btn.btn-secondary-info.btn-secondary #{translate("update_your_billing_details")} |   - a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-info #{translate("view_your_invoices")} + a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-secondary-info.btn-secondary #{translate("view_your_invoices")} |   unless (cancelButtonNewCopy) a(href, ng-click="switchToCancellationView()", ng-hide="recurlyLoadError", event-tracking='subscription-page-cancel-button-click', event-tracking-mb="true", event-tracking-trigger="click").btn.btn-danger !{translate("stop_your_subscription")} @@ -47,14 +47,14 @@ div(ng-controller="RecurlySubscriptionController") p !{translate("subscription_canceled_and_terminate_on_x", {terminateDate: personalSubscription.recurly.nextPaymentDueAt}, ['strong'])} include ../_premium_features_link p - a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-info #{translate("view_your_invoices")} + a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-secondary-info.btn-secondary #{translate("view_your_invoices")} p: form(action="/user/subscription/reactivate",method="post") input(type="hidden", name="_csrf", value=csrfToken) input(type="submit",value="Reactivate your subscription").btn.btn-success when "expired" p !{translate("your_subscription_has_expired")} p - a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-info #{translate("view_your_invoices")} + a(href=personalSubscription.recurly.accountManagementLink, target="_blank").btn.btn-secondary-info.btn-secondary #{translate("view_your_invoices")} |   a(href="/user/subscription/plans").btn.btn-success !{translate("create_new_subscription")} default @@ -110,7 +110,7 @@ div(ng-controller="RecurlySubscriptionController") div(ng-show="showBasicCancel") p - a(href, ng-click="switchToDefaultView()").btn.btn-info #{translate("i_want_to_stay")} + a(href, ng-click="switchToDefaultView()").btn.btn-secondary-info.btn-secondary #{translate("i_want_to_stay")} p a(href, ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")} diff --git a/services/web/frontend/js/features/project-list/components/load-more.tsx b/services/web/frontend/js/features/project-list/components/load-more.tsx index d6d7c33b11..61be8645d8 100644 --- a/services/web/frontend/js/features/project-list/components/load-more.tsx +++ b/services/web/frontend/js/features/project-list/components/load-more.tsx @@ -16,8 +16,8 @@ export default function LoadMore() {
{hiddenProjectsCount > 0 ? ( )