diff --git a/assets/image/glints-logo-black.svg b/assets/image/glints-logo-black.svg deleted file mode 100644 index c174d1479..000000000 --- a/assets/image/glints-logo-black.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/image/glints-logo-white-v2.svg b/assets/image/glints-logo-white-v2.svg deleted file mode 100644 index f8bdf83a2..000000000 --- a/assets/image/glints-logo-white-v2.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/assets/image/glints-logo-white.svg b/assets/image/glints-logo-white.svg index e931e902d..f8bdf83a2 100644 --- a/assets/image/glints-logo-white.svg +++ b/assets/image/glints-logo-white.svg @@ -1,57 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/image/glints-tapjobs-logo-black.svg b/assets/image/glints-tapjobs-logo-black.svg deleted file mode 100644 index 126d718c6..000000000 --- a/assets/image/glints-tapjobs-logo-black.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/image/glints-tapjobs-logo-white-v2.svg b/assets/image/glints-tapjobs-logo-white-v2.svg deleted file mode 100644 index 34e8710fe..000000000 --- a/assets/image/glints-tapjobs-logo-white-v2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/image/glints-tapjobs-logo-white.svg b/assets/image/glints-tapjobs-logo-white.svg index b66cff423..34e8710fe 100644 --- a/assets/image/glints-tapjobs-logo-white.svg +++ b/assets/image/glints-tapjobs-logo-white.svg @@ -1,62 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/assets/image/glints-taploker-logo-black.svg b/assets/image/glints-taploker-logo-black.svg deleted file mode 100644 index e5b89f6f8..000000000 --- a/assets/image/glints-taploker-logo-black.svg +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/image/glints-taploker-logo-white-v2.svg b/assets/image/glints-taploker-logo-white-v2.svg deleted file mode 100644 index e221032a7..000000000 --- a/assets/image/glints-taploker-logo-white-v2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/image/glints-taploker-logo-white.svg b/assets/image/glints-taploker-logo-white.svg index 47997e902..e221032a7 100644 --- a/assets/image/glints-taploker-logo-white.svg +++ b/assets/image/glints-taploker-logo-white.svg @@ -1,211 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/General/Brand/Brand.stories.tsx b/src/General/Brand/Brand.stories.tsx index b926a5291..1eab2370c 100644 --- a/src/General/Brand/Brand.stories.tsx +++ b/src/General/Brand/Brand.stories.tsx @@ -12,15 +12,9 @@ export default { control: { type: 'radio', options: [ - 'glints-black', 'glints-white', - 'glints-white-v2', - 'glints-taploker-black', 'glints-taploker-white', - 'glints-taploker-white-v2', - 'glints-tapjobs-black', 'glints-tapjobs-white', - 'glints-tapjobs-white-v2', 'glints', 'glints-tapjobs', 'glints-taploker', @@ -56,7 +50,7 @@ Interactive.args = { export const RedirectToGlintsWhenRightClick = Template.bind({}); RedirectToGlintsWhenRightClick.args = { - asset: 'glints-black', + asset: 'glints', variant: 'square', rightClickURL: 'https://glints.com', }; diff --git a/src/General/Brand/Brand.test.tsx b/src/General/Brand/Brand.test.tsx index db64f4bfe..57b459111 100644 --- a/src/General/Brand/Brand.test.tsx +++ b/src/General/Brand/Brand.test.tsx @@ -7,18 +7,10 @@ import Brand from './Brand'; describe('', () => { it('should render as expected', () => { - const blackLogoSnapshot = renderer - .create() - .toJSON(); - expect(blackLogoSnapshot).toMatchSnapshot(); const white = renderer .create() .toJSON(); expect(white).toMatchSnapshot(); - const blackTapLoker = renderer - .create() - .toJSON(); - expect(blackTapLoker).toMatchSnapshot(); const whiteTapLoker = renderer .create() .toJSON(); @@ -35,7 +27,7 @@ describe('', () => { const url = 'https://glints.com'; const { getByRole } = render( - + ); const container = getByRole('presentation'); fireEvent.contextMenu(container); @@ -50,7 +42,7 @@ describe('', () => { const onContextMenu = jest.fn(); const { getByRole } = render( ', () => { ); const { container: squareContainer } = render( - + ); expect(squareContainer.querySelector('.brand-image')).toHaveStyleRule( 'width', diff --git a/src/General/Brand/Brand.tsx b/src/General/Brand/Brand.tsx index 82d6ab4bd..ec6aebfe9 100644 --- a/src/General/Brand/Brand.tsx +++ b/src/General/Brand/Brand.tsx @@ -7,16 +7,8 @@ import { BrandContainer, BrandImage } from './BrandStyle'; import Glints from '../../../assets/image/glints-logo.svg'; import GlintsTapLoker from '../../../assets/image/glints-taploker-logo.svg'; import GlintsTapJobs from '../../../assets/image/glints-tapjobs-logo.svg'; -import GlintsWhiteV2 from '../../../assets/image/glints-logo-white-v2.svg'; -import GlintsTapLokerWhiteV2 from '../../../assets/image/glints-taploker-logo-white-v2.svg'; -import GlintsTapJobsWhiteV2 from '../../../assets/image/glints-tapjobs-logo-white-v2.svg'; - -// TODO: All the icons below are deprecated. Should be removed once this EPIC is done: https://glints.atlassian.net/browse/OTP-1961 -import GlintsBlack from '../../../assets/image/glints-logo-black.svg'; import GlintsWhite from '../../../assets/image/glints-logo-white.svg'; -import GlintsTapLokerBlack from '../../../assets/image/glints-taploker-logo-black.svg'; import GlintsTapLokerWhite from '../../../assets/image/glints-taploker-logo-white.svg'; -import GlintsTapJobsBlack from '../../../assets/image/glints-tapjobs-logo-black.svg'; import GlintsTapJobsWhite from '../../../assets/image/glints-tapjobs-logo-white.svg'; const Brand = ({ @@ -44,24 +36,12 @@ const Brand = ({ let srcAsset = ''; - if (asset === 'glints-black') { - srcAsset = GlintsBlack; - } else if (asset === 'glints-white') { + if (asset === 'glints-white') { srcAsset = GlintsWhite; - } else if (asset === 'glints-white-v2') { - srcAsset = GlintsWhiteV2; - } else if (asset === 'glints-taploker-black') { - srcAsset = GlintsTapLokerBlack; } else if (asset === 'glints-taploker-white') { srcAsset = GlintsTapLokerWhite; - } else if (asset === 'glints-taploker-white-v2') { - srcAsset = GlintsTapLokerWhiteV2; - } else if (asset === 'glints-tapjobs-black') { - srcAsset = GlintsTapJobsBlack; } else if (asset === 'glints-tapjobs-white') { srcAsset = GlintsTapJobsWhite; - } else if (asset === 'glints-tapjobs-white-v2') { - srcAsset = GlintsTapJobsWhiteV2; } else if (asset === 'glints') { srcAsset = Glints; } else if (asset === 'glints-tapjobs') { diff --git a/src/General/Brand/__snapshots__/Brand.test.tsx.snap b/src/General/Brand/__snapshots__/Brand.test.tsx.snap index ab011cf14..d26f26580 100644 --- a/src/General/Brand/__snapshots__/Brand.test.tsx.snap +++ b/src/General/Brand/__snapshots__/Brand.test.tsx.snap @@ -103,84 +103,6 @@ exports[` should render as expected 3`] = ` outline: none; } -
- -
-`; - -exports[` should render as expected 4`] = ` -.c0 { - position: relative; - display: -webkit-inline-box; - display: -webkit-inline-flex; - display: -ms-inline-flexbox; - display: inline-flex; - cursor: pointer; -} - -.c0:focus { - outline: none; -} - -.c0:focus > img { - outline: 5px auto -webkit-focus-ring-color; -} - -.c1 { - object-fit: contain; - width: 3em; - height: 3em; - outline: none; -} - -
- -
-`; - -exports[` should render as expected 5`] = ` -.c0 { - position: relative; - display: -webkit-inline-box; - display: -webkit-inline-flex; - display: -ms-inline-flexbox; - display: inline-flex; - cursor: pointer; -} - -.c0:focus { - outline: none; -} - -.c0:focus > img { - outline: 5px auto -webkit-focus-ring-color; -} - -.c1 { - object-fit: contain; - width: 3em; - height: 3em; - outline: none; -} -