Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

fix: align cancel button #2768

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
0dede48
Fix: Align cancel buttons on left for new requests
kaushikpallavi7 Oct 1, 2021
a4ffc32
Fix: Align cancel buttons on left for editing appointmnet and patients
kaushikpallavi7 Oct 1, 2021
fb96c3e
Merge branch 'master' into cancel-button-align
matteovivona Oct 2, 2021
d8130b2
Merge branch 'master' into cancel-button-align
Oct 2, 2021
785576f
Merge branch 'master' into cancel-button-align
Oct 2, 2021
89fa720
Merge branch 'master' into cancel-button-align
Oct 2, 2021
e5da0aa
Merge branch 'master' into cancel-button-align
Oct 2, 2021
aaab621
Merge branch 'master' into cancel-button-align
Oct 2, 2021
ae0e1c2
Merge branch 'master' into cancel-button-align
Oct 2, 2021
911de28
Merge branch 'master' into cancel-button-align
Oct 2, 2021
a19f8ea
Merge branch 'master' into cancel-button-align
Oct 5, 2021
5b1d03a
Merge branch 'master' into cancel-button-align
Oct 6, 2021
246d459
Merge branch 'master' into cancel-button-align
Oct 7, 2021
de4eab6
Merge branch 'master' into cancel-button-align
Oct 11, 2021
056ccd5
Merge branch 'master' into cancel-button-align
Oct 11, 2021
6ac5d39
Merge branch 'master' into cancel-button-align
Oct 12, 2021
d08253e
Merge branch 'master' into cancel-button-align
Oct 12, 2021
bffe0d9
Merge branch 'master' into cancel-button-align
Oct 12, 2021
5f44126
Merge branch 'master' into cancel-button-align
Oct 13, 2021
18c8cc8
Merge branch 'master' into cancel-button-align
Oct 15, 2021
e932104
Merge branch 'master' into cancel-button-align
Oct 15, 2021
7bacbd0
Merge branch 'master' into cancel-button-align
Oct 18, 2021
d8bf43a
Merge branch 'master' into cancel-button-align
Oct 19, 2021
44a2fd1
Merge branch 'master' into cancel-button-align
Oct 21, 2021
d13cd4d
Merge branch 'master' into cancel-button-align
Oct 21, 2021
5505c19
Merge branch 'master' into cancel-button-align
Oct 21, 2021
69b7432
Merge branch 'master' into cancel-button-align
Oct 21, 2021
e0cf733
Merge branch 'master' into cancel-button-align
Oct 21, 2021
0895b2c
Merge branch 'master' into cancel-button-align
Oct 21, 2021
b4c5fc1
Merge branch 'master' into cancel-button-align
Oct 21, 2021
c04e051
Merge branch 'master' into cancel-button-align
Oct 21, 2021
30554d3
Merge branch 'master' into cancel-button-align
Oct 21, 2021
92df702
Merge branch 'master' into cancel-button-align
Oct 21, 2021
ac8a0bf
Merge branch 'master' into cancel-button-align
Oct 21, 2021
e691b15
Merge branch 'master' into cancel-button-align
Oct 21, 2021
8c47324
Merge branch 'master' into cancel-button-align
Oct 21, 2021
b57bc51
Merge branch 'master' into cancel-button-align
Oct 22, 2021
9e91411
Merge branch 'master' into cancel-button-align
Oct 22, 2021
07c1c3d
Merge branch 'master' into cancel-button-align
Oct 22, 2021
1b94eaf
Merge branch 'master' into cancel-button-align
Oct 22, 2021
6e20993
Merge branch 'master' into cancel-button-align
Oct 22, 2021
08c9970
Merge branch 'master' into cancel-button-align
Oct 22, 2021
406a375
Merge branch 'master' into cancel-button-align
Nov 2, 2021
f321cb3
Merge branch 'master' into cancel-button-align
Nov 2, 2021
579d9dc
Merge branch 'master' into cancel-button-align
Nov 2, 2021
b190e30
Merge branch 'master' into cancel-button-align
Nov 2, 2021
b739113
Merge branch 'master' into cancel-button-align
Nov 2, 2021
7a21c61
Merge branch 'master' into cancel-button-align
Nov 2, 2021
bc8e612
Merge branch 'master' into cancel-button-align
Nov 2, 2021
43327eb
Merge branch 'master' into cancel-button-align
Nov 3, 2021
7454bcc
Merge branch 'master' into cancel-button-align
Nov 3, 2021
e3e3715
Merge branch 'master' into cancel-button-align
Nov 10, 2021
af76901
Merge branch 'master' into cancel-button-align
Nov 10, 2021
1c01353
Merge branch 'master' into cancel-button-align
Nov 12, 2021
c4dd40d
Merge branch 'master' into cancel-button-align
Nov 12, 2021
934d444
Merge branch 'master' into cancel-button-align
Nov 15, 2021
e7642ea
Merge branch 'master' into cancel-button-align
Nov 17, 2021
53b214d
Merge branch 'master' into cancel-button-align
Nov 17, 2021
59060c6
Merge branch 'master' into cancel-button-align
Nov 17, 2021
dd13271
Merge branch 'master' into cancel-button-align
Nov 17, 2021
4d8550a
Merge branch 'master' into cancel-button-align
Nov 17, 2021
f12a663
Merge branch 'master' into cancel-button-align
Nov 17, 2021
73fbdbf
Merge branch 'master' into cancel-button-align
Nov 17, 2021
d6bb028
Merge branch 'master' into cancel-button-align
Nov 18, 2021
00cd013
Merge branch 'master' into cancel-button-align
Nov 19, 2021
ef3e491
Merge branch 'master' into cancel-button-align
Nov 19, 2021
cf6bbd9
Merge branch 'master' into cancel-button-align
Nov 19, 2021
b3de386
Merge branch 'master' into cancel-button-align
Nov 19, 2021
bfa8ac8
Merge branch 'master' into cancel-button-align
Nov 19, 2021
a8103a0
Merge branch 'master' into cancel-button-align
Nov 21, 2021
7c6072c
Merge branch 'master' into cancel-button-align
Nov 23, 2021
43528d7
Merge branch 'master' into cancel-button-align
Nov 23, 2021
a024e60
Merge branch 'master' into cancel-button-align
Nov 23, 2021
1d7630e
Merge branch 'master' into cancel-button-align
Nov 25, 2021
762f8e8
Merge branch 'master' into cancel-button-align
Nov 25, 2021
31733b1
Merge branch 'master' into cancel-button-align
Nov 29, 2021
b03ff74
Merge branch 'master' into cancel-button-align
Dec 4, 2021
f474aad
Merge branch 'master' into cancel-button-align
Dec 13, 2021
911f0f2
Merge branch 'master' into cancel-button-align
Dec 13, 2021
3d48a7f
Merge branch 'master' into cancel-button-align
Dec 17, 2021
b992e6a
Merge branch 'master' into cancel-button-align
Dec 17, 2021
6279368
Merge branch 'master' into cancel-button-align
Dec 17, 2021
11fc332
Merge branch 'master' into cancel-button-align
Dec 17, 2021
e67c1b8
Merge branch 'master' into cancel-button-align
Dec 17, 2021
d486064
Merge branch 'master' into cancel-button-align
Dec 17, 2021
19c6dca
Merge branch 'master' into cancel-button-align
Dec 23, 2021
0d0f49e
Merge branch 'master' into cancel-button-align
Dec 27, 2021
502b535
Merge branch 'master' into cancel-button-align
Dec 27, 2021
922ba3f
Merge branch 'master' into cancel-button-align
Dec 27, 2021
f23db41
Merge branch 'master' into cancel-button-align
Dec 28, 2021
0f1b189
Merge branch 'master' into cancel-button-align
Dec 28, 2021
8ffcf76
Merge branch 'master' into cancel-button-align
Dec 28, 2021
14c3f3a
Merge branch 'master' into cancel-button-align
Dec 28, 2021
19bbee2
Merge branch 'master' into cancel-button-align
Dec 28, 2021
b9a5aff
Merge branch 'master' into cancel-button-align
Jan 2, 2022
65f1b58
Merge branch 'master' into cancel-button-align
Jan 2, 2022
77445e9
Merge branch 'master' into cancel-button-align
Jan 2, 2022
e934efd
Merge branch 'master' into cancel-button-align
Jan 4, 2022
4037b8f
Merge branch 'master' into cancel-button-align
Jan 4, 2022
6604213
Merge branch 'master' into cancel-button-align
Feb 12, 2022
220e7fb
Merge branch 'master' into cancel-button-align
Feb 12, 2022
dd9eff4
Merge branch 'master' into cancel-button-align
Feb 12, 2022
eea3b4f
Merge branch 'master' into cancel-button-align
Feb 12, 2022
c959be1
Merge branch 'master' into cancel-button-align
Feb 12, 2022
9d695e2
Merge branch 'master' into cancel-button-align
Feb 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/imagings/requests/NewImagingRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ const NewImagingRequest = () => {
</div>
<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('imagings.requests.create')}
</Button>
<Button color="danger" onClick={onCancel}>
<Button className="mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('imagings.requests.create')}
</Button>
</div>
</div>
</form>
Expand Down
8 changes: 4 additions & 4 deletions src/incidents/report/ReportIncident.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ const ReportIncident = () => {

<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('incidents.reports.new')}
</Button>
<Button color="danger" onClick={onCancel}>
<Button className="mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('incidents.reports.new')}
</Button>
</div>
</div>
</form>
Expand Down
9 changes: 4 additions & 5 deletions src/labs/requests/NewLabRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,12 @@ const NewLabRequest = () => {
</div>
<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('labs.requests.new')}
</Button>

<Button color="danger" onClick={onCancel}>
<Button className="mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('labs.requests.new')}
</Button>
</div>
</div>
</form>
Expand Down
8 changes: 4 additions & 4 deletions src/medications/requests/NewMedicationRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ const NewMedicationRequest = () => {
</div>
<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('medications.requests.new')}
</Button>
<Button color="danger" onClick={onCancel}>
<Button className="mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('medications.requests.new')}
</Button>
</div>
</div>
</form>
Expand Down
8 changes: 4 additions & 4 deletions src/patients/edit/EditPatient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ const EditPatient = () => {
/>
<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="btn-save mr-2" color="success" onClick={onSave}>
{t('patients.updatePatient')}
</Button>
<Button className="btn-cancel" color="danger" onClick={onCancel}>
<Button className="btn-cancel mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button className="btn-save" color="success" onClick={onSave}>
{t('patients.updatePatient')}
</Button>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/patients/new/NewPatient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ const NewPatient = () => {
/>
<div className="row float-right">
<div className="btn-group btn-group-lg mt-3 mr-3">
<Button className="btn-save mr-2" color="success" onClick={onSave}>
{t('patients.createPatient')}
</Button>
<Button className="btn-cancel" color="danger" onClick={onCancel}>
<Button className="btn-cancel mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button className="btn-save" color="success" onClick={onSave}>
{t('patients.createPatient')}
</Button>
</div>
</div>

Expand Down
8 changes: 4 additions & 4 deletions src/scheduling/appointments/edit/EditAppointment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ const EditAppointment = () => {
/>
<div className="row float-right">
<div className="btn-group btn-group-lg mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('scheduling.appointments.updateAppointment')}
</Button>
<Button color="danger" onClick={onCancel}>
<Button className="mr-2" color="danger" onClick={onCancel}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('scheduling.appointments.updateAppointment')}
</Button>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/scheduling/appointments/new/NewAppointment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ const NewAppointment = () => {
/>
<div className="row float-right">
<div className="btn-group btn-group-lg mr-3">
<Button className="mr-2" color="success" onClick={onSave}>
{t('scheduling.appointments.createAppointment')}
</Button>
<Button color="danger" onClick={onCancelClick}>
<Button className="mr-2" color="danger" onClick={onCancelClick}>
{t('actions.cancel')}
</Button>
<Button color="success" onClick={onSave}>
{t('scheduling.appointments.createAppointment')}
</Button>
</div>
</div>
</form>
Expand Down