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

[Emotion] Convert EuiLink #5856

Merged
merged 18 commits into from
May 9, 2022
Merged

[Emotion] Convert EuiLink #5856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
80d95bf
initial attempt to convert euiLink to emotion
MichaelMarcialis Apr 29, 2022
34bccf4
split color helper into separate style blocks
MichaelMarcialis Apr 29, 2022
d098936
fix broken disabled styles
MichaelMarcialis Apr 29, 2022
78cf4c6
clean up
MichaelMarcialis Apr 29, 2022
d58464c
update tests and snapshots
MichaelMarcialis Apr 29, 2022
ba662d8
remove styling vars
MichaelMarcialis Apr 29, 2022
9193db8
Merge branch 'main' of github.com:elastic/eui into 5685/euiLinkConver…
MichaelMarcialis Apr 29, 2022
6a4aad3
add changelog entry
MichaelMarcialis Apr 29, 2022
d85e897
one more snapshot update
MichaelMarcialis May 2, 2022
6be8eea
remove unused arg and import; fix snapshot
thompsongl May 4, 2022
8020a08
Merge branch 'main' of github.com:elastic/eui into 5685/euiLinkConver…
MichaelMarcialis May 5, 2022
0a71e48
apply elizabet’s suggestions
MichaelMarcialis May 6, 2022
b63f956
update snapshots
MichaelMarcialis May 6, 2022
258898f
apply caroline's suggestions
MichaelMarcialis May 6, 2022
4cfbb9b
Merge branch 'main' of github.com:elastic/eui into 5685/euiLinkConver…
MichaelMarcialis May 6, 2022
9c094c5
update snapshots
MichaelMarcialis May 6, 2022
2ebd0f5
add children comment
MichaelMarcialis May 6, 2022
69db45f
Merge remote-tracking branch 'upstream/main' into 5685/euiLinkConversion
miukimiu May 9, 2022
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
10 changes: 0 additions & 10 deletions src-docs/src/views/theme/_json/eui_theme_dark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,6 @@
},
"euiKeyPadMenuSize": "96px",
"euiKeyPadMenuMarginSize": "4px",
"euiLinkColors": {
"subdued": "#7a7f89",
"primary": "#36a2ef",
"success": "#7dded8",
"accent": "#f68fbe",
"warning": "#f3d371",
"danger": "#f86b63",
"text": "#dfe5ef",
"ghost": "#ffffff"
},
"euiListGroupItemHoverBackground": "rgba(52, 55, 65, 0.25)",
"euiListGroupItemHoverBackgroundGhost": "rgba(255, 255, 255, 0.09999999999999998)",
"euiListGroupGutterTypes": {
Expand Down
10 changes: 0 additions & 10 deletions src-docs/src/views/theme/_json/eui_theme_light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,6 @@
},
"euiKeyPadMenuSize": "96px",
"euiKeyPadMenuMarginSize": "4px",
"euiLinkColors": {
"subdued": "#69707d",
"primary": "#0071c2",
"success": "#007e77",
"accent": "#c4407c",
"warning": "#8a6a0a",
"danger": "#bd271e",
"text": "#343741",
"ghost": "#ffffff"
},
"euiListGroupItemHoverBackground": "rgba(211, 218, 230, 0.25)",
"euiListGroupItemHoverBackgroundGhost": "rgba(255, 255, 255, 0.09999999999999998)",
"euiListGroupGutterTypes": {
Expand Down
56 changes: 28 additions & 28 deletions src/components/breadcrumbs/__snapshots__/breadcrumbs.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports[`EuiBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -41,7 +41,7 @@ exports[`EuiBreadcrumbs is rendered 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand All @@ -57,7 +57,7 @@ exports[`EuiBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb"
>
<button
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -67,7 +67,7 @@ exports[`EuiBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb euiBreadcrumb--truncate"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down Expand Up @@ -102,7 +102,7 @@ exports[`EuiBreadcrumbs is rendered with final item as link 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -130,7 +130,7 @@ exports[`EuiBreadcrumbs is rendered with final item as link 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand All @@ -146,7 +146,7 @@ exports[`EuiBreadcrumbs is rendered with final item as link 1`] = `
class="euiBreadcrumb euiBreadcrumb--truncate"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand All @@ -168,7 +168,7 @@ exports[`EuiBreadcrumbs is rendered with final item as link 1`] = `
>
<a
aria-current="page"
class="euiLink euiLink--text euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-qzrsgm-euiLink-text"
href="#"
rel="noreferrer"
>
Expand All @@ -191,7 +191,7 @@ exports[`EuiBreadcrumbs props max doesn't break when max exceeds the number of b
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -241,7 +241,7 @@ exports[`EuiBreadcrumbs props max doesn't break when max exceeds the number of b
>
<button
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -252,7 +252,7 @@ exports[`EuiBreadcrumbs props max doesn't break when max exceeds the number of b
>
<a
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down Expand Up @@ -293,7 +293,7 @@ exports[`EuiBreadcrumbs props max renders 1 item 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand Down Expand Up @@ -331,7 +331,7 @@ exports[`EuiBreadcrumbs props max renders all items with null 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -381,7 +381,7 @@ exports[`EuiBreadcrumbs props max renders all items with null 1`] = `
>
<button
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -392,7 +392,7 @@ exports[`EuiBreadcrumbs props max renders all items with null 1`] = `
>
<a
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down Expand Up @@ -426,7 +426,7 @@ exports[`EuiBreadcrumbs props responsive is rendered 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -454,7 +454,7 @@ exports[`EuiBreadcrumbs props responsive is rendered 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand All @@ -471,7 +471,7 @@ exports[`EuiBreadcrumbs props responsive is rendered 1`] = `
>
<button
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -481,7 +481,7 @@ exports[`EuiBreadcrumbs props responsive is rendered 1`] = `
class="euiBreadcrumb euiBreadcrumb--truncate"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down Expand Up @@ -515,7 +515,7 @@ exports[`EuiBreadcrumbs props responsive is rendered as false 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -543,7 +543,7 @@ exports[`EuiBreadcrumbs props responsive is rendered as false 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand All @@ -560,7 +560,7 @@ exports[`EuiBreadcrumbs props responsive is rendered as false 1`] = `
>
<button
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -570,7 +570,7 @@ exports[`EuiBreadcrumbs props responsive is rendered as false 1`] = `
class="euiBreadcrumb euiBreadcrumb--truncate"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down Expand Up @@ -611,7 +611,7 @@ exports[`EuiBreadcrumbs props responsive is rendered with custom breakpoints 1`]
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand Down Expand Up @@ -649,7 +649,7 @@ exports[`EuiBreadcrumbs props truncate as false is rendered 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--primary euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-102pf9n-euiLink-primary"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand Down Expand Up @@ -677,7 +677,7 @@ exports[`EuiBreadcrumbs props truncate as false is rendered 1`] = `
>
<button
aria-label="See collapsed breadcrumbs"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
title="See collapsed breadcrumbs"
type="button"
>
Expand All @@ -694,7 +694,7 @@ exports[`EuiBreadcrumbs props truncate as false is rendered 1`] = `
>
<button
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -705,7 +705,7 @@ exports[`EuiBreadcrumbs props truncate as false is rendered 1`] = `
>
<a
aria-current="false"
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
title="Boa constrictor has an error"
Expand Down
5 changes: 1 addition & 4 deletions src/components/breadcrumbs/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '../link/variables';

/**
* 1. Add vertical space between breadcrumbs,
* but make sure the whole breadcrumb set doesn't add space below itself
Expand Down Expand Up @@ -44,8 +42,7 @@

.euiBreadcrumbs__inPopover .euiBreadcrumb--last .euiBreadcrumb__content {
font-weight: $euiFontWeightRegular;
// Match to subdued EuiLink color
color: map-get($euiLinkColors, 'subdued');
color: $euiTextSubduedColor;
}

.euiBreadcrumbs--truncate {
Expand Down
6 changes: 3 additions & 3 deletions src/components/header/header_breadcrumbs/__snapshots__/header_breadcrumbs.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports[`EuiHeaderBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content customClass"
class="euiLink euiBreadcrumb__content customClass css-7rgcqt-euiLink-subdued"
data-test-subj="breadcrumbsAnimals"
href="#"
rel="noreferrer"
Expand All @@ -25,7 +25,7 @@ exports[`EuiHeaderBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb"
>
<button
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
type="button"
>
Reptiles
Expand All @@ -35,7 +35,7 @@ exports[`EuiHeaderBreadcrumbs is rendered 1`] = `
class="euiBreadcrumb"
>
<a
class="euiLink euiLink--subdued euiBreadcrumb__content"
class="euiLink euiBreadcrumb__content css-7rgcqt-euiLink-subdued"
href="#"
rel="noreferrer"
>
Expand Down
1 change: 0 additions & 1 deletion src/components/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
@import 'icon/index';
@import 'image/index';
@import 'key_pad_menu/index';
@import 'link/index';
@import 'list_group/index';
@import 'markdown_editor/index';
@import 'modal/index';
Expand Down
Loading