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

Jump to bottom

[WEB-2459] Fix: analytics scroll + dashboard stat minor padding #5613

Merged
merged 3 commits into from
Sep 17, 2024
Merged

[WEB-2459] Fix: analytics scroll + dashboard stat minor padding #5613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b451e6f
fix: analytics scroll + dashboard stat minor padding
gakshita Sep 16, 2024
07cf235
fix: build issue
gakshita Sep 16, 2024
1eb2930
Merge branch 'preview' of https://github.com/makeplane/plane into fix…
gakshita Sep 17, 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
5 changes: 2 additions & 3 deletions web/core/components/analytics/custom-analytics/custom-analytics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import useSWR from "swr";
import { IAnalyticsParams } from "@plane/types";
// services
// components
import { ContentWrapper } from "@plane/ui";
import { CustomAnalyticsSelectBar, CustomAnalyticsMainContent, CustomAnalyticsSidebar } from "@/components/analytics";
// types
// fetch-keys
Expand Down Expand Up @@ -54,7 +53,7 @@ export const CustomAnalytics: React.FC<Props> = observer((props) => {

return (
<div className={cn("relative flex h-full w-full overflow-hidden", isProjectLevel ? "flex-col-reverse" : "")}>
<ContentWrapper>
<div className="flex h-full w-full flex-col overflow-hidden">
gakshita marked this conversation as resolved.
Show resolved Hide resolved
<CustomAnalyticsSelectBar
control={control}
setValue={setValue}
Expand All @@ -68,7 +67,7 @@ export const CustomAnalytics: React.FC<Props> = observer((props) => {
params={params}
fullScreen={fullScreen}
/>
</ContentWrapper>
</div>

<div
className={cn(
Expand Down
9 changes: 5 additions & 4 deletions web/core/components/analytics/custom-analytics/select-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { IAnalyticsParams } from "@plane/types";
import { SelectProject, SelectSegment, SelectXAxis, SelectYAxis } from "@/components/analytics";
import { ANALYTICS_X_AXIS_VALUES } from "@/constants/analytics";
import { useProject } from "@/hooks/store";
import { Row } from "@plane/ui";
pushya22 marked this conversation as resolved.
Show resolved Hide resolved
// components
// types

Expand All @@ -30,10 +31,10 @@ export const CustomAnalyticsSelectBar: React.FC<Props> = observer((props) => {
: ANALYTICS_X_AXIS_VALUES;

return (
<div
className={`grid items-center gap-4 pb-2.5 ${
<Row
className={`grid items-center gap-4 py-2.5 ${
isProjectLevel ? "grid-cols-1 sm:grid-cols-3" : "grid-cols-2"
} ${fullScreen ? "md:pb-5 lg:grid-cols-4" : ""}`}
} ${fullScreen ? "md:py-5 lg:grid-cols-4" : ""}`}
>
{!isProjectLevel && (
<div>
Expand Down Expand Up @@ -88,6 +89,6 @@ export const CustomAnalyticsSelectBar: React.FC<Props> = observer((props) => {
)}
/>
</div>
</div>
</Row>
);
});
2 changes: 1 addition & 1 deletion web/core/components/analytics/custom-analytics/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Props = {
};

export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, params, yAxisKey }) => (
<div className="w-full overflow-hidden overflow-x-auto absolute left-0">
<div className="w-full overflow-hidden overflow-x-auto">
<table className="w-full overflow-hidden divide-y divide-custom-border-200 whitespace-nowrap border-y border-custom-border-200">
<thead className="bg-custom-background-80">
<tr className="divide-x divide-custom-border-200 text-sm text-custom-text-100">
Expand Down
6 changes: 3 additions & 3 deletions web/core/components/dashboard/widgets/overview-stats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
return (
<Card
spacing={ECardSpacing.SM}
className="flex-row grid lg:grid-cols-4 md:grid-cols-2 sm:grid-cols-2 grid-cols-2 space-y-0
className="flex-row grid lg:grid-cols-4 md:grid-cols-2 sm:grid-cols-2 grid-cols-2 space-y-0 p-0.5
[&>div>a>div]:border-r
[&>div:last-child>a>div]:border-0
[&>div>a>div]:border-custom-border-200
Expand All @@ -79,8 +79,8 @@ export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
key={stat.key}
className={cn(
`w-full flex flex-col gap-2 hover:bg-custom-background-80`,
index === 0 ? "rounded-tl-xl lg:rounded-l-xl" : "",
index === STATS_LIST.length - 1 ? "rounded-br-xl lg:rounded-r-xl" : "",
index === 0 ? "rounded-l-md" : "",
index === STATS_LIST.length - 1 ? "rounded-r-md" : "",
index === 1 ? "rounded-tr-xl lg:rounded-[0px]" : "",
index == 2 ? "rounded-bl-xl lg:rounded-[0px]" : ""
)}
Expand Down
2 changes: 1 addition & 1 deletion web/core/components/page-views/workspace-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const WorkspaceDashboardView = observer(() => {
<>
<IssuePeekOverview />
<ContentWrapper
className={cn("gap-7", {
className={cn("gap-7 bg-custom-background-90", {
"vertical-scrollbar scrollbar-lg": windowWidth >= 768,
})}
>
Expand Down
Loading