diff --git a/app/components.json b/app/components.json index 9420f17bfc..6ef06bd947 100644 --- a/app/components.json +++ b/app/components.json @@ -5,7 +5,7 @@ "tsx": true, "tailwind": { "config": "tailwind.config.js", - "css": "styles/tailwind.css", + "css": "styles/globals.css", "baseColor": "slate", "cssVariables": true }, diff --git a/app/components/avatar/component.tsx b/app/components/avatar/component.tsx index 64867272e1..07be9c0c84 100644 --- a/app/components/avatar/component.tsx +++ b/app/components/avatar/component.tsx @@ -30,7 +30,7 @@ export const Avatar: React.FC = ({ return (
2.5, 'text-black': contrast < 2.5, diff --git a/app/components/button/component.tsx b/app/components/button/component.tsx index 5d1d05d9db..cd322751dd 100644 --- a/app/components/button/component.tsx +++ b/app/components/button/component.tsx @@ -11,28 +11,28 @@ const THEME = { 'text-primary-500 bg-transparent hover:bg-transparent active:bg-transparent border border-primary-500 hover:border-primary-400 active:border-primary-300', secondary: - 'text-white bg-gray-500 hover:bg-gray-400 active:bg-gray-300 border border-gray-500 hover:border-gray-400 active:border-gray-300', + 'text-white bg-gray-700 hover:bg-gray-600 active:bg-gray-400 border border-gray-700 hover:border-gray-600 active:border-gray-400', 'secondary-alt': - 'text-gray-300 bg-transparent hover:bg-transparent active:bg-transparent border border-gray-400 hover:border-gray-300 active:border-gray-200', + 'text-gray-400 bg-transparent hover:bg-transparent active:bg-transparent border border-gray-600 hover:border-gray-400 active:border-gray-300', - tertiary: 'text-black bg-gray-100 hover:bg-gray-400 hover:border-gray-400 hover:text-white', + tertiary: 'text-black bg-gray-200 hover:bg-gray-100 hover:border-gray-100 hover:text-white', white: - 'text-gray-700 bg-white hover:text-white hover:bg-transparent active:bg-transparent border border-gray-400 hover:border-gray-300 active:border-gray-200', + 'text-gray-800 bg-white hover:text-white hover:bg-transparent active:bg-transparent border border-gray-100 hover:border-gray-400 active:border-gray-300', danger: - 'text-red-700 bg-transparent hover:text-white hover:bg-red-700 active:bg-red-600 border border-red-700 hover:border-red-600 active:border-red-500', + 'text-red-800 bg-transparent hover:text-white hover:bg-red-800 active:bg-red-700 border border-red-800 hover:border-red-700 active:border-red-600', 'danger-alt': - 'text-white hover:bg-transparent border border-red-500 hover:text-red-500 bg-red-500 active:bg-red-600 hover:border hover:border-red-500 active:text-white active:border-red-600', + 'text-white hover:bg-transparent border border-red-600 hover:text-red-600 bg-red-600 active:bg-red-700 hover:border hover:border-red-600 active:text-white active:border-red-700', spacial: - 'text-white bg-transparent hover:bg-gray-400 active:bg-gray-300 flex items-center justify-center rounded-4xl focus:outline-none', + 'text-white bg-transparent hover:bg-gray-100 active:bg-gray-400 flex items-center justify-center rounded-[40px] focus:outline-none', - dark: 'text-white bg-gray-600 border border-gray-600 hover:bg-black hover:text-white', + dark: 'text-white bg-gray-700 border border-gray-700 hover:bg-black hover:text-white', 'dark-alt': - 'text-gray-800 bg-transparent border border-gray-800 hover:border-gray-400 hover:text-gray-400', + 'text-gray-900 bg-transparent border border-gray-900 hover:border-gray-100 hover:text-gray-100', - clear: 'text-gray-800 hover:text-gray-400', + clear: 'text-gray-900 hover:text-gray-100', 'transparent-black': 'text-black bg-transparent border border-black hover:bg-black hover:text-white', @@ -93,7 +93,7 @@ const hasHref = (props: ButtonProps | AnchorProps): props is AnchorProps => 'hre function buildClassName({ className, disabled, size, theme }) { return cn({ - 'group relative flex items-center justify-center rounded-4xl transition-colors focus:outline-none': + 'group relative flex items-center justify-center rounded-[40px] transition-colors focus:outline-none': true, [THEME[theme]]: true, [SIZE[size]]: true, @@ -106,9 +106,9 @@ function buildChildren({ theme, children }) { if (theme === 'spacial') { return ( <> -
+
-
+
{children}
diff --git a/app/components/carousel/component.tsx b/app/components/carousel/component.tsx index 307bc70ab4..eff391cc5d 100644 --- a/app/components/carousel/component.tsx +++ b/app/components/carousel/component.tsx @@ -51,7 +51,7 @@ export const Carousel: React.FC = ({ slides }: CarouselProps) => type="button" aria-label="dot-element" onClick={() => slider.current.prev()} - className="absolute -left-36 top-12 flex h-16 w-16 items-center justify-center rounded-full border border-gray-500 opacity-30 hover:opacity-90" + className="absolute -left-36 top-12 flex h-16 w-16 items-center justify-center rounded-full border border-gray-600 opacity-30 hover:opacity-90" > @@ -106,8 +106,8 @@ export const Carousel: React.FC = ({ slides }: CarouselProps) => }} className={cx({ 'relative w-20': true, - 'h-1 bg-blue-500': slide === i, - 'h-0.5 bg-gray-300': slide !== i, + 'h-1 bg-blue-600': slide === i, + 'h-0.5 bg-gray-400': slide !== i, })} >
@@ -119,7 +119,7 @@ export const Carousel: React.FC = ({ slides }: CarouselProps) => type="button" aria-label="dot-element" onClick={() => slider.current.next()} - className="absolute -right-36 top-12 flex h-16 w-16 items-center justify-center rounded-full border border-gray-500 opacity-30 hover:opacity-90" + className="absolute -right-36 top-12 flex h-16 w-16 items-center justify-center rounded-full border border-gray-600 opacity-30 hover:opacity-90" > diff --git a/app/components/confirmation-prompt/component.tsx b/app/components/confirmation-prompt/component.tsx index d65100ee16..56d8a2d2a2 100644 --- a/app/components/confirmation-prompt/component.tsx +++ b/app/components/confirmation-prompt/component.tsx @@ -27,14 +27,14 @@ export const ConfirmationPrompt: React.FC = ({
-
+
{title}

{description} diff --git a/app/components/disclaimer/component.tsx b/app/components/disclaimer/component.tsx index 5740255303..93de6bc540 100644 --- a/app/components/disclaimer/component.tsx +++ b/app/components/disclaimer/component.tsx @@ -7,8 +7,8 @@ import Icon from 'components/icon'; import WARNING_SVG from 'svgs/notifications/warning.svg?sprite'; const TYPE = { - warning: 'text-yellow-400', - blocked: 'text-red-500', + warning: 'text-yellow-500', + blocked: 'text-red-600', invalidated: 'text-white', }; @@ -20,7 +20,7 @@ export interface DisclaimerProps { export const Disclaimer: React.FC = ({ children, type }: DisclaimerProps) => (

= ({
= ({ id={`checkbox-${id}`} value={`${id}`} checked={selected} - className="form-checkbox-dark mt-1.5 block h-4 w-4 text-green-300" + className="form-checkbox-dark mt-1.5 block h-4 w-4 text-green-400" onChange={onSelectedChanged} />

{name}

@@ -139,8 +139,8 @@ export const Item: React.FC = ({ {selected && (
- -

+ +

You can split this feature into categories

@@ -170,7 +170,7 @@ export const Item: React.FC = ({ return (
  • -
    +
    = ({ id={`checkbox-${f.value}`} value={`${f.value}`} checked={checked} - className="form-checkbox-dark block h-4 w-4 text-green-300" + className="form-checkbox-dark block h-4 w-4 text-green-400" onChange={onSplitFeaturesChanged} />
    diff --git a/app/components/features/selected-item/component.tsx b/app/components/features/selected-item/component.tsx index c9327727ef..469cd518b2 100644 --- a/app/components/features/selected-item/component.tsx +++ b/app/components/features/selected-item/component.tsx @@ -129,14 +129,14 @@ export const Item: React.FC = ({ return (
    @@ -147,7 +147,7 @@ export const Item: React.FC = ({ Split
    } + content={
    Split
    } >
    } + content={
    Remove
    } >
    -
    +
    Current: {percentFormatter.format(current.percent)} ({current.value} {current.unit})
    -
    +
    Target: {percentFormatter.format(target.percent)} ({target.value} {target.unit})
    -
    +
    {!onTarget && (
    = (args) => ; export const Default = Template.bind({}); Default.args = { - className: 'w-5 h-5 text-blue-500', + className: 'w-5 h-5 text-blue-600', icon: DOWNLOAD_SVG, }; diff --git a/app/components/info-button/component.tsx b/app/components/info-button/component.tsx index f791cd2d67..2cb5e5f9dd 100644 --- a/app/components/info-button/component.tsx +++ b/app/components/info-button/component.tsx @@ -9,15 +9,15 @@ import INFO_SVG from 'svgs/ui/info.svg?sprite'; const THEME = { primary: { - button: 'bg-blue-400', - icon: 'text-gray-800', + button: 'bg-blue-500', + icon: 'text-gray-900', }, secondary: { button: 'bg-black', icon: 'text-white', }, tertiary: { - button: 'bg-gray-400', + button: 'bg-gray-600', icon: 'text-white', }, }; @@ -57,7 +57,7 @@ export const InfoButton: React.FC = ({ interactive content={
    = ({ visible = false }: Loa className={cx({ 'opacity-100': visible, 'opacity-0': !visible, - 'pointer-events-none absolute bottom-0 left-0 z-20 w-full bg-gray-400 text-center font-heading text-xs uppercase transition': + 'pointer-events-none absolute bottom-0 left-0 z-20 w-full bg-gray-100 text-center font-heading text-xs uppercase transition': true, })} transition={{ diff --git a/app/components/loading/component.stories.tsx b/app/components/loading/component.stories.tsx index 2ef6670fc1..3231c539c1 100644 --- a/app/components/loading/component.stories.tsx +++ b/app/components/loading/component.stories.tsx @@ -1,5 +1,7 @@ import React from 'react'; + import { Story } from '@storybook/react/types-6-0'; + import Loading from './component'; import { LoadingProps } from './types'; @@ -12,6 +14,6 @@ const Template: Story = (args) => ; export const Default = Template.bind({}); Default.args = { - className: 'w-5 h-5 text-blue-500', + className: 'w-5 h-5 text-blue-600', visible: true, }; diff --git a/app/components/map/controls/fit-bounds/component.tsx b/app/components/map/controls/fit-bounds/component.tsx index 7226a138d1..520f64d9ff 100644 --- a/app/components/map/controls/fit-bounds/component.tsx +++ b/app/components/map/controls/fit-bounds/component.tsx @@ -31,8 +31,8 @@ export const FitBoundsControl = ({
  • -
    {description}
    +
    {description}
    {validChildren &&
    {children}
    }
    diff --git a/app/components/map/legend/mock.tsx b/app/components/map/legend/mock.tsx index 599ec8c6d1..22304c58dc 100644 --- a/app/components/map/legend/mock.tsx +++ b/app/components/map/legend/mock.tsx @@ -90,21 +90,21 @@ const ITEMS = [ { id: 'XXX', name: 'Included areas', - icon: , + icon: , description: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Natus minus eligendi doloremque unde, atque maxime dolore officiis quia architecto fugiat, dolorem animi vel! Velit minus facere maxime consequuntur iure. Nisi!', }, { id: 'YYY', name: 'All features', - icon:
    , + icon:
    , description: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Natus minus eligendi doloremque unde, atque maxime.', }, { id: 'ZZZ', name: 'Protected areas', - icon:
    , + icon:
    , description: 'Lorem ipsum dolor sit amet consectetur adipisicing elit.', }, { diff --git a/app/components/map/legend/types/matrix/component.tsx b/app/components/map/legend/types/matrix/component.tsx index 546993cc25..da95f18b02 100644 --- a/app/components/map/legend/types/matrix/component.tsx +++ b/app/components/map/legend/types/matrix/component.tsx @@ -49,7 +49,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px items-center space-x-1 leading-none" style={{ bottom: `${(100 / 11) * 2}%` }} > - + 10 @@ -58,7 +58,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px items-center space-x-1 leading-none" style={{ bottom: `${(100 / 11) * 6}%` }} > - + 50 @@ -67,7 +67,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px items-center space-x-1 leading-none" style={{ bottom: '100%' }} > - + 100 @@ -79,7 +79,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px transform items-center space-x-1 leading-none" style={{ bottom: `${100 - (100 / 11) * 2}%` }} > - + 10 @@ -88,7 +88,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px transform items-center space-x-1 leading-none" style={{ bottom: `${100 - (100 / 11) * 6}%` }} > - + 50 @@ -97,7 +97,7 @@ export const LegendTypeMatrix: React.FC = ({ className="absolute flex h-px transform items-center space-x-1 leading-none" style={{ bottom: '0%' }} > - + 100 diff --git a/app/components/modal/component.tsx b/app/components/modal/component.tsx index d35fd42577..27ca0f5fe9 100644 --- a/app/components/modal/component.tsx +++ b/app/components/modal/component.tsx @@ -134,7 +134,7 @@ export const Modal: React.FC = ({ - + Run scenario
    diff --git a/app/layout/project/navigation/submenu/index.tsx b/app/layout/project/navigation/submenu/index.tsx index 052cbea826..88d3ac979c 100644 --- a/app/layout/project/navigation/submenu/index.tsx +++ b/app/layout/project/navigation/submenu/index.tsx @@ -1,9 +1,8 @@ import Link from 'next/link'; -import { cn } from 'utils/cn'; - import Icon, { IconProps } from 'components/icon'; import Tooltip from 'components/tooltip'; +import { cn } from 'utils/cn'; import { MenuTooltip, TOOLTIP_OFFSET } from '../'; @@ -16,7 +15,7 @@ export interface SubMenuItem { export const SubMenu = ({ items }: { items: SubMenuItem[] }): JSX.Element => { return ( -