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

[TM-1444] add beta in header #670

Merged
merged 6 commits into from
Nov 13, 2024
Merged

[TM-1444] add beta in header #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de31276
[TM-1314] modifi scroll in table and content (#666)
dottyy Nov 13, 2024
17064e9
[TM-1444] add BETA in header dashboard
dottyy Nov 13, 2024
a6acb89
[TM-1444] Merge branch 'release/sassy-sycamore' of https://github.com…
dottyy Nov 13, 2024
c6db470
[TM-1444] edit z-index
dottyy Nov 13, 2024
d8106e2
[TM-1444] change height table
dottyy Nov 13, 2024
aaa5f65
[TM-1444] update snapshots
LimberHope Nov 13, 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
4 changes: 2 additions & 2 deletions src/components/elements/Table/TableVariants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ export const VARIANT_TABLE_ORGANISATION = {
export const VARIANT_TABLE_DASHBOARD_COUNTRIES = {
table: "border-collapse",
name: "border-airtable",
tableWrapper: "border border-neutral-200 rounded-lg overflow-auto max-h-[285px] lg:max-h-[303px] wide:max-h-[321px]",
trHeader: "bg-neutral-150 sticky top-0 z-auto",
tableWrapper: "border border-neutral-200 rounded-lg overflow-auto max-h-[260px] lg:max-h-[303px] wide:max-h-[321px]",
trHeader: "bg-neutral-150 sticky top-0 z-[1]",
thHeader: "text-nowrap first:pl-3 first:pr-2 last:pl-2 last:pr-3 border-y border-neutral-200 text-14 px-3 border-t-0",
tBody: "",
trBody: "bg-white border-y border-neutral-200 last:border-b-0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/elements/Table/__snapshots__/Table.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6149,7 +6149,7 @@ exports[`Storyshots Components/Elements/Table Table Dashboard Countries 1`] = `
</span>
</button>
<div
className="border border-neutral-200 rounded-lg overflow-auto max-h-[285px] lg:max-h-[303px] wide:max-h-[321px]"
className="border border-neutral-200 rounded-lg overflow-auto max-h-[260px] lg:max-h-[303px] wide:max-h-[321px]"
>
<table
className="w-full border-collapse"
Expand All @@ -6158,7 +6158,7 @@ exports[`Storyshots Components/Elements/Table Table Dashboard Countries 1`] = `
className="bg-blueCustom-100 "
>
<tr
className="bg-neutral-150 sticky top-0 z-auto"
className="bg-neutral-150 sticky top-0 z-[1]"
>
<th
align="left"
Expand Down
5 changes: 4 additions & 1 deletion src/pages/dashboard/components/HeaderDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const HeaderDashboard = (props: HeaderDashboardProps) => {
})}
>
<div className="flex max-w-full flex-1 flex-wrap gap-3">
<Text variant={"text-28-bold"} className="w-full whitespace-nowrap text-white">
<Text variant={"text-28-bold"} className="relative w-full whitespace-nowrap text-white">
{t(getHeaderTitle())}
<When condition={isProjectInsightsPage}>
<ToolTip
Expand All @@ -223,6 +223,9 @@ const HeaderDashboard = (props: HeaderDashboardProps) => {
<Icon name={IconNames.INFO_CIRCLE} className="h-3.5 w-3.5 text-white lg:h-5 lg:w-5" />
</ToolTip>
</When>
<Text variant="text-20" as={"span"} className="absolute top-1 text-white lg:top-2">
&nbsp;&nbsp;&nbsp;&nbsp;{t("BETA")}
</Text>
</Text>
<When condition={!isProjectInsightsPage && !isHomepage}>
<div className="flexl-col flex w-full max-w-full items-start gap-3 overflow-x-clip overflow-y-visible small:items-center">
Expand Down