From bed2f85d901eb7c6ec9b962fd2a4b8c50d193430 Mon Sep 17 00:00:00 2001
From: Johan Lindskogen <johan.lindskogen@gmail.com>
Date: Mon, 27 Nov 2023 14:06:17 +0100
Subject: [PATCH] Danger button background, spacing and more! (#681)

* Use snackskal as danger button background

* Decrease spacing for button

* Standardize clear filters button

* Adjust RouteLeg for new design

* Replace negative margin with border-radius
---
 .../ui/buttons/FlatButton.module.css          |  2 +-
 .../ui/buttons/SecondaryButton.module.css     |  2 +-
 .../ui/buttons/common/ButtonContent.tsx       |  2 +-
 .../ui/route-leg/RouteLeg.stories.tsx         | 80 +++++++++----------
 .../src/components/ui/route-leg/RouteLeg.tsx  | 15 ++--
 .../features/chips/SearchFilterChips.tsx      |  5 +-
 6 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/packages/elements/src/components/ui/buttons/FlatButton.module.css b/packages/elements/src/components/ui/buttons/FlatButton.module.css
index 5ea1bc8f1..c2e2ebb22 100644
--- a/packages/elements/src/components/ui/buttons/FlatButton.module.css
+++ b/packages/elements/src/components/ui/buttons/FlatButton.module.css
@@ -29,7 +29,7 @@
     color: var(--lhds-color-red-500);
 
     &:hover {
-      background: var(--lhds-color-red-50);
+      background: var(--snackskal-light);
     }
 
     &:focus-visible {
diff --git a/packages/elements/src/components/ui/buttons/SecondaryButton.module.css b/packages/elements/src/components/ui/buttons/SecondaryButton.module.css
index 82671ccb1..d7cac2420 100644
--- a/packages/elements/src/components/ui/buttons/SecondaryButton.module.css
+++ b/packages/elements/src/components/ui/buttons/SecondaryButton.module.css
@@ -32,7 +32,7 @@
     color: var(--lhds-color-red-600);
 
     &:hover {
-      background-color: var(--lhds-color-red-50);
+      background-color: var(--snackskal-light);
       border: 1px solid var(--lhds-color-red-400);
     }
 
diff --git a/packages/elements/src/components/ui/buttons/common/ButtonContent.tsx b/packages/elements/src/components/ui/buttons/common/ButtonContent.tsx
index bb73d5064..9e85fd2e6 100644
--- a/packages/elements/src/components/ui/buttons/common/ButtonContent.tsx
+++ b/packages/elements/src/components/ui/buttons/common/ButtonContent.tsx
@@ -108,7 +108,7 @@ export const ButtonContent: React.FC<ButtonContentProps> = ({
           {label}
         </span>
       )}
-      {label ? <Space /> : null}
+      {label ? <Space half /> : null}
       {rightContent}
     </div>
   );
diff --git a/packages/elements/src/components/ui/route-leg/RouteLeg.stories.tsx b/packages/elements/src/components/ui/route-leg/RouteLeg.stories.tsx
index 0b895c299..dc0244e24 100644
--- a/packages/elements/src/components/ui/route-leg/RouteLeg.stories.tsx
+++ b/packages/elements/src/components/ui/route-leg/RouteLeg.stories.tsx
@@ -22,9 +22,9 @@ export const Demo = () => (
 
 export const Overview = () => {
   return (
-    <Box gap={5}>
+    <Box gap={5} alignItems={"flex-start"}>
       {routeLegSizes.map((size) => (
-        <Box width={220} gap={2} key={size}>
+        <Box gap={2} key={size}>
           <Heading as={"h4"}>{size}</Heading>
           <RouteLeg
             variant={"ship"}
@@ -68,7 +68,7 @@ export const WithChildren = () => (
 );
 
 export const Compact = () => (
-  <Box width={220}>
+  <Box alignItems={"flex-start"}>
     <RouteLeg
       variant={"ship"}
       departure={{ location: "Göteborg", dateTime: "23 Aug 09:10" }}
@@ -79,7 +79,7 @@ export const Compact = () => (
 );
 
 export const CompactWithChildren = () => (
-  <Box width={220}>
+  <Box alignItems={"flex-start"}>
     <RouteLeg
       variant={"ship"}
       departure={{ location: "Göteborg", dateTime: "23 Aug 09:10" }}
@@ -91,46 +91,42 @@ export const CompactWithChildren = () => (
   </Box>
 );
 export const StandardWithStrikethrough = () => (
-  <Box width={220}>
-    <RouteLeg
-      variant={"ship"}
-      departure={{
-        location: "Göteborg",
-        dateTime: "23 Aug 09:15",
-        originalDateTime: "23 Aug 09:10",
-      }}
-      arrival={{
-        location: "Frederikshavn",
-        dateTime: "23 Aug 12:50",
-        originalDateTime: "23 Aug 12:40",
-      }}
-      label={"1st route"}
-    />
-  </Box>
+  <RouteLeg
+    variant={"ship"}
+    departure={{
+      location: "Göteborg",
+      dateTime: "23 Aug 09:15",
+      originalDateTime: "23 Aug 09:10",
+    }}
+    arrival={{
+      location: "Frederikshavn",
+      dateTime: "23 Aug 12:50",
+      originalDateTime: "23 Aug 12:40",
+    }}
+    label={"1st route"}
+  />
 );
 
 export const RelaxedWithStrikethrough = () => (
-  <Box width={220}>
-    <RouteLeg
-      variant={"ship"}
-      departure={{
-        location: "Göteborg",
-        dateTime: "23 Aug 09:15",
-        originalDateTime: "23 Aug 09:10",
-      }}
-      arrival={{
-        location: "Frederikshavn",
-        dateTime: "23 Aug 12:50",
-        originalDateTime: "23 Aug 12:40",
-      }}
-      size={"relaxed"}
-      label={"1st route"}
-    />
-  </Box>
+  <RouteLeg
+    variant={"ship"}
+    departure={{
+      location: "Göteborg",
+      dateTime: "23 Aug 09:15",
+      originalDateTime: "23 Aug 09:10",
+    }}
+    arrival={{
+      location: "Frederikshavn",
+      dateTime: "23 Aug 12:50",
+      originalDateTime: "23 Aug 12:40",
+    }}
+    size={"relaxed"}
+    label={"1st route"}
+  />
 );
 
 export const CompactWithStrikethrough = () => (
-  <Box width={220}>
+  <Box alignItems={"flex-start"}>
     <RouteLeg
       variant={"ship"}
       departure={{
@@ -150,7 +146,7 @@ export const CompactWithStrikethrough = () => (
 );
 
 export const CompactWithLabel = () => (
-  <Box width={220}>
+  <Box alignItems={"flex-start"}>
     <RouteLeg
       variant={"ship"}
       departure={{ location: "Göteborg", dateTime: "23 Aug 09:10" }}
@@ -162,7 +158,7 @@ export const CompactWithLabel = () => (
 );
 
 export const CompactWithLabelSelected = () => (
-  <Box width={220}>
+  <Box width={250}>
     <RouteLeg
       variant={"ship"}
       departure={{ location: "Göteborg", dateTime: "23 Aug 09:10" }}
@@ -184,7 +180,7 @@ export const Relaxed = () => (
 );
 
 export const RelaxedSelected = () => (
-  <Box width={220}>
+  <Box width={250}>
     <RouteLeg
       variant={"rail"}
       departure={{ location: "Göteborg", dateTime: "23 Aug 09:10" }}
@@ -232,7 +228,7 @@ export const Multileg = () => (
 );
 
 export const MultilegCompact = () => (
-  <Box width={264} border={`1px solid ${cssColor("--lhds-color-ui-300")}`}>
+  <Box width={270} border={`1px solid ${cssColor("--lhds-color-ui-300")}`}>
     <Box indent={3} spacing={3}>
       <RouteLeg
         variant={"rail"}
diff --git a/packages/elements/src/components/ui/route-leg/RouteLeg.tsx b/packages/elements/src/components/ui/route-leg/RouteLeg.tsx
index 6b90185bd..32e205c69 100644
--- a/packages/elements/src/components/ui/route-leg/RouteLeg.tsx
+++ b/packages/elements/src/components/ui/route-leg/RouteLeg.tsx
@@ -126,20 +126,19 @@ export const RouteLeg: React.FC<RouteLegProps> = ({
         />
       )}
       <div className={styles.grid}>
-        <Column alignItems={"center"} gap={0.5}>
-          <Icon icon={icon} fixedWidth size={24} />
+        <Column alignItems={"center"}>
+          <Icon icon={icon} fixedWidth size={20} />
+          <Space half />
           <Box
             flex={1}
-            border={`1px solid ${cssColor("--lhds-color-ui-300")}`}
-            borderRadius={2}
+            border={`1px solid ${cssColor("--lhds-color-ui-900")}`}
+            borderRadius={"2px 2px 0 0"}
           />
           <Box
-            flex={"none"}
-            border={`4px solid ${cssColor("--lhds-color-blue-100")}`}
-            background={cssColor("--lhds-color-blue-500")}
+            borderRadius={"50%"}
+            border={`2px solid ${cssColor("--lhds-color-ui-900")}`}
             width={16}
             height={16}
-            borderRadius={8}
           />
         </Column>
         <Column gap={size === "standard" ? 3 : 2}>
diff --git a/packages/filter/src/features/search-filter/features/chips/SearchFilterChips.tsx b/packages/filter/src/features/search-filter/features/chips/SearchFilterChips.tsx
index f0d28bdf5..e8cdc5767 100644
--- a/packages/filter/src/features/search-filter/features/chips/SearchFilterChips.tsx
+++ b/packages/filter/src/features/search-filter/features/chips/SearchFilterChips.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactNode, useCallback } from "react";
 import { Row } from "@stenajs-webui/core";
-import { FlatButton } from "@stenajs-webui/elements";
+import { FlatButton, stenaClean } from "@stenajs-webui/elements";
 import { useSearchFilterDispatch } from "../../context/SearchFilterDispatchContext";
 import { useSearchFilterActions } from "../../context/SearchFilterActionsContext";
 
@@ -28,7 +28,8 @@ export const SearchFilterChips: React.FC<SearchFilterChipsProps> = ({
       {!disableClearAllButton && (
         <FlatButton
           size={"small"}
-          label={"Clear all"}
+          leftIcon={stenaClean}
+          label={"Clear"}
           onClick={onClickClearAll}
         />
       )}