From 8f82c24cf47b751d3dedac1491f1a94ba52d6a6b Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:02:27 -0500 Subject: [PATCH] Fleet UI: Update software icons (#16224) --- frontend/pages/SoftwarePage/_styles.scss | 11 + .../SoftwareDetailsSummary/_styles.scss | 4 +- .../components/icons/AcrobatReader.tsx | 7 +- .../SoftwarePage/components/icons/Chrome.tsx | 71 ---- .../components/icons/ChromeApp.tsx | 67 ++++ .../components/icons/ChromeOS.tsx | 14 + .../SoftwarePage/components/icons/Excel.tsx | 52 ++- .../components/icons/Extension.tsx | 67 +++- .../SoftwarePage/components/icons/Firefox.tsx | 378 +++++++++--------- .../SoftwarePage/components/icons/LinuxOS.tsx | 16 + .../SoftwarePage/components/icons/MacApp.tsx | 10 +- .../SoftwarePage/components/icons/MacOS.tsx | 16 + .../SoftwarePage/components/icons/Package.tsx | 63 ++- .../SoftwarePage/components/icons/Safari.tsx | 327 +++++++-------- .../SoftwarePage/components/icons/Slack.tsx | 24 +- .../SoftwarePage/components/icons/Teams.tsx | 62 ++- .../components/icons/VisualStudioCode.tsx | 18 +- .../components/icons/WindowsApp.tsx | 12 +- .../components/icons/WindowsOS.tsx | 16 + .../SoftwarePage/components/icons/Word.tsx | 74 ++-- .../SoftwarePage/components/icons/Zoom.tsx | 21 +- .../SoftwarePage/components/icons/index.ts | 4 +- 22 files changed, 726 insertions(+), 608 deletions(-) delete mode 100644 frontend/pages/SoftwarePage/components/icons/Chrome.tsx create mode 100644 frontend/pages/SoftwarePage/components/icons/ChromeApp.tsx create mode 100644 frontend/pages/SoftwarePage/components/icons/ChromeOS.tsx create mode 100644 frontend/pages/SoftwarePage/components/icons/LinuxOS.tsx create mode 100644 frontend/pages/SoftwarePage/components/icons/MacOS.tsx create mode 100644 frontend/pages/SoftwarePage/components/icons/WindowsOS.tsx diff --git a/frontend/pages/SoftwarePage/_styles.scss b/frontend/pages/SoftwarePage/_styles.scss index 0f9fe85494..1c4f5ba8fc 100644 --- a/frontend/pages/SoftwarePage/_styles.scss +++ b/frontend/pages/SoftwarePage/_styles.scss @@ -56,4 +56,15 @@ font-style: italic; } } + + &__wrapper { + .table-container { + .software-icon { + width: 24px; + height: 24px; + border: 1px solid $ui-fleet-black-10; + border-radius: 8px; + } + } + } } diff --git a/frontend/pages/SoftwarePage/components/SoftwareDetailsSummary/_styles.scss b/frontend/pages/SoftwarePage/components/SoftwareDetailsSummary/_styles.scss index b472078d85..2da1c3e5bc 100644 --- a/frontend/pages/SoftwarePage/components/SoftwareDetailsSummary/_styles.scss +++ b/frontend/pages/SoftwarePage/components/SoftwareDetailsSummary/_styles.scss @@ -7,10 +7,10 @@ display: flex; gap: $pad-medium; - &__icon { + .software-icon { width: 96px; height: 96px; - border: 1px solid #e2e4ea; + border: 1px solid $ui-fleet-black-10; border-radius: 8px; } diff --git a/frontend/pages/SoftwarePage/components/icons/AcrobatReader.tsx b/frontend/pages/SoftwarePage/components/icons/AcrobatReader.tsx index 440db6f583..2a28a7ca1d 100644 --- a/frontend/pages/SoftwarePage/components/icons/AcrobatReader.tsx +++ b/frontend/pages/SoftwarePage/components/icons/AcrobatReader.tsx @@ -4,13 +4,10 @@ import type { SVGProps } from "react"; const AcrobatReader = (props: SVGProps) => ( + - ); diff --git a/frontend/pages/SoftwarePage/components/icons/Chrome.tsx b/frontend/pages/SoftwarePage/components/icons/Chrome.tsx deleted file mode 100644 index c356dc9c39..0000000000 --- a/frontend/pages/SoftwarePage/components/icons/Chrome.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import React from "react"; - -import type { SVGProps } from "react"; - -const Chrome = (props: SVGProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - -); -export default Chrome; diff --git a/frontend/pages/SoftwarePage/components/icons/ChromeApp.tsx b/frontend/pages/SoftwarePage/components/icons/ChromeApp.tsx new file mode 100644 index 0000000000..e53cf6a4f5 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/ChromeApp.tsx @@ -0,0 +1,67 @@ +import React from "react"; + +import type { SVGProps } from "react"; + +const ChromeApp = (props: SVGProps) => ( + + + + + + + + + + + + + + + + + + + + + + + + + + + +); +export default ChromeApp; diff --git a/frontend/pages/SoftwarePage/components/icons/ChromeOS.tsx b/frontend/pages/SoftwarePage/components/icons/ChromeOS.tsx new file mode 100644 index 0000000000..b2c7de8453 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/ChromeOS.tsx @@ -0,0 +1,14 @@ +import React from "react"; + +import type { SVGProps } from "react"; + +const ChromeOS = (props: SVGProps) => ( + + + + +); +export default ChromeOS; diff --git a/frontend/pages/SoftwarePage/components/icons/Excel.tsx b/frontend/pages/SoftwarePage/components/icons/Excel.tsx index 5a46cfbc23..cb414339ed 100644 --- a/frontend/pages/SoftwarePage/components/icons/Excel.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Excel.tsx @@ -4,65 +4,61 @@ import type { SVGProps } from "react"; const Excel = (props: SVGProps) => ( + - - + - + - - + + diff --git a/frontend/pages/SoftwarePage/components/icons/Extension.tsx b/frontend/pages/SoftwarePage/components/icons/Extension.tsx index d456c8724f..aca39eabe4 100644 --- a/frontend/pages/SoftwarePage/components/icons/Extension.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Extension.tsx @@ -4,17 +4,62 @@ import type { SVGProps } from "react"; const Extension = (props: SVGProps) => ( - - + + + + + + + + + + + + + + + + + + + ); export default Extension; diff --git a/frontend/pages/SoftwarePage/components/icons/Firefox.tsx b/frontend/pages/SoftwarePage/components/icons/Firefox.tsx index f4206a4491..b4c7f4ead5 100644 --- a/frontend/pages/SoftwarePage/components/icons/Firefox.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Firefox.tsx @@ -4,287 +4,283 @@ import type { SVGProps } from "react"; const Firefox = (props: SVGProps) => ( - - + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + diff --git a/frontend/pages/SoftwarePage/components/icons/LinuxOS.tsx b/frontend/pages/SoftwarePage/components/icons/LinuxOS.tsx new file mode 100644 index 0000000000..4ffccda4d8 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/LinuxOS.tsx @@ -0,0 +1,16 @@ +import React from "react"; + +import type { SVGProps } from "react"; + +const LinuxOS = (props: SVGProps) => ( + + + + +); +export default LinuxOS; diff --git a/frontend/pages/SoftwarePage/components/icons/MacApp.tsx b/frontend/pages/SoftwarePage/components/icons/MacApp.tsx index 5119e03fb1..57d0977f08 100644 --- a/frontend/pages/SoftwarePage/components/icons/MacApp.tsx +++ b/frontend/pages/SoftwarePage/components/icons/MacApp.tsx @@ -4,16 +4,12 @@ import type { SVGProps } from "react"; const MacApp = (props: SVGProps) => ( + - ); diff --git a/frontend/pages/SoftwarePage/components/icons/MacOS.tsx b/frontend/pages/SoftwarePage/components/icons/MacOS.tsx new file mode 100644 index 0000000000..5cb9925bf6 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/MacOS.tsx @@ -0,0 +1,16 @@ +import React from "react"; + +import type { SVGProps } from "react"; + +const MacOS = (props: SVGProps) => ( + + + + +); +export default MacOS; diff --git a/frontend/pages/SoftwarePage/components/icons/Package.tsx b/frontend/pages/SoftwarePage/components/icons/Package.tsx index 8a2aae8db9..4e7941dc7f 100644 --- a/frontend/pages/SoftwarePage/components/icons/Package.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Package.tsx @@ -4,17 +4,58 @@ import type { SVGProps } from "react"; const Package = (props: SVGProps) => ( - - + + + + + + + + + + + + + + + + + + ); export default Package; diff --git a/frontend/pages/SoftwarePage/components/icons/Safari.tsx b/frontend/pages/SoftwarePage/components/icons/Safari.tsx index c0c28e3a8c..aa4234966c 100644 --- a/frontend/pages/SoftwarePage/components/icons/Safari.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Safari.tsx @@ -4,579 +4,584 @@ import type { SVGProps } from "react"; const Safari = (props: SVGProps) => ( + - - - - - + + + + - - + + - - + + - - + + diff --git a/frontend/pages/SoftwarePage/components/icons/Slack.tsx b/frontend/pages/SoftwarePage/components/icons/Slack.tsx index 992bb16726..f35190fafa 100644 --- a/frontend/pages/SoftwarePage/components/icons/Slack.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Slack.tsx @@ -4,36 +4,28 @@ import type { SVGProps } from "react"; const Slack = (props: SVGProps) => ( - - + + - - + + diff --git a/frontend/pages/SoftwarePage/components/icons/Teams.tsx b/frontend/pages/SoftwarePage/components/icons/Teams.tsx index dfb64170cb..942aa36c1b 100644 --- a/frontend/pages/SoftwarePage/components/icons/Teams.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Teams.tsx @@ -4,79 +4,75 @@ import type { SVGProps } from "react"; const Teams = (props: SVGProps) => ( + - - - + + diff --git a/frontend/pages/SoftwarePage/components/icons/VisualStudioCode.tsx b/frontend/pages/SoftwarePage/components/icons/VisualStudioCode.tsx index 1c209468e5..f5ee519edc 100644 --- a/frontend/pages/SoftwarePage/components/icons/VisualStudioCode.tsx +++ b/frontend/pages/SoftwarePage/components/icons/VisualStudioCode.tsx @@ -3,33 +3,29 @@ import React from "react"; import type { SVGProps } from "react"; const VisualStudioCode = (props: SVGProps) => ( - - + + - + diff --git a/frontend/pages/SoftwarePage/components/icons/WindowsApp.tsx b/frontend/pages/SoftwarePage/components/icons/WindowsApp.tsx index 6f0fad5a90..7849741447 100644 --- a/frontend/pages/SoftwarePage/components/icons/WindowsApp.tsx +++ b/frontend/pages/SoftwarePage/components/icons/WindowsApp.tsx @@ -3,17 +3,13 @@ import React from "react"; import type { SVGProps } from "react"; const WindowsApp = (props: SVGProps) => ( - + + - ); diff --git a/frontend/pages/SoftwarePage/components/icons/WindowsOS.tsx b/frontend/pages/SoftwarePage/components/icons/WindowsOS.tsx new file mode 100644 index 0000000000..bd11094ca5 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/WindowsOS.tsx @@ -0,0 +1,16 @@ +import React from "react"; + +import type { SVGProps } from "react"; + +const WindowsOS = (props: SVGProps) => ( + + + + +); +export default WindowsOS; diff --git a/frontend/pages/SoftwarePage/components/icons/Word.tsx b/frontend/pages/SoftwarePage/components/icons/Word.tsx index 4a654107b2..adfc24010f 100644 --- a/frontend/pages/SoftwarePage/components/icons/Word.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Word.tsx @@ -3,90 +3,86 @@ import React from "react"; import type { SVGProps } from "react"; const Word = (props: SVGProps) => ( - - + + - - + + - + - + - + - + - + diff --git a/frontend/pages/SoftwarePage/components/icons/Zoom.tsx b/frontend/pages/SoftwarePage/components/icons/Zoom.tsx index 8b9512751d..b9c81e2ff3 100644 --- a/frontend/pages/SoftwarePage/components/icons/Zoom.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Zoom.tsx @@ -3,26 +3,23 @@ import React from "react"; import type { SVGProps } from "react"; const Zoom = (props: SVGProps) => ( - - + + - + diff --git a/frontend/pages/SoftwarePage/components/icons/index.ts b/frontend/pages/SoftwarePage/components/icons/index.ts index 0965c78651..71a83bfca7 100644 --- a/frontend/pages/SoftwarePage/components/icons/index.ts +++ b/frontend/pages/SoftwarePage/components/icons/index.ts @@ -1,5 +1,5 @@ import AcrobatReader from "./AcrobatReader"; -import Chrome from "./Chrome"; +import ChromeApp from "./ChromeApp"; import Excel from "./Excel"; import Extension from "./Extension"; import Firefox from "./Firefox"; @@ -18,7 +18,7 @@ import Zoom from "./Zoom"; // matched in the application logic. export const SOFTWARE_NAME_TO_ICON_MAP = { "adobe acrobat reader": AcrobatReader, - "google chrome": Chrome, + "google chrome": ChromeApp, "microsoft excel": Excel, firefox: Firefox, package: Package,