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

Adjusted the view change button position #9172

Merged
merged 5 commits into from
Nov 26, 2024
Merged

Adjusted the view change button position #9172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ecad4f
Adjusted the view change button position
nithish1018 Nov 21, 2024
5625519
fixed search icon overlay
nithish1018 Nov 21, 2024
dfc7255
adjusted z index value
nithish1018 Nov 21, 2024
5cf52f4
Merge branch 'develop' into issues/9170/fixbuttonposition
nithish1018 Nov 22, 2024
fb216fc
Merge branch 'develop' into issues/9170/fixbuttonposition
nithish1018 Nov 25, 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
2 changes: 1 addition & 1 deletion src/components/Common/SortDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function SortDropdownMenu(props: Props) {
variant="secondary"
className="w-full border border-primary-500 bg-white md:w-auto"
icon={<CareIcon icon="l-sort" />}
containerClassName="w-full md:w-auto"
containerClassName="w-full md:w-auto z-20"
>
{props.options.map(({ isAscending, value }, i) => (
<DropdownItem
Expand Down
8 changes: 4 additions & 4 deletions src/components/Resource/ResourceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export default function ListView() {

return (
<Page
title="Resource"
title={t("resource")}
hideBack
componentRight={
<ExportButton
Expand All @@ -216,13 +216,13 @@ export default function ListView() {
</div>

<div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
<ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
<CareIcon icon="l-list-ul" className="rotate-90" />
{t("board_view")}
</ButtonV2>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
</div>
</>
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Shifting/ShiftingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@ export default function ListView() {
</div>

<div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
<ButtonV2
className="py-[11px]"
onClick={() => navigate("/shifting/board", { query: qParams })}
>
<CareIcon icon="l-list-ul" className="rotate-90" />
{t("board_view")}
</ButtonV2>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
</div>
</>
}
Expand Down
Loading