Эх сурвалжийг харах

Merge pull request #10563 from overleaf/ds-btn-success-to-btn-primary

replacing `btn-success` with `btn-primary`

GitOrigin-RevId: 77b90dbc4470bc059c40294b9764d1184f0b0bb8
Davinder Singh 3 жил өмнө
parent
commit
ec920ade78
18 өөрчлөгдсөн 28 нэмэгдсэн , 28 устгасан
  1. 1 1
      services/web/app/views/project/editor/history/entriesListV2.pug
  2. 2 2
      services/web/app/views/project/editor/review-panel.pug
  3. 1 1
      services/web/app/views/project/list/empty-project-list.pug
  4. 2 2
      services/web/app/views/subscriptions/dashboard/_change_plans_mixins.pug
  5. 7 7
      services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug
  6. 1 1
      services/web/app/views/subscriptions/new-refreshed.pug
  7. 1 1
      services/web/app/views/subscriptions/new-updated.pug
  8. 1 1
      services/web/app/views/subscriptions/new.pug
  9. 1 1
      services/web/app/views/subscriptions/successful_subscription.pug
  10. 1 1
      services/web/app/views/subscriptions/upgradeToAnnual.pug
  11. 3 3
      services/web/app/views/user/settings/user-affiliations.pug
  12. 1 1
      services/web/frontend/js/features/file-view/components/file-view-header.js
  13. 1 1
      services/web/frontend/js/features/settings/components/emails/add-email/add-new-email-btn.tsx
  14. 1 1
      services/web/frontend/js/features/settings/components/emails/institution-and-role.tsx
  15. 1 1
      services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.js
  16. 1 1
      services/web/frontend/js/features/share-project-modal/components/edit-member.js
  17. 1 1
      services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js
  18. 1 1
      services/web/frontend/stories/style-guide.stories.js

+ 1 - 1
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')"

+ 2 - 2
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"

+ 1 - 1
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

+ 2 - 2
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

+ 7 - 7
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()"
 		)

+ 1 - 1
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);"
 												)

+ 1 - 1
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);"
 												)

+ 1 - 1
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);"
 												)

+ 1 - 1
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'}}])}

+ 1 - 1
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
 

+ 3 - 3
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)"

+ 1 - 1
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' && (
         <button
-          className="btn btn-success"
+          className="btn btn-primary"
           onClick={refreshFile}
           disabled={refreshing}
         >

+ 1 - 1
services/web/frontend/js/features/settings/components/emails/add-email/add-new-email-btn.tsx

@@ -15,7 +15,7 @@ function AddNewEmailBtn({ email, disabled, ...props }: AddNewEmailColProps) {
   return (
     <Button
       bsSize="small"
-      bsStyle="success"
+      bsStyle="primary"
       disabled={disabled || !isValidEmail(email)}
       {...props}
     >

+ 1 - 1
services/web/frontend/js/features/settings/components/emails/institution-and-role.tsx

@@ -137,7 +137,7 @@ function InstitutionAndRole({ userEmailData }: InstitutionAndRoleProps) {
             </div>
             <Button
               bsSize="small"
-              bsStyle="success"
+              bsStyle="primary"
               type="submit"
               disabled={!role || !department || isLoading || state.isLoading}
             >

+ 1 - 1
services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.js

@@ -39,7 +39,7 @@ export default function AddCollaboratorsUpgrade() {
           />
         ) : (
           <Button
-            bsStyle="success"
+            bsStyle="primary"
             onClick={() => {
               upgradePlan('project-sharing')
               setStartedFreeTrial(true)

+ 1 - 1
services/web/frontend/js/features/share-project-modal/components/edit-member.js

@@ -158,7 +158,7 @@ RemoveMemberAction.propTypes = {
 function ChangePrivilegesActions({ handleReset }) {
   return (
     <div className="text-center">
-      <Button type="submit" bsSize="sm" bsStyle="success">
+      <Button type="submit" bsSize="sm" bsStyle="primary">
         <Trans i18nKey="change_or_cancel-change" />
       </Button>
       <div className="text-sm">

+ 1 - 1
services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.js

@@ -69,7 +69,7 @@ export default function TransferOwnershipModal({ member, cancel }) {
           </Button>
           <Button
             type="button"
-            bsStyle="success"
+            bsStyle="primary"
             onClick={confirm}
             disabled={inflight}
           >

+ 1 - 1
services/web/frontend/stories/style-guide.stories.js

@@ -201,7 +201,7 @@ export const Buttons = (args, { globals: { theme } }) => {
               )}
               <Button bsStyle="info">Info</Button>
               <Button bsStyle="default">Default</Button>
-              <Button bsStyle="success">Success</Button>
+              <Button bsStyle="primary">Success</Button>
               <Button bsStyle="warning">Warning</Button>
               <Button bsStyle="danger">Danger</Button>
             </div>