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

chore(deps): bump the tailwind group across 1 directory with 3 updates #7035

Merged
merged 3 commits into from
Aug 1, 2024
Merged

chore(deps): bump the tailwind group across 1 directory with 3 updates #7035

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
6db2ae5
chore(deps): bump the tailwind group across 1 directory with 3 updates
dependabot[bot] Aug 1, 2024
afa888b
run prettier
VIKTORVAV99 Aug 1, 2024
081c42a
pnpm dedupe
VIKTORVAV99 Aug 1, 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
6 changes: 3 additions & 3 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@radix-ui/react-tooltip": "^1.1.2",
"@react-spring/web": "^9.7.4",
"@sentry/react": "^8.21.0",
"@tailwindcss/typography": "^0.5.10",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "5.51.16",
"@tanstack/react-virtual": "^3.8.4",
"@turf/helpers": "^6.5.0",
Expand Down Expand Up @@ -124,7 +124,7 @@
"@storybook/test": "^8.2.6",
"@swc-jotai/debug-label": "^0.1.1",
"@swc-jotai/react-refresh": "^0.1.1",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/forms": "0.5.7",
"@tanstack/react-query-devtools": "^5.51.16",
"@testing-library/cypress": "10.0.2",
"@testing-library/dom": "9.3.4",
Expand Down Expand Up @@ -183,7 +183,7 @@
"prettier-plugin-tailwindcss": "0.4.1",
"readline-sync": "^1.4.10",
"storybook": "^8.2.6",
"tailwindcss": "3.4.0",
"tailwindcss": "3.4.7",
"tailwindcss-radix": "^2.9.0",
"ts-node": "^10.9.2",
"typescript": "5.5.4",
Expand Down
1,959 changes: 535 additions & 1,424 deletions web/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/src/components/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function Modal({
// Avoid close button being auto-focused initially, as pressing space will otherwise close the modal
onOpenAutoFocus={(event: Event) => event.preventDefault()}
data-test-id={testId}
className={`fixed left-1/2 top-1/2 z-40 max-h-full w-[98vw] max-w-2xl -translate-x-1/2 -translate-y-1/2 rounded-xl bg-white/90 shadow-md backdrop-blur-sm sm:w-[90vw] dark:bg-gray-800/90 ${
className={`fixed left-1/2 top-1/2 z-40 max-h-full w-[98vw] max-w-2xl -translate-x-1/2 -translate-y-1/2 rounded-xl bg-white/90 shadow-md backdrop-blur-sm dark:bg-gray-800/90 sm:w-[90vw] ${
fullWidth ? 'p-0' : 'p-4'
}`}
>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Toast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function Toast({
onOpenChange={setOpen}
duration={duration}
type="background"
className="fixed top-16 z-50 m-2 inline-block max-w-max self-center rounded-lg bg-white/80 shadow backdrop-blur-sm xs:left-1/2 xs:w-max xs:-translate-x-1/2 xs:transform dark:bg-gray-800/80"
className="fixed top-16 z-50 m-2 inline-block max-w-max self-center rounded-lg bg-white/80 shadow backdrop-blur-sm dark:bg-gray-800/80 xs:left-1/2 xs:w-max xs:-translate-x-1/2 xs:transform"
>
<div className="flex items-center p-2">
<div className="flex flex-col">
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/legend/LegendContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function LegendContainer(): ReactElement {
const isWindLayerEnabled = useAtomValue(isWindLayerEnabledAtom);

return (
<div className="invisible flex w-[224px] flex-col rounded bg-white/90 px-1 py-2 shadow-xl backdrop-blur-sm sm:visible dark:bg-gray-800">
<div className="invisible flex w-[224px] flex-col rounded bg-white/90 px-1 py-2 shadow-xl backdrop-blur-sm dark:bg-gray-800 sm:visible">
{isSolarLayerEnabled && <SolarLegend />}
{isWindLayerEnabled && <WindLegend />}
<Co2Legend />
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/modals/OnboardingModalInner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function Modal({
</button>
)}
</div>
<div className="color-white pointer-events-auto relative flex h-[450px] w-auto max-w-[500px] flex-col rounded-3xl bg-gray-50 shadow-lg sm:h-[500px] dark:bg-gray-700">
<div className="color-white pointer-events-auto relative flex h-[450px] w-auto max-w-[500px] flex-col rounded-3xl bg-gray-50 shadow-lg dark:bg-gray-700 sm:h-[500px]">
<div className="absolute self-end p-4 align-baseline">
<button
className="p-auto pointer-events-auto flex h-10 w-10 items-center justify-center rounded-full bg-white shadow dark:bg-gray-900"
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/bar-breakdown/BarBreakdownChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function BarBreakdownChart({
zoneDetail={currentZoneDetail}
hasEstimationPill={hasEstimationPill}
/>
<button className="p-auto pointer-events-auto flex h-8 w-8 items-center justify-center rounded-full bg-white shadow sm:hidden dark:bg-gray-800">
<button className="p-auto pointer-events-auto flex h-8 w-8 items-center justify-center rounded-full bg-white shadow dark:bg-gray-800 sm:hidden">
<X />
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/AreaGraphTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function AreaGraphTooltip({
className="relative flex flex-col items-center gap-y-1 p-2 pt-14 sm:block sm:p-0"
>
{children({ zoneDetail, selectedLayerKey })}
<button className="p-auto pointer-events-auto flex h-8 w-8 items-center justify-center rounded-full bg-white shadow sm:hidden dark:bg-gray-800">
<button className="p-auto pointer-events-auto flex h-8 w-8 items-center justify-center rounded-full bg-white shadow dark:bg-gray-800 sm:hidden">
<X />
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/BreakdownChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export function BreakdownChartTooltipContent({
? getZoneName(selectedLayerKey)
: t(selectedLayerKey).charAt(0).toUpperCase() + t(selectedLayerKey).slice(1);
return (
<div className="w-full rounded-md bg-white p-3 text-sm shadow-3xl sm:w-[410px] dark:border dark:border-gray-700 dark:bg-gray-800">
<div className="w-full rounded-md bg-white p-3 text-sm shadow-3xl dark:border dark:border-gray-700 dark:bg-gray-800 sm:w-[410px]">
<AreaGraphToolTipHeader
squareColor={
isExchange
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/CarbonChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function CarbonChartTooltip({ zoneDetail }: InnerAreaGraphTooltip
return (
<div
data-test-id="carbon-chart-tooltip"
className="w-full rounded-md bg-white p-3 shadow-xl sm:w-[410px] dark:border dark:border-gray-700 dark:bg-gray-800"
className="w-full rounded-md bg-white p-3 shadow-xl dark:border dark:border-gray-700 dark:bg-gray-800 sm:w-[410px]"
>
<AreaGraphToolTipHeader
datetime={new Date(stateDatetime)}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/EmissionChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function EmissionChartTooltip({ zoneDetail }: InnerAreaGraphToolt
const hasEstimationPill = Boolean(estimationMethod) || Boolean(estimatedPercentage);

return (
<div className="w-full rounded-md bg-white p-3 shadow-xl sm:w-[410px] dark:border dark:border-gray-700 dark:bg-gray-800">
<div className="w-full rounded-md bg-white p-3 shadow-xl dark:border dark:border-gray-700 dark:bg-gray-800 sm:w-[410px]">
<AreaGraphToolTipHeader
datetime={new Date(stateDatetime)}
timeAverage={timeAverage}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/NetExchangeChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function NetExchangeChartTooltip({
: Math.abs(round(netExchange / formattingFactor));

return (
<div className="w-full rounded-md bg-white p-3 shadow-xl sm:w-[350px] dark:border dark:border-gray-700 dark:bg-gray-800">
<div className="w-full rounded-md bg-white p-3 shadow-xl dark:border dark:border-gray-700 dark:bg-gray-800 sm:w-[350px]">
<AreaGraphToolTipHeader
datetime={new Date(stateDatetime)}
timeAverage={timeAverage}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/charts/tooltips/PriceChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function PriceChartTooltip({ zoneDetail }: InnerAreaGraphTooltipP
const value = priceIsDefined ? price?.value : '';

return (
<div className="w-full rounded-md bg-white p-3 shadow-xl sm:w-64 dark:border dark:border-gray-700 dark:bg-gray-800">
<div className="w-full rounded-md bg-white p-3 shadow-xl dark:border dark:border-gray-700 dark:bg-gray-800 sm:w-64">
<AreaGraphToolTipHeader
datetime={new Date(stateDatetime)}
timeAverage={timeAverage}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/feature-flags/FeatureFlagsManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default function FeatureFlagsManager() {
}

return (
<div className="pointer-events-auto invisible flex w-[224px] flex-col rounded bg-white/90 px-4 py-4 shadow-lg backdrop-blur-sm sm:visible dark:bg-gray-800">
<div className="pointer-events-auto invisible flex w-[224px] flex-col rounded bg-white/90 px-4 py-4 shadow-lg backdrop-blur-sm dark:bg-gray-800 sm:visible">
<Content features={features} />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function Header(): JSX.Element {
return (
<header
className={twMerge(
'z-30 hidden w-full items-center justify-between bg-white px-4 shadow-[0_4px_6px_-2px_rgba(0,0,0,0.1)] md:pr-4 dark:bg-gray-800 dark:shadow-[0_4px_6px_-2px_rgba(0,0,0,0.25)]',
'z-30 hidden w-full items-center justify-between bg-white px-4 shadow-[0_4px_6px_-2px_rgba(0,0,0,0.1)] dark:bg-gray-800 dark:shadow-[0_4px_6px_-2px_rgba(0,0,0,0.25)] md:pr-4',
!isMobileApp && 'sm:block md:flex'
)}
>
Expand Down
4 changes: 2 additions & 2 deletions web/src/features/panels/LeftPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function CollapseButton({ isCollapsed, onCollapse }: CollapseButtonProps) {

function MobileHeader() {
return (
<div className="flex w-full items-center justify-between p-1 pt-[env(safe-area-inset-top)] shadow-md sm:hidden dark:bg-gray-900">
<div className="flex w-full items-center justify-between p-1 pt-[env(safe-area-inset-top)] shadow-md dark:bg-gray-900 sm:hidden">
<Logo className="h-10 w-44 fill-black dark:fill-white" />
</div>
);
Expand All @@ -101,7 +101,7 @@ function OuterPanel({ children }: { children: React.ReactNode }) {
return (
<aside
data-test-id="left-panel"
className={`absolute left-0 top-0 z-20 h-full w-full bg-zinc-50 shadow-xl transition-all duration-500 sm:flex sm:w-[calc(14vw_+_16rem)] dark:bg-gray-900 dark:[color-scheme:dark] ${
className={`absolute left-0 top-0 z-20 h-full w-full bg-zinc-50 shadow-xl transition-all duration-500 dark:bg-gray-900 dark:[color-scheme:dark] sm:flex sm:w-[calc(14vw_+_16rem)] ${
location.pathname === '/map' ? 'hidden' : ''
} ${isOpen ? '' : '-translate-x-full'}`}
>
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/panels/faq/FAQContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function FAQContent() {
</Accordion.Header>
<Accordion.Content className="ml-2 border-l border-gray-300 pl-4 radix-state-closed:animate-slide-up radix-state-open:animate-slide-down">
<div
className="text-md prose prose-sm leading-5 dark:prose-invert prose-a:text-sky-600 prose-a:no-underline hover:prose-a:underline md:max-w-none dark:prose-a:invert"
className="text-md prose prose-sm leading-5 dark:prose-invert prose-a:text-sky-600 prose-a:no-underline hover:prose-a:underline dark:prose-a:invert md:max-w-none"
dangerouslySetInnerHTML={{
__html: t(`${groupKey}.${entryKey}-answer`),
}}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/time/TimeControllerWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function BottomSheetWrappedTimeController() {

function FloatingTimeController() {
return (
<div className="fixed bottom-3 left-3 z-20 w-[calc(14vw_+_16rem)] rounded-xl bg-white px-4 py-3 shadow-xl drop-shadow-2xl min-[780px]:w-[calc((14vw_+_16rem)_-_30px)] xl:px-5 dark:bg-gray-800">
<div className="fixed bottom-3 left-3 z-20 w-[calc(14vw_+_16rem)] rounded-xl bg-white px-4 py-3 shadow-xl drop-shadow-2xl dark:bg-gray-800 min-[780px]:w-[calc((14vw_+_16rem)_-_30px)] xl:px-5">
<TimeController />
</div>
);
Expand Down
Loading