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

feat(link): update EU inverted link color - FRONT-4629 #3638

Merged
merged 5 commits into from
Sep 25, 2024
Merged

feat(link): update EU inverted link color - FRONT-4629 #3638

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
c16ae3a
update inverted link color
emeryro Sep 23, 2024
b9bce13
add standalone inverted
emeryro Sep 24, 2024
3451250
Merge branch 'v4-dev' into FRONT-4629-eu-link
planctus Sep 24, 2024
5458c92
Merge branch 'v4-dev' into FRONT-4629-eu-link
emeryro Sep 25, 2024
0c93404
font weight
emeryro Sep 25, 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
25 changes: 23 additions & 2 deletions src/implementations/twig/components/link/link.story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ import dataInverted from '@ecl/specs-component-link/demo/data--inverted';
import link from './link.html.twig';
import notes from './README.md';

const dataInvertedStandalone = {
...dataInverted,
link: { ...dataInverted.link, type: 'standalone' },
};

// Create 'none' option.
iconsAll.unshift('none');

Expand Down Expand Up @@ -237,11 +242,27 @@ Secondary.parameters = { notes: { markdown: notes, json: dataSecondary } };
export const Inverted = (_, { loaded: { component } }) => component;

Inverted.render = async (args) => {
const renderedLinkSecondary = await link(prepareData(dataInverted, args));
return renderedLinkSecondary;
const renderedLinkInverted = await link(prepareData(dataInverted, args));
return renderedLinkInverted;
};
Inverted.storyName = 'inverted';
Inverted.decorators = [withNotes, withCode, withParagraph, withInverted];
Inverted.args = getArgs(dataInverted);
Inverted.argTypes = getArgTypes();
Inverted.parameters = { notes: { markdown: notes, json: dataInverted } };

export const InvertedStandalone = (_, { loaded: { component } }) => component;

InvertedStandalone.render = async (args) => {
const renderedLinkInvertedStandalone = await link(
prepareData(dataInvertedStandalone, args),
);
return renderedLinkInvertedStandalone;
};
InvertedStandalone.storyName = 'inverted standalone';
InvertedStandalone.decorators = [withNotes, withCode, withInverted];
InvertedStandalone.args = getArgs(dataInvertedStandalone);
InvertedStandalone.argTypes = getArgTypes();
InvertedStandalone.parameters = {
notes: { markdown: notes, json: dataInvertedStandalone },
};
1 change: 0 additions & 1 deletion src/implementations/vanilla/components/gallery/gallery.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,6 @@ $_description-height-desktop: 108px;
border-right: 1px solid map.get($theme, 'color', 'white');
display: inline-flex;
font: var(--f-m);
font-weight: map.get($gallery, 'counter-font-weight');
margin: 0;
padding: 0 var(--s-xs);
white-space: pre-wrap;
Expand Down
1 change: 0 additions & 1 deletion src/themes/ec/variables/_gallery.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

$gallery: (
actions-margin: var(--s-s),
counter-font-weight: map.get($font-weight, 'regular'),
detail-color: map.get($color, 'white'),
description-background: var(--c-ov-l),
gallery-info-color: var(--c-d),
Expand Down
1 change: 0 additions & 1 deletion src/themes/eu/variables/_gallery.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

$gallery: (
actions-margin: var(--s-m),
counter-font-weight: map.get($font-weight, 'bold'),
description-background: color-mix(in srgb, var(--c-d) 65%, transparent),
detail-color: map.get($color, 'white'),
gallery-info-color: var(--c-d-140),
Expand Down
6 changes: 3 additions & 3 deletions src/themes/eu/variables/_link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ $link: (
outline-radius: 2px,
standalone-line-height: map.get($line-height-ui, 'xs'),
inverted: (
color: var(--c-a),
color: map.get($color, 'white'),
color-hover: var(--c-a-30),
color-visited: var(--c-a),
color-visited: map.get($color, 'white'),
color-active: map.get($color, 'white'),
outline-color: var(--c-a),
outline-color: map.get($color, 'white'),
),
button: (
font: var(--f-ui-m),
Expand Down
Loading