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-1468] clear style monitored #741

Merged
merged 2 commits into from
Dec 13, 2024
Merged

[TM-1468] clear style monitored #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d28917a
[TM-1468] change style in table and pieChart
dottyy Dec 13, 2024
cf68b3d
[TM-1468] change style in modal and content graphic
dottyy Dec 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
30 changes: 21 additions & 9 deletions src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,11 @@ const TABLE_COLUMNS_HECTARES_STRATEGY: ColumnDef<RowData>[] = [
header: "",
enableSorting: false,
cell: props => (
<div className="w-min cursor-pointer rounded p-1 hover:bg-primary-200">
<Icon name={IconNames.ELIPSES} className="roudn h-4 w-4 rounded-sm text-grey-720 hover:bg-primary-200" />
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon
name={IconNames.IC_ARROW_COLLAPSE}
className="h-4 w-4 rotate-90 rounded-sm text-grey-720 hover:text-primary"
/>
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -205,8 +208,11 @@ const TABLE_COLUMNS_HECTARES_ECO_REGION: ColumnDef<RowData>[] = [
header: "",
enableSorting: false,
cell: props => (
<div className="w-min cursor-pointer rounded p-1 hover:bg-primary-200">
<Icon name={IconNames.ELIPSES} className="roudn h-4 w-4 rounded-sm text-grey-720 hover:bg-primary-200" />
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon
name={IconNames.IC_ARROW_COLLAPSE}
className="h-4 w-4 rotate-90 rounded-sm text-grey-720 hover:text-primary"
/>
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -247,8 +253,11 @@ const TABLE_COLUMNS_HECTARES_LAND_USE: ColumnDef<RowData>[] = [
header: "",
enableSorting: false,
cell: props => (
<div className="w-min cursor-pointer rounded p-1 hover:bg-primary-200">
<Icon name={IconNames.ELIPSES} className="roudn h-4 w-4 rounded-sm text-grey-720 hover:bg-primary-200" />
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon
name={IconNames.IC_ARROW_COLLAPSE}
className="h-4 w-4 rotate-90 rounded-sm text-grey-720 hover:text-primary"
/>
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -546,8 +555,11 @@ const DataCard = ({
header: "",
enableSorting: false,
cell: props => (
<div className="w-min cursor-pointer rounded p-1 hover:bg-primary-200">
<Icon name={IconNames.ELIPSES} className="roudn h-4 w-4 rounded-sm text-grey-720 hover:bg-primary-200" />
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon
name={IconNames.IC_ARROW_COLLAPSE}
className="h-4 w-4 rotate-90 rounded-sm text-grey-720 hover:text-primary"
/>
</div>
),
meta: { style: { top: `${topHeaderFirstTable}`, borderRadius: "0" } }
Expand Down Expand Up @@ -643,7 +655,7 @@ const DataCard = ({
</div>
</When>
<When condition={tabActive === 1}>
<div className="relative z-[10] flex w-full gap-8 px-6 pb-6 pt-2">
<div className="relative z-auto flex w-full gap-8 px-6 pb-6 pt-2">
<Dropdown
containerClassName={classNames("absolute left-full -translate-x-full pr-6 z-50", {
hidden: selected.includes("6")
Expand Down
11 changes: 5 additions & 6 deletions src/admin/components/ResourceTabs/MonitoredTab/components/EcoRegionDoughnutChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ const EcoRegionDoughnutChart: React.FC<EcoRegionDoughnutChartProps> = ({ data })
};

return (
<div className="relative h-80 w-full">
<div className="relative flex h-80 w-full items-center justify-center">
<ResponsiveContainer width="100%" height="100%">
<PieChart margin={{ right: 0, left: 0, top: 0, bottom: 0 }}>
<PieChart>
<Tooltip content={<CustomTooltip />} />
<Pie
data={chartData}
cx={200}
cx="50%"
cy="50%"
innerRadius={100}
outerRadius={140}
Expand All @@ -101,7 +101,7 @@ const EcoRegionDoughnutChart: React.FC<EcoRegionDoughnutChartProps> = ({ data })
activeIndex={activeIndex}
activeShape={renderActiveShape}
>
<Label position="center" className="text-sm font-bold">
<Label position="center" className="text-20-semibold !font-semibold !text-darkCustom">
ECO-REGION
</Label>
{chartData.map((entry, index) => (
Expand All @@ -114,8 +114,7 @@ const EcoRegionDoughnutChart: React.FC<EcoRegionDoughnutChartProps> = ({ data })
align="right"
verticalAlign="middle"
wrapperStyle={{
right: 0,
left: 400,
right: "calc(50% - 261px)",
paddingLeft: 0
}}
/>
Expand Down
5 changes: 5 additions & 0 deletions src/components/extensive/Modal/ModalRunAnalysis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ const ModalRunAnalysis: FC<ModalRunAnalysisProps> = ({
<br />
<br />
<br />
<br />
<br />
<br />
<br />
<br />
</div>
<div className="flex w-full justify-end gap-3 px-8 py-4">
<When condition={!!secondaryButtonProps}>
Expand Down
Loading