Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove overlapping of text and icons #9490

Merged
merged 5 commits into from
Dec 23, 2024
Merged

fix: remove overlapping of text and icons #9490

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89bc5c6
remove the overlapping of text and icons
Tanuj1718 Dec 18, 2024
dcc237f
improve responsiveness
Tanuj1718 Dec 21, 2024
6096dd3
Merge branch 'develop' into develop
Tanuj1718 Dec 21, 2024
df64233
Merge branch 'develop' into develop
nihal467 Dec 23, 2024
802c355
Update src/components/Shifting/ShiftingTable.tsx
rithviknishad Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/components/Shifting/ShiftingTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ export default function ShiftingTable(props: {
</div>
</div>

<div className="col-span-1 flex flex-col px-3 text-left">
<div className="3xl:flex-row mb-2 flex gap-2 sm:flex-row md:flex-row lg:flex-col xl:flex-row 2xl:flex-row">
<div className="col-span-1 flex flex-col text-left">
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
<div className="3xl:flex-row mb-2 flex gap-2 sm:flex-row md:flex-row lg:flex-col xl:flex-row 2xl:flex-row flex-wrap">
<dt
title={t("shifting_status")}
className={`mt-1 flex h-5 shrink-0 items-center rounded-full px-2 py-0.5 text-xs font-medium leading-4 ${
Expand Down Expand Up @@ -172,13 +172,13 @@ export default function ShiftingTable(props: {
</div>
</div>

<div className="col-span-1 text-left">
<div className="col-span-1 flex flex-col flex-wrap text-left">
<dt
title={t("origin_facility")}
className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
>
<CareIcon icon="l-plane-departure" className="mr-2" />
<dd className="text-sm font-bold leading-5 text-secondary-900">
<dd className="text-sm flex flex-wrap font-bold leading-5 text-secondary-900">
{shift.origin_facility_object?.name}
</dd>
</dt>
Expand All @@ -197,17 +197,17 @@ export default function ShiftingTable(props: {

<dt
title={t("assigned_facility")}
className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
className="flex flex-wrap items-center text-left text-sm font-medium leading-5 text-secondary-500"
>
<CareIcon icon="l-plane-arrival" className="mr-2" />
<dd className="text-sm font-bold leading-5 text-secondary-900">
<dd className="text-sm flex flex-wrap font-bold leading-5 text-secondary-900">
{shift.assigned_facility_external ||
shift.assigned_facility_object?.name ||
t("yet_to_be_decided")}
</dd>
</dt>
</div>
<div className="col-span-1 mt-2 flex flex-col text-left">
<div className="ml-3 col-span-1 mt-2 flex flex-col text-left">
<ButtonV2
onClick={(_) => navigate(`/shifting/${shift.external_id}`)}
variant="secondary"
Expand All @@ -219,7 +219,7 @@ export default function ShiftingTable(props: {
{shift.status === "COMPLETED" && shift.assigned_facility && (
<div className="mt-2">
<ButtonV2
className="w-full"
className="w-full text-wrap"
disabled={
!shift.patient_object.allow_transfer ||
!(
Expand Down
Loading