From 04db5b02f9ff9d85eff3cfc814baa85807b12507 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 11:00:59 +0100 Subject: [PATCH 01/10] Adding new logo, new width, and border radius --- assets/logo.svg | 13 +++---------- lib/Logo/index.tsx | 1 + lib/Logo/styles.scss | 6 +++++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/assets/logo.svg b/assets/logo.svg index 41de212ee..350eb1002 100644 --- a/assets/logo.svg +++ b/assets/logo.svg @@ -1,11 +1,4 @@ - - - - - - - - - - + + + diff --git a/lib/Logo/index.tsx b/lib/Logo/index.tsx index 391b5e57b..8a1fe972d 100644 --- a/lib/Logo/index.tsx +++ b/lib/Logo/index.tsx @@ -9,6 +9,7 @@ import logoSVG from "../../assets/logo.svg"; export function Logo(props: any) { const LogoPath = props.url || logoSVG; + console.log(LogoPath); const image = typeof LogoPath === "string" ? ( {props.alt} diff --git a/lib/Logo/styles.scss b/lib/Logo/styles.scss index f9c3091a2..15f07ec97 100644 --- a/lib/Logo/styles.scss +++ b/lib/Logo/styles.scss @@ -2,7 +2,7 @@ Config ========================================================================== */ $logo-max-height: 40px !default; -$logo-max-width: 150px !default; +$logo-max-width: 40px !default; /* ========================================================================== Styles @@ -10,4 +10,8 @@ $logo-max-width: 150px !default; .logo__image { max-width: $logo-max-width; max-height: $logo-max-height; + + svg { + border-radius: 8px; + } } \ No newline at end of file From 202fda7f45a04f75bf5ef5df506d2bf8fef553bc Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 11:03:30 +0100 Subject: [PATCH 02/10] adding bynder class --- lib/Logo/index.tsx | 2 +- lib/Logo/styles.scss | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Logo/index.tsx b/lib/Logo/index.tsx index 8a1fe972d..2781760e0 100644 --- a/lib/Logo/index.tsx +++ b/lib/Logo/index.tsx @@ -14,7 +14,7 @@ export function Logo(props: any) { typeof LogoPath === "string" ? ( {props.alt} ) : ( - + ); diff --git a/lib/Logo/styles.scss b/lib/Logo/styles.scss index 15f07ec97..7032dc09d 100644 --- a/lib/Logo/styles.scss +++ b/lib/Logo/styles.scss @@ -2,7 +2,7 @@ Config ========================================================================== */ $logo-max-height: 40px !default; -$logo-max-width: 40px !default; +$logo-max-width: 150px !default; /* ========================================================================== Styles @@ -11,7 +11,12 @@ $logo-max-width: 40px !default; max-width: $logo-max-width; max-height: $logo-max-height; - svg { - border-radius: 8px; + &.bynder { + max-width: 40px; + + svg { + border-radius: 8px; + } } + } \ No newline at end of file From 841a5c0314ee6d1b5d9e5639498a37d6d7aad750 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 11:03:48 +0100 Subject: [PATCH 03/10] bynder-logo class --- lib/Logo/index.tsx | 2 +- lib/Logo/styles.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Logo/index.tsx b/lib/Logo/index.tsx index 2781760e0..d4913388c 100644 --- a/lib/Logo/index.tsx +++ b/lib/Logo/index.tsx @@ -14,7 +14,7 @@ export function Logo(props: any) { typeof LogoPath === "string" ? ( {props.alt} ) : ( - + ); diff --git a/lib/Logo/styles.scss b/lib/Logo/styles.scss index 7032dc09d..6f1d2a5ed 100644 --- a/lib/Logo/styles.scss +++ b/lib/Logo/styles.scss @@ -11,7 +11,7 @@ $logo-max-width: 150px !default; max-width: $logo-max-width; max-height: $logo-max-height; - &.bynder { + &.bynder-logo { max-width: 40px; svg { From ea4de9daaf3f92256e5b1dd415776d524be174e9 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:10:39 +0100 Subject: [PATCH 04/10] adding original logo back in --- lib/LogoGC/README.md | 13 +++++++++++++ lib/LogoGC/index.tsx | 28 ++++++++++++++++++++++++++++ lib/LogoGC/styles.scss | 13 +++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 lib/LogoGC/README.md create mode 100644 lib/LogoGC/index.tsx create mode 100644 lib/LogoGC/styles.scss diff --git a/lib/LogoGC/README.md b/lib/LogoGC/README.md new file mode 100644 index 000000000..f8c8d2697 --- /dev/null +++ b/lib/LogoGC/README.md @@ -0,0 +1,13 @@ +# Logo +A logo component which defaults to the GatherContent logo + +### Props + +| Name | Type | Default | Required | Description | +| ------------------- |-------------- | --------------------------- | -------- |------------------------------- | +| url | String | '' | No | Image URL for the logo | +| alt | String | 'GatherContent Logo' | No | Alt attribute for the logo | +###Usage +``` + +``` \ No newline at end of file diff --git a/lib/LogoGC/index.tsx b/lib/LogoGC/index.tsx new file mode 100644 index 000000000..391b5e57b --- /dev/null +++ b/lib/LogoGC/index.tsx @@ -0,0 +1,28 @@ +import React from "react"; +import logoSVG from "../../assets/logo.svg"; + +/** + * @usage + * + * + */ + +export function Logo(props: any) { + const LogoPath = props.url || logoSVG; + const image = + typeof LogoPath === "string" ? ( + {props.alt} + ) : ( + + + + ); + return {image}; +} + +Logo.defaultProps = { + url: "", + alt: "GatherContent Logo", +}; + +export default Logo; diff --git a/lib/LogoGC/styles.scss b/lib/LogoGC/styles.scss new file mode 100644 index 000000000..f9c3091a2 --- /dev/null +++ b/lib/LogoGC/styles.scss @@ -0,0 +1,13 @@ +/* ========================================================================== + Config + ========================================================================== */ +$logo-max-height: 40px !default; +$logo-max-width: 150px !default; + +/* ========================================================================== + Styles + ========================================================================== */ +.logo__image { + max-width: $logo-max-width; + max-height: $logo-max-height; +} \ No newline at end of file From 26d5793d286bbf53582fa2b9597df5c32ff40bf2 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:11:26 +0100 Subject: [PATCH 05/10] rename LogoGC --- lib/Logo/index.tsx | 1 - lib/LogoGC/index.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Logo/index.tsx b/lib/Logo/index.tsx index d4913388c..011e5ab0b 100644 --- a/lib/Logo/index.tsx +++ b/lib/Logo/index.tsx @@ -9,7 +9,6 @@ import logoSVG from "../../assets/logo.svg"; export function Logo(props: any) { const LogoPath = props.url || logoSVG; - console.log(LogoPath); const image = typeof LogoPath === "string" ? ( {props.alt} diff --git a/lib/LogoGC/index.tsx b/lib/LogoGC/index.tsx index 391b5e57b..f1c2e824f 100644 --- a/lib/LogoGC/index.tsx +++ b/lib/LogoGC/index.tsx @@ -7,7 +7,7 @@ import logoSVG from "../../assets/logo.svg"; * */ -export function Logo(props: any) { +export function LogoGC(props: any) { const LogoPath = props.url || logoSVG; const image = typeof LogoPath === "string" ? ( From cfbf20e30f78001108750eddb2f2e5a06d9864cc Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:17:35 +0100 Subject: [PATCH 06/10] correct export name --- lib/LogoGC/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/LogoGC/index.tsx b/lib/LogoGC/index.tsx index f1c2e824f..f1a531c3d 100644 --- a/lib/LogoGC/index.tsx +++ b/lib/LogoGC/index.tsx @@ -20,9 +20,9 @@ export function LogoGC(props: any) { return {image}; } -Logo.defaultProps = { +LogoGC.defaultProps = { url: "", alt: "GatherContent Logo", }; -export default Logo; +export default LogoGC; From 2e0da54d4519439363c9273b6efc7d5c4fc603d2 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:20:50 +0100 Subject: [PATCH 07/10] exporting component --- lib/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/index.ts b/lib/index.ts index 5c6cb1a56..a1f5fc003 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -56,6 +56,7 @@ export { TopBarGroup } from "./TopBar/TopBarGroup"; export { ParticipantInfo } from "./ParticipantInfo"; export { Navigation } from "./Navigation"; export { Logo } from "./Logo"; +export { LogoGC } from "./LogoGC"; export { Shortcut } from "./Shortcut"; export { ShortcutIcon } from "./Shortcut/ShortcutIcon"; export { ShortcutTrigger } from "./ShortcutTrigger"; From 8f9bb93444ed0195c261f006add5d19329a64dc8 Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:51:09 +0100 Subject: [PATCH 08/10] adding original svg in --- assets/logogc.svg | 11 +++++++++++ lib/LogoGC/index.tsx | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 assets/logogc.svg diff --git a/assets/logogc.svg b/assets/logogc.svg new file mode 100644 index 000000000..41de212ee --- /dev/null +++ b/assets/logogc.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/LogoGC/index.tsx b/lib/LogoGC/index.tsx index f1a531c3d..a3c676afb 100644 --- a/lib/LogoGC/index.tsx +++ b/lib/LogoGC/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import logoSVG from "../../assets/logo.svg"; +import logoSVG from "../../assets/logogc.svg"; /** * @usage From bcfb954d7857bdb19a36aafd810d5f9aa41af7ec Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 15:57:57 +0100 Subject: [PATCH 09/10] adding gc logo story --- stories/components/Logo.stories.tsx | 12 +++++------ stories/components/LogoGC.stories.tsx | 29 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 stories/components/LogoGC.stories.tsx diff --git a/stories/components/Logo.stories.tsx b/stories/components/Logo.stories.tsx index 905cde0eb..a69d3adf6 100644 --- a/stories/components/Logo.stories.tsx +++ b/stories/components/Logo.stories.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import LogoComponent from '../../lib/Logo'; -import StoryItem from '../styleguide/StoryItem'; +import React from "react"; +import LogoComponent from "../../lib/LogoGC"; +import StoryItem from "../styleguide/StoryItem"; export default { - title: 'Legacy/Logo', - component: LogoComponent + title: "Legacy/Logo", + component: LogoComponent, }; export const Logo = () => ( @@ -25,5 +25,5 @@ export const Logo = () => ( ); Logo.parameters = { - controls: { hideNoControlsWarning: true } + controls: { hideNoControlsWarning: true }, }; diff --git a/stories/components/LogoGC.stories.tsx b/stories/components/LogoGC.stories.tsx new file mode 100644 index 000000000..6f636807e --- /dev/null +++ b/stories/components/LogoGC.stories.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import LogoGCComponent from "../../lib/LogoGC"; +import StoryItem from "../styleguide/StoryItem"; + +export default { + title: "Legacy/LogoGC", + component: LogoGCComponent, +}; + +export const LogoGC = () => ( +
+ +
+ +
+ + + + + +
+); + +LogoGC.parameters = { + controls: { hideNoControlsWarning: true }, +}; From 0212a0c982145957720b52ee7c4b86cee159d7ae Mon Sep 17 00:00:00 2001 From: Shane Prendergast Date: Mon, 2 Oct 2023 16:05:46 +0100 Subject: [PATCH 10/10] correct logo path --- lib/LogoGC/index.tsx | 4 ++-- stories/components/Logo.stories.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/LogoGC/index.tsx b/lib/LogoGC/index.tsx index a3c676afb..673f1dedd 100644 --- a/lib/LogoGC/index.tsx +++ b/lib/LogoGC/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import logoSVG from "../../assets/logogc.svg"; +import logoGCSVG from "../../assets/logogc.svg"; /** * @usage @@ -8,7 +8,7 @@ import logoSVG from "../../assets/logogc.svg"; */ export function LogoGC(props: any) { - const LogoPath = props.url || logoSVG; + const LogoPath = props.url || logoGCSVG; const image = typeof LogoPath === "string" ? ( {props.alt} diff --git a/stories/components/Logo.stories.tsx b/stories/components/Logo.stories.tsx index a69d3adf6..41b95948b 100644 --- a/stories/components/Logo.stories.tsx +++ b/stories/components/Logo.stories.tsx @@ -1,5 +1,5 @@ import React from "react"; -import LogoComponent from "../../lib/LogoGC"; +import LogoComponent from "../../lib/Logo"; import StoryItem from "../styleguide/StoryItem"; export default {