From 1e2e67d56ee892c2e7f8ef4713b29300d67ed2eb Mon Sep 17 00:00:00 2001 From: Davinder Singh Date: Wed, 7 Dec 2022 10:51:08 +0000 Subject: [PATCH] Merge pull request #10563 from overleaf/ds-btn-success-to-btn-primary replacing `btn-success` with `btn-primary` GitOrigin-RevId: 77b90dbc4470bc059c40294b9764d1184f0b0bb8 --- .../views/project/editor/history/entriesListV2.pug | 2 +- .../web/app/views/project/editor/review-panel.pug | 4 ++-- .../app/views/project/list/empty-project-list.pug | 2 +- .../dashboard/_change_plans_mixins.pug | 4 ++-- .../dashboard/_personal_subscription_recurly.pug | 14 +++++++------- .../web/app/views/subscriptions/new-refreshed.pug | 2 +- .../web/app/views/subscriptions/new-updated.pug | 2 +- services/web/app/views/subscriptions/new.pug | 2 +- .../subscriptions/successful_subscription.pug | 2 +- .../app/views/subscriptions/upgradeToAnnual.pug | 2 +- .../app/views/user/settings/user-affiliations.pug | 6 +++--- .../file-view/components/file-view-header.js | 2 +- .../emails/add-email/add-new-email-btn.tsx | 2 +- .../components/emails/institution-and-role.tsx | 2 +- .../components/add-collaborators-upgrade.js | 2 +- .../share-project-modal/components/edit-member.js | 2 +- .../components/transfer-ownership-modal.js | 2 +- .../web/frontend/stories/style-guide.stories.js | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/services/web/app/views/project/editor/history/entriesListV2.pug b/services/web/app/views/project/editor/history/entriesListV2.pug index e7d54971ca..8202565d22 100644 --- a/services/web/app/views/project/editor/history/entriesListV2.pug +++ b/services/web/app/views/project/editor/history/entriesListV2.pug @@ -88,7 +88,7 @@ script(type="text/ng-template", id="historyEntriesListTpl") i.fa.fa-check   |#{translate("compile_larger_projects")} p.text-center - a.btn.btn-success( + a.btn.btn-primary( href ng-class="buttonClass" ng-click="startFreeTrial('history')" diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug index 080d336122..ac6148ccb2 100644 --- a/services/web/app/views/project/editor/review-panel.pug +++ b/services/web/app/views/project/editor/review-panel.pug @@ -601,13 +601,13 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") .row.text-center div(ng-show="user.allowedFreeTrial" ng-controller="FreeTrialModalController") - a.btn.btn-success( + a.btn.btn-primary( href ng-click="startFreeTrial('track-changes')" ng-show="project.owner._id == user.id" ) #{translate("try_it_for_free")} div(ng-show="!user.allowedFreeTrial" ng-controller="UpgradeModalController") - a.btn.btn-success( + a.btn.btn-primary( href ng-click="upgradePlan('project-sharing')" ng-show="project.owner._id == user.id" diff --git a/services/web/app/views/project/list/empty-project-list.pug b/services/web/app/views/project/list/empty-project-list.pug index d5ce1dde0e..29f71819aa 100644 --- a/services/web/app/views/project/list/empty-project-list.pug +++ b/services/web/app/views/project/list/empty-project-list.pug @@ -12,7 +12,7 @@ .row .col-md-offset-4.col-md-4 .dropdown.minimal-create-proj-dropdown(dropdown) - a.btn.btn-success.dropdown-toggle( + a.btn.btn-primary.dropdown-toggle( href="#", data-toggle="dropdown", dropdown-toggle diff --git a/services/web/app/views/subscriptions/dashboard/_change_plans_mixins.pug b/services/web/app/views/subscriptions/dashboard/_change_plans_mixins.pug index 453c582667..76b1ceea8f 100644 --- a/services/web/app/views/subscriptions/dashboard/_change_plans_mixins.pug +++ b/services/web/app/views/subscriptions/dashboard/_change_plans_mixins.pug @@ -13,7 +13,7 @@ mixin printPlan(plan) if (personalSubscription.pendingPlan) form input(type="hidden", ng-model="plan_code", name="plan_code", value=plan.planCode) - input(type="submit", ng-click="cancelPendingPlanChange()", value=translate("keep_current_plan")).btn.btn-success + input(type="submit", ng-click="cancelPendingPlanChange()", value=translate("keep_current_plan")).btn.btn-primary else button.btn.disabled #{translate("your_plan")} else if (personalSubscription.pendingPlan && typeof(personalSubscription.pendingPlan.planCode) != "undefined" && plan.planCode == personalSubscription.pendingPlan.planCode.split("_")[0]) @@ -21,7 +21,7 @@ mixin printPlan(plan) else form input(type="hidden", ng-model="plan_code", name="plan_code", value=plan.planCode) - input(type="submit", ng-click="changePlan()", value=translate("change_to_this_plan")).btn.btn-success + input(type="submit", ng-click="changePlan()", value=translate("change_to_this_plan")).btn.btn-primary mixin printPlans(plans) each plan in plans 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 d9096977f2..84f0504a5f 100644 --- a/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug +++ b/services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug @@ -50,13 +50,13 @@ div(ng-controller="RecurlySubscriptionController") 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 + input(type="submit",value="Reactivate your subscription").btn.btn-primary when "expired" p !{translate("your_subscription_has_expired")} p 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")} + a(href="/user/subscription/plans").btn.btn-primary !{translate("create_new_subscription")} default p !{translate("problem_with_subscription_contact_us")} @@ -81,7 +81,7 @@ div(ng-controller="RecurlySubscriptionController") span #{translate('reduce_costs_group_licenses')} br br - a.btn.btn-success( + a.btn.btn-primary( href="#groups" ng-click="openGroupPlanModal()" ) #{translate('change_to_group_plan')} @@ -96,7 +96,7 @@ div(ng-controller="RecurlySubscriptionController") div(ng-show="showExtendFreeTrial") p !{translate("have_more_days_to_try", {days:14})} p - button(type="submit", ng-click="extendTrial()", ng-disabled='inflight').btn.btn-success #{translate("ill_take_it")} + button(type="submit", ng-click="extendTrial()", ng-disabled='inflight').btn.btn-primary #{translate("ill_take_it")} p a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")} @@ -104,7 +104,7 @@ div(ng-controller="RecurlySubscriptionController") div(ng-controller="ChangePlanFormController") p !{translate("interested_in_cheaper_personal_plan",{price:'{{personalDisplayPrice}}'})} p - button(type="submit", ng-click="downgradeToPaidPersonal()", ng-disabled='inflight').btn.btn-success #{translate("yes_move_me_to_personal_plan")} + button(type="submit", ng-click="downgradeToPaidPersonal()", ng-disabled='inflight').btn.btn-primary #{translate("yes_move_me_to_personal_plan")} p a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")} @@ -129,7 +129,7 @@ script(type='text/ng-template', id='confirmChangePlanModalTemplate') ng-disabled="inflight" ng-click="cancel()" ) #{translate("cancel")} - button.btn.btn-success( + button.btn.btn-primary( ng-disabled="inflight" ng-click="confirmChangePlan()" ) @@ -148,7 +148,7 @@ script(type='text/ng-template', id='cancelPendingPlanChangeModalTemplate') ng-disabled="inflight" ng-click="cancel()" ) #{translate("cancel")} - button.btn.btn-success( + button.btn.btn-primary( ng-disabled="inflight" ng-click="confirmCancelPendingPlanChange()" ) diff --git a/services/web/app/views/subscriptions/new-refreshed.pug b/services/web/app/views/subscriptions/new-refreshed.pug index 22a60552f2..ddc4179971 100644 --- a/services/web/app/views/subscriptions/new-refreshed.pug +++ b/services/web/app/views/subscriptions/new-refreshed.pug @@ -332,7 +332,7 @@ block content hr.thin div.payment-submit - button.btn.btn-success.btn-block( + button.btn.btn-primary.btn-block( ng-click="submit()" ng-disabled="processing || !isFormValid(simpleCCForm);" ) diff --git a/services/web/app/views/subscriptions/new-updated.pug b/services/web/app/views/subscriptions/new-updated.pug index 7d24d4024b..82e8475e33 100644 --- a/services/web/app/views/subscriptions/new-updated.pug +++ b/services/web/app/views/subscriptions/new-updated.pug @@ -329,7 +329,7 @@ block content p(ng-if="paymentMethod.value === 'paypal'") #{translate("paypal_upgrade")} div.payment-submit - button.btn.btn-success.btn-block( + button.btn.btn-primary.btn-block( ng-click="submit()" ng-disabled="processing || !isFormValid(simpleCCForm);" ) diff --git a/services/web/app/views/subscriptions/new.pug b/services/web/app/views/subscriptions/new.pug index 216f912b7b..d6ca25ef65 100644 --- a/services/web/app/views/subscriptions/new.pug +++ b/services/web/app/views/subscriptions/new.pug @@ -290,7 +290,7 @@ block content hr.thin div.payment-submit - button.btn.btn-success.btn-block( + button.btn.btn-primary.btn-block( ng-click="submit()" ng-disabled="processing || !isFormValid(simpleCCForm);" ) diff --git a/services/web/app/views/subscriptions/successful_subscription.pug b/services/web/app/views/subscriptions/successful_subscription.pug index 8b5a6441b1..259ad2b968 100644 --- a/services/web/app/views/subscriptions/successful_subscription.pug +++ b/services/web/app/views/subscriptions/successful_subscription.pug @@ -17,7 +17,7 @@ block content a(href="/user/subscription") #{translate("manage_subscription")}. p if (personalSubscription.groupPlan == true) - a.btn.btn-success.btn-large(href=`/manage/groups/${personalSubscription._id}/members`) #{translate("add_your_first_group_member_now")} + a.btn.btn-primary.btn-large(href=`/manage/groups/${personalSubscription._id}/members`) #{translate("add_your_first_group_member_now")} p.letter-from-founders p #{translate("thanks_for_subscribing_you_help_sl", {planName:personalSubscription.plan.name})} p !{translate("get_most_subscription_by_checking_premium_features", {}, [{name: 'a', attrs: {href: 'https://www.overleaf.com/learn/how-to/Overleaf_premium_features'}}])} diff --git a/services/web/app/views/subscriptions/upgradeToAnnual.pug b/services/web/app/views/subscriptions/upgradeToAnnual.pug index cb13bcc535..55d6fb1934 100644 --- a/services/web/app/views/subscriptions/upgradeToAnnual.pug +++ b/services/web/app/views/subscriptions/upgradeToAnnual.pug @@ -16,7 +16,7 @@ block content .row div.col-md-12 center - button.btn.btn-success(ng-click="completeAnnualUpgrade()", ng-disabled="inflight") + button.btn.btn-primary(ng-click="completeAnnualUpgrade()", ng-disabled="inflight") span(ng-show="inflight") #{translate("processing")} span(ng-hide="inflight") #{translate("move_to_annual_billing")} now diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 44aa37b03d..b86533bfe9 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -8,7 +8,7 @@ mixin btnMakePrimaryDisabled(tooltip) tooltip=tooltip tooltip-enable="!ui.isMakingRequest" ) - button.btn.btn-sm.btn-success.affiliations-table-inline-action( + button.btn.btn-sm.btn-primary.affiliations-table-inline-action( disabled type="button" ) #{translate("make_primary")} @@ -93,7 +93,7 @@ form.row( show-role-and-department="true" ) .affiliation-change-actions.small - button.btn.btn-sm.btn-success( + button.btn.btn-sm.btn-primary( ng-click="saveAffiliationChange(userEmail);" ng-disabled="!(affiliationToChange.role && affiliationToChange.department)" type="button" @@ -113,7 +113,7 @@ form.row( +btnMakePrimaryDisabled(translate("please_confirm_your_email_before_making_it_default")) .affiliations-table-inline-action-disabled-wrapper(ng-if="!userEmail.default && inReconfirmNotificationPeriod(userEmail)") +btnMakePrimaryDisabled(translate("please_reconfirm_your_affiliation_before_making_this_primary")) - button.btn.btn-sm.btn-success.affiliations-table-inline-action( + button.btn.btn-sm.btn-primary.affiliations-table-inline-action( tooltip=translate("make_email_primary_description") ng-if="!userEmail.default && (userEmail.confirmedAt && !ui.isMakingRequest) && !inReconfirmNotificationPeriod(userEmail)" ng-click="setDefaultUserEmail(userEmail)" diff --git a/services/web/frontend/js/features/file-view/components/file-view-header.js b/services/web/frontend/js/features/file-view/components/file-view-header.js index a61d6b2d70..c21a668b6b 100644 --- a/services/web/frontend/js/features/file-view/components/file-view-header.js +++ b/services/web/frontend/js/features/file-view/components/file-view-header.js @@ -117,7 +117,7 @@ export default function FileViewHeader({ file, storeReferencesKeys }) { ))} {file.linkedFileData && permissionsLevel !== 'readOnly' && (
diff --git a/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js b/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js index fcbb6459a1..90a121f641 100644 --- a/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js +++ b/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js @@ -69,7 +69,7 @@ export default function TransferOwnershipModal({ member, cancel }) { - +