From c920dc37d29c6eab8126044853664fd99734c973 Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Mon, 27 Aug 2018 09:51:26 -0500 Subject: [PATCH] Update button classes for v2 Use `.btn-default` instead of `.btn-info` --- .../views/subscriptions/_plans_page_mixins.pug | 15 ++++++++++----- services/web/app/views/subscriptions/plans.pug | 6 +++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/subscriptions/_plans_page_mixins.pug b/services/web/app/views/subscriptions/_plans_page_mixins.pug index 6dd91a79f3..d320cd5238 100644 --- a/services/web/app/views/subscriptions/_plans_page_mixins.pug +++ b/services/web/app/views/subscriptions/_plans_page_mixins.pug @@ -1,20 +1,23 @@ //- Buy Buttons mixin btn_buy_collaborator(location) - a.btn.btn-info( + a.btn( + class=settings.overleaf ? 'btn-primary' : 'btn-info' ng-href="/user/subscription/new?planCode={{ getCollaboratorPlanCode() }}¤cy={{currencyCode}}", ng-click="signUpNowClicked('collaborator','" + location + "')" ) span(ng-show="ui.view != 'annual'") #{translate("start_free_trial")} span(ng-show="ui.view == 'annual'") #{translate("buy_now")} mixin btn_buy_free(location) - a.btn.btn-info( + a.btn( + class=settings.overleaf ? 'btn-primary' : 'btn-info' href="/register" style=(getLoggedInUserId() === null ? "" : "visibility: hidden") ng-click="signUpNowClicked('free','" + location + "')" ) span.text-capitalize #{translate('get_started_now')} mixin btn_buy_professional(location) - a.btn.btn-info( + a.btn( + class=settings.overleaf ? 'btn-primary' : 'btn-info' ng-href="/user/subscription/new?planCode=professional{{ ui.view == 'annual' && '-annual' || planQueryString}}¤cy={{currencyCode}}" ng-click="signUpNowClicked('professional','" + location + "')" ) @@ -22,13 +25,15 @@ mixin btn_buy_professional(location) span(ng-show="ui.view == 'annual'") #{translate("buy_now")} mixin btn_buy_student(location, plan) if plan == 'annual' - a.btn.btn-info( + a.btn( + class=settings.overleaf ? 'btn-primary' : 'btn-info' ng-href="/user/subscription/new?planCode=student-annual¤cy={{currencyCode}}", ng-click="signUpNowClicked('student-annual','" + location + "')" ) #{translate("buy_now")} else //- planQueryString will contain _free_trial_7_days - a.btn.btn-info( + a.btn( + class=settings.overleaf ? 'btn-primary' : 'btn-info' ng-href="/user/subscription/new?planCode=student{{planQueryString}}¤cy={{currencyCode}}", ng-click="signUpNowClicked('student-monthly','" + location + "')" ) #{translate("start_free_trial")} diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug index ee35275203..82caffd8b5 100644 --- a/services/web/app/views/subscriptions/plans.pug +++ b/services/web/app/views/subscriptions/plans.pug @@ -145,7 +145,11 @@ block content .col-md-12 .plans-header.plans-subheader.text-centered h2 #{translate('still_have_questions')} - button.btn.btn-info.btn-header.text-capitalize(ng-controller="ContactGeneralModal" ng-click="openModal()") #{translate('get_in_touch')} + button.btn.btn-header.text-capitalize( + class=settings.overleaf ? 'btn-default' : 'btn-info' + ng-controller="ContactGeneralModal" + ng-click="openModal()" + ) #{translate('get_in_touch')} != moduleIncludes("contactModalGeneral", locals) .row.row-spaced