Merge pull request #10653 from overleaf/ds-btn-default-to-secondary-in-editor

Replacing `btn-default` with `btn-secondary` in the editor

GitOrigin-RevId: 46aa8c92c9981eb2f253828ee65424bfb7217fb2
This commit is contained in:
Davinder Singh 2022-12-07 10:51:18 +00:00 committed by Copybot
parent ec920ade78
commit d6b39c4bb3
8 changed files with 21 additions and 14 deletions

View file

@ -77,7 +77,7 @@ script(type="text/ng-template", id="historyV2DeleteLabelModalTemplate")
strong "{{ labelDetails.comment }}"
| ?
.modal-footer
button.btn.btn-default(
button.btn.btn-secondary(
type="button"
ng-disabled="state.inflight"
ng-click="$dismiss()"

View file

@ -120,7 +120,7 @@ aside#left-menu.full-size(
if dictionaryEditorEnabled
.form-controls(ng-controller="DictionaryModalController")
label #{translate("dictionary")}
button.btn.btn-default.btn-xs(ng-click="openModal()") #{translate("edit")}
button.btn.btn-secondary.btn-xs(ng-click="openModal()") #{translate("edit")}
dictionary-modal(
handle-hide="handleHide"
@ -271,7 +271,7 @@ script(type='text/ng-template', id='cloneProjectModalTemplate')
focus-on="open"
)
.modal-footer
button.btn.btn-default(
button.btn.btn-secondary(
ng-disabled="state.inflight"
ng-click="cancel()"
) #{translate("cancel")}
@ -318,7 +318,7 @@ script(type='text/ng-template', id='wordCountModalTemplate')
.pull-right #{translate("math_display")} :
.col-xs-6 {{data.mathDisplay}}
.modal-footer
button.btn.btn-default(
button.btn.btn-secondary(
ng-disabled="state.inflight"
ng-click="cancel()"
) #{translate("done")}

View file

@ -63,7 +63,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
p.text-center
a(href, ng-click="doUpload()").btn.btn-primary Overwrite
|  
a(href, ng-click="cancel()").btn.btn-default Cancel
a(href, ng-click="cancel()").btn.btn-secondary Cancel
div(
fine-upload
endpoint="/project/{{ project_id }}/upload"
@ -194,7 +194,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
| #{translate("project_approaching_file_limit")} ({{file_count}}/2000)
.alert.alert-warning.at-file-limit(ng-if="file_count >= 2000")
| #{translate("project_has_too_many_files")}
button.btn.btn-default(
button.btn.btn-secondary(
ng-disabled="state.inflight"
ng-click="cancel()"
) #{translate("cancel")}

View file

@ -615,7 +615,7 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate")
p(ng-show="project.owner._id != user.id"): strong #{translate("please_ask_the_project_owner_to_upgrade_to_track_changes")}
.modal-footer()
button.btn.btn-default(
button.btn.btn-secondary(
ng-click="cancel()"
)
span #{translate("close")}
@ -634,7 +634,7 @@ script(type="text/ng-template", id="bulkActionsModalTemplate")
p(ng-if="isAccept") #{translate("bulk_accept_confirm", { nChanges: "{{ nChanges }}"})}
p(ng-if="!isAccept") #{translate("bulk_reject_confirm", { nChanges: "{{ nChanges }}"})}
.modal-footer()
button.btn.btn-default(
button.btn.btn-secondary(
ng-click="cancel()"
)
span #{translate("cancel")}

View file

@ -97,7 +97,13 @@ export default function CloneProjectModalContent({
</Modal.Body>
<Modal.Footer>
<Button type="button" disabled={inFlight} onClick={handleHide}>
<Button
type="button"
bsStyle={null}
className="btn-secondary"
disabled={inFlight}
onClick={handleHide}
>
{t('cancel')}
</Button>

View file

@ -47,7 +47,8 @@ export function FileTreeModalCreateFileFooterContent({
)}
<Button
bsStyle="default"
bsStyle={null}
className="btn-secondary"
type="button"
disabled={inFlight}
onClick={cancel}

View file

@ -22,10 +22,10 @@ function SwitchToEditorButton() {
return (
<Button
bsStyle="default"
bsStyle={null}
bsSize="xs"
onClick={handleClick}
className="switch-to-editor-btn"
className="switch-to-editor-btn btn-secondary"
>
<Icon type="code" className="me-1" />
{t('switch_to_editor')}

View file

@ -22,10 +22,10 @@ function SwitchToPDFButton() {
return (
<Button
bsStyle="default"
bsStyle={null}
bsSize="xs"
onClick={handleClick}
className="toolbar-btn-secondary"
className="toolbar-btn-secondary btn-secondary"
>
<Icon type="file-pdf-o" className="me-1" />
{t('switch_to_pdf')}