Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDS-1724-hero-arrow #1211

Merged
merged 5 commits into from
Jan 31, 2024
Merged

HDS-1724-hero-arrow #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
920c5b1
((no branch, rebasing HDS-1724) (HDS-1724) add arrow icon to Hero
mrTuomoK Jan 15, 2024
fbd0396
((no branch, rebasing HDS-1724) (HDS-1724) update changelog
mrTuomoK Jan 15, 2024
0833668
(HDS-1724) remove unused css-variables
mrTuomoK Jan 17, 2024
d86b8d5
(HDS-1724) fix DummyContent -> shorter, h1 -> h2
mrTuomoK Jan 17, 2024
19205bd
(HDS-1724) update reference images
mrTuomoK Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

#### Changed

Changes that are not related to specific components
- [Component] What has been changed
- [Hero] Add support for showing an arrow-icon in the bottom left corner with theming support

#### Fixed

Expand All @@ -40,6 +39,7 @@ Changes that are not related to specific components

Changes that are not related to specific components
- [Component] What has been changed
- [Hero] Add support for showing an arrow-icon in the bottom left corner with theming support

#### Fixed

Expand All @@ -53,7 +53,7 @@ Changes that are not related to specific components

#### Added

- [Component] What is added?
- [Hero] Added examples and code of the arrow-icon

#### Changed

Expand Down
41 changes: 35 additions & 6 deletions packages/core/src/components/hero/hero.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,51 @@
.hds-hero {
--arrow-icon-color: var(--color);
--arrow-icon-size: 128px;
--background-color: var(--color-white);
--color: var(--color-black-90);
--image-position: bottom right;
--koros-color: var(--color-white);
--koros-height: 85px;
--diagonal-koros-position: 45%;
--horizontal-padding-small: var(--spacing-layout-2-xs);
--horizontal-padding-medium: var(--spacing-layout-xs);
--horizontal-padding-large: var(--spacing-layout-xs);
--horizontal-padding-medium: var(--spacing-layout-xs);
--horizontal-padding-small: var(--spacing-layout-2-xs);
--horizontal-padding-x-large: var(--spacing-layout-xs);
--image-position: bottom right;
--koros-color: var(--color-white);
--koros-height: 85px;
--padding-horizontal: var(--horizontal-padding-small);
--padding-vertical: var(--spacing-xl);
--z-index: 1;

background-color: var(--background-color);
color: var(--color);
display: flex;
flex-direction: column;
position: relative;
z-index: 1;
z-index: var(--z-index);
}

.hds-hero__arrow-icon-container {
display: flex;
height: 0;
margin: 0 auto;
max-width: var(--container-width-xl);
overflow: visible;
position: relative;
width: 100%;
z-index: calc(var(--z-index) + 1);
}

.hds-hero__arrow-icon-spacing-after {
margin-bottom: calc(var(--arrow-icon-size) / 2);
}

.hds-hero--arrow-icon {
--icon-size: var(--arrow-icon-size) !important;

color: var(--arrow-icon-color);

/* the following is magic to calculate a proper margins (icon has empty space in it that is taken into account) */
margin-left: calc(var(--padding-horizontal) - (var(--arrow-icon-size) / 4));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The icon svg has soooooo much empty spacing! 😲

Could the icon be set to the exact size by wrapping it to an element which could delete extra space with negative margins?

Copy link
Contributor Author

@mrTuomoK mrTuomoK Jan 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe 🤷 It's just that the icons aren't spaced similarly to each other so it might be a hell of a job to do 😆 this 25% (or / 4) is just what works with the arrow down :D

margin-top: calc(0px - var(--arrow-icon-size) / (128 / 20) - var(--spacing-layout-xs));
}

.hds-hero__title {
Expand Down Expand Up @@ -210,6 +238,7 @@
.hds-hero {
--padding-horizontal: var(--horizontal-padding-medium);
--padding-vertical: var(--spacing-layout-m);
--arrow-icon-size: 164px;
}

.hds-hero--with-background__background,
Expand Down
64 changes: 64 additions & 0 deletions packages/core/src/components/hero/hero.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import './hero.css';
import '../../icons/icon.css';

export default {
title: 'Components/Hero',
};

const arrowIcon = `
<div class="hds-hero__arrow-icon-container">
<span class="hds-icon hds-hero--arrow-icon hds-icon--arrow-down" />
</div>
`;

const button = `
<button type="button" class="hds-button hds-button--secondary hds-button--theme-black" role="link">
<span class="hds-button__label">Button</span>
Expand Down Expand Up @@ -68,6 +75,26 @@ export const ImageBottom = () => `

ImageBottom.storyName = 'Bottom image';

export const ImageBottomWithArrow = () => `
<div class="hds-hero hds-hero--image-bottom hds-hero__arrow-icon-spacing-after" style="--koros-height:15px;">
<div class="hds-hero__container">
<div class="hds-hero__content hds-hero__content--single-column">
${card}
</div>
</div>
<div class="hds-hero__koros-and-image-container">
<div class="hds-hero__koros-container">
${getKoros()}
</div>
<div class="hds-hero__image-below-koros">
${image}
</div>
</div>
${arrowIcon}
</div>`;

ImageBottomWithArrow.storyName = 'Bottom image with arrow icon';

export const DiagonalKoros = () => `
<style type="text/css">
.custom-theme {
Expand Down Expand Up @@ -108,6 +135,7 @@ export const DiagonalKoros = () => `
${image}
</div>
</div>
${arrowIcon}
</div>`;
DiagonalKoros.storyName = 'Diagonal koros';

Expand Down Expand Up @@ -259,3 +287,39 @@ export const BackgroundImage = () => `
</div>
</div>`;
BackgroundImage.storyName = 'Background image';

export const BackgroundImageWithArrow = () => `
<style type="text/css">
.container {
background: #ccc;
padding: 10px 10px 200px;
}
.custom-theme {
content: "";
--background-color: #fff;
--color: #000;
--bottom-koros-color: #ccc;
--top-koros-color: var(--background-color);
--koros-height: 15px;
--arrow-icon-color: var(--color-brick);
}
</style>
<div class="container">
<div class="hds-hero custom-theme hds-hero--background-image hds-hero__arrow-icon-spacing-after">
<div class="hds-hero--with-background__container">
<div class="hds-hero--with-background__background">
<div class="hds-hero--background-image__koros">
${getKoros(true)}
</div>
${image}
</div>
<div class="hds-hero__content">
${card}
<div class="hds-hero--with-background__empty-column">
</div>
</div>
</div>
${arrowIcon}
</div>
</div>`;
BackgroundImageWithArrow.storyName = 'Background image with arrow icon';
Binary file added ...t/.loki/reference/chrome_iphone7_Components_Hero_All_Heroes_With_Arrow_Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ct/.loki/reference/chrome_laptop_Components_Hero_All_Heroes_With_Arrow_Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/react/src/components/hero/Hero.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,17 @@
.korosAligner {
composes: hds-hero--diagonal-koros__koros-aligner from 'hds-core/lib/components/hero/hero.css';
}

/* arrow icon specific styles */

.arrowIconContainer {
composes: hds-hero__arrow-icon-container from 'hds-core/lib/components/hero/hero.css';
}

.arrowIcon {
composes: hds-hero--arrow-icon from 'hds-core/lib/components/hero/hero.css';
}

.arrowIconSpacingAfter {
composes: hds-hero__arrow-icon-spacing-after from 'hds-core/lib/components/hero/hero.css';
}
46 changes: 45 additions & 1 deletion packages/react/src/components/hero/Hero.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export default {
controls: { expanded: true },
layout: 'fullscreen',
},
args: {},
};

type DefaultContentProps = {
Expand Down Expand Up @@ -295,6 +294,7 @@ WithoutImageKorosOverlay.argTypes = {
'--background-color': '#000',
'--color': '#fff',
'--koros-color': '#000',
'--arrow-icon-color': 'var(--color-brick)',
}),
...createKorosArg({ flipVertical: true }),
...createVariantArg('noImage'),
Expand Down Expand Up @@ -667,3 +667,47 @@ AllHeroes.argTypes = {
...getDisabledControl('centeredContent'),
...getDisabledControl('variant'),
};

export const AllHeroesWithArrowIcon = () => {
const DummyContent = () => {
return (
<div style={{ minHeight: '200px', padding: '20px' }}>
<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec euismod, quam sed aliquet faucibus, nisl risus
condimentum nisl, quis aliquam ligula mauris nec enim. Donec euismod, quam sed aliquet faucibus, nisl risus
condimentum nisl, quis aliquam ligula mauris nec enim. Donec euismod, quam sed aliquet faucibus, nisl risus
condimentum nisl, quis aliquam ligula mauris nec enim.
</p>
</div>
);
};

return (
<div style={{ display: 'flex', flexDirection: 'column', backgroundColor: 'beige' }}>
<ImageLeft {...{ ...getDefaultArgs('imageLeft'), showArrowIcon: true }} />
<DummyContent />
<BackgroundImage
{...{ ...getDefaultArgs('backgroundImage'), theme: { '--koros-color': 'beige' }, showArrowIcon: true }}
/>
<DummyContent />
<ImageRight {...{ ...getDefaultArgs('imageRight'), showArrowIcon: true }} />
<DummyContent />
<WithoutImage {...{ ...getDefaultArgs('noImage', noImageOptions[1]), showArrowIcon: true }} />
<DummyContent />
<DiagonalKoros {...{ ...getDefaultArgs('diagonalKoros'), showArrowIcon: true }} />
<DummyContent />
<WithoutImageKorosOverlay
{...{
...getDefaultArgs('noImage', noImageOptions[2]),
showArrowIcon: true,
}}
/>
<DummyContent />
<ImageBottom {...{ ...getDefaultArgs('imageBottom'), showArrowIcon: true }} />
<DummyContent />
<WithoutImageAndKoros {...{ ...getDefaultArgs('noImage', noImageOptions[3]), showArrowIcon: true }} />
<DummyContent />
</div>
);
};
Loading
Loading