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

[EuiText] Add new blockquotes styles #6514

Merged
merged 6 commits into from
Jan 10, 2023
Merged

[EuiText] Add new blockquotes styles #6514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
666f2d1
[EuiText] Add new `blockquotes` styles
elizabetdev Jan 5, 2023
b37228d
Added CL
elizabetdev Jan 9, 2023
d5429de
Merge remote-tracking branch 'upstream/main' into euitext-new-blockqu…
elizabetdev Jan 9, 2023
eb221b6
Removed unnecessary styles
elizabetdev Jan 9, 2023
4daa4f2
Updated CL number
elizabetdev Jan 9, 2023
309ca4b
Removing unnecessary styles
elizabetdev Jan 9, 2023
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
36 changes: 0 additions & 36 deletions src/components/markdown_editor/__snapshots__/markdown_format.styles.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

exports[`euiMarkdownFormat text sizes m 1`] = `
"
.euiMarkdownFormat__blockquote {

padding-block: 0;
padding-inline: 1.1429rem;

border-inline-start-width: 0.285725rem;
margin-block-end: 1.1429rem;
}

.euiCheckbox .euiCheckbox__input ~ .euiCheckbox__label { // Extra specificity necessary to override default checkbox CSS
font-size: 1.1429rem;
padding-inline-start: 1.7143rem;
Expand Down Expand Up @@ -39,15 +30,6 @@ exports[`euiMarkdownFormat text sizes m 1`] = `

exports[`euiMarkdownFormat text sizes relative 1`] = `
"
.euiMarkdownFormat__blockquote {

padding-block: 0;
padding-inline: 1em;

border-inline-start-width: 0.25em;
margin-block-end: 1em;
}

.euiCheckbox .euiCheckbox__input ~ .euiCheckbox__label { // Extra specificity necessary to override default checkbox CSS
font-size: 1em;
padding-inline-start: 1.5000em;
Expand Down Expand Up @@ -76,15 +58,6 @@ exports[`euiMarkdownFormat text sizes relative 1`] = `

exports[`euiMarkdownFormat text sizes s 1`] = `
"
.euiMarkdownFormat__blockquote {

padding-block: 0;
padding-inline: 1.0000rem;

border-inline-start-width: 0.25rem;
margin-block-end: 1.0000rem;
}

.euiCheckbox .euiCheckbox__input ~ .euiCheckbox__label { // Extra specificity necessary to override default checkbox CSS
font-size: 1.0000rem;
padding-inline-start: 1.4286rem;
Expand Down Expand Up @@ -113,15 +86,6 @@ exports[`euiMarkdownFormat text sizes s 1`] = `

exports[`euiMarkdownFormat text sizes xs 1`] = `
"
.euiMarkdownFormat__blockquote {

padding-block: 0;
padding-inline: 0.8571rem;

border-inline-start-width: 0.214275rem;
margin-block-end: 0.8571rem;
}

.euiCheckbox .euiCheckbox__input ~ .euiCheckbox__label { // Extra specificity necessary to override default checkbox CSS
font-size: 0.8571rem;
padding-inline-start: 1.1429rem;
Expand Down
4 changes: 0 additions & 4 deletions src/components/markdown_editor/_markdown_format.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@
}
}

.euiMarkdownFormat__blockquote {
border-left-style: solid;
}

.euiCheckbox {
// stylelint-disable-next-line declaration-no-important
margin-bottom: 0 !important;
Expand Down
8 changes: 0 additions & 8 deletions src/components/markdown_editor/markdown_format.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { css } from '@emotion/react';
import { UseEuiTheme } from '../../services';
import {
logicalCSS,
logicalShorthandCSS,
euiFontSize,
_FontScaleOptions,
mathWithUnits,
Expand All @@ -29,17 +28,10 @@ const euiScaleMarkdownFormatText = (
const lineHeightSize = measurement === 'em' ? `${lineHeight}em` : lineHeight;

// Custom scales
const blockQuoteBorderWidth = mathWithUnits(fontSize, (x) => x / 4);
const tablePaddingVertical = mathWithUnits(fontSize, (x) => x / 4);
const tablePaddingHorizontal = mathWithUnits(fontSize, (x) => x / 2);

return `
.euiMarkdownFormat__blockquote {
${logicalShorthandCSS('padding', `0 ${fontSize}`)}
${logicalCSS('border-left-width', blockQuoteBorderWidth)}
${logicalCSS('margin-bottom', fontSize)}
}

.euiCheckbox .euiCheckbox__input ~ .euiCheckbox__label { // Extra specificity necessary to override default checkbox CSS
font-size: ${fontSize};
${logicalCSS('padding-left', lineHeightSize)}
Expand Down
28 changes: 24 additions & 4 deletions src/components/text/__snapshots__/text.styles.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ exports[`euiTextStyles sizes m 1`] = `

blockquote {
font-size: 1.1429rem;
padding: 1.7143rem;

padding-block: 0;
padding-inline: 1.1429rem;

border-inline-start-width: 0.285725rem;
margin-block-end: 1.1429rem;
}

dd + dt {
Expand Down Expand Up @@ -238,7 +243,12 @@ exports[`euiTextStyles sizes relative 1`] = `

blockquote {
font-size: 1em;
padding: 1.5000em;

padding-block: 0;
padding-inline: 1em;

border-inline-start-width: 0.25em;
margin-block-end: 1em;
}

dd + dt {
Expand Down Expand Up @@ -366,7 +376,12 @@ exports[`euiTextStyles sizes s 1`] = `

blockquote {
font-size: 1.0000rem;
padding: 1.4286rem;

padding-block: 0;
padding-inline: 1.0000rem;

border-inline-start-width: 0.25rem;
margin-block-end: 1.0000rem;
}

dd + dt {
Expand Down Expand Up @@ -494,7 +509,12 @@ exports[`euiTextStyles sizes xs 1`] = `

blockquote {
font-size: 0.8571rem;
padding: 1.1429rem;

padding-block: 0;
padding-inline: 0.8571rem;

border-inline-start-width: 0.214275rem;
margin-block-end: 0.8571rem;
}

dd + dt {
Expand Down
45 changes: 15 additions & 30 deletions src/components/text/text.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { css } from '@emotion/react';
import { UseEuiTheme } from '../../services';
import {
logicalCSS,
logicalShorthandCSS,
logicalTextAlignCSS,
euiFontSize,
euiBackgroundColor,
Expand Down Expand Up @@ -61,6 +62,7 @@ const euiScaleText = (
const marginSize = euiTheme.size[customScale];
const headingMarginTop = mathWithUnits(marginSize, (x) => x * 2);
const headingMarginBottom = marginSize;
const blockQuoteBorderWidth = mathWithUnits(fontSize, (x) => x / 4);
elizabetdev marked this conversation as resolved.
Show resolved Hide resolved

return `
font-size: ${fontSize};
Expand Down Expand Up @@ -156,7 +158,9 @@ const euiScaleText = (

blockquote {
font-size: ${fontSize};
padding: ${lineHeightSize};
${logicalShorthandCSS('padding', `0 ${fontSize}`)}
${logicalCSS('border-left-width', blockQuoteBorderWidth)}
${logicalCSS('margin-bottom', fontSize)}
}

dd + dt {
Expand Down Expand Up @@ -244,36 +248,17 @@ export const euiTextStyles = (euiThemeContext: UseEuiTheme) => {
list-style: decimal;
}

blockquote {
border-inline-start-color: ${euiTheme.border.color};
border-inline-start-style: solid;
}

// the blockquote color in euiMarkdownFormat works differently
// it inherits the color from the parent element
// for this reason, we just apply the subdued text color for
// blockquotes that are not in euiMarkdownFormat
blockquote:not(.euiMarkdownFormat__blockquote) {
position: relative;
${logicalTextAlignCSS('center')}
${logicalCSS('margin-horizontal', 'auto')}
font-family: ${euiTheme.font.familySerif};
font-style: italic;
letter-spacing: normal;

p:last-child {
${logicalCSS('margin-bottom', '0')}
}

&:before,
&:after {
position: absolute;
content: '';
${logicalCSS('height', euiTheme.border.width.thick)}
${logicalCSS('width', '50%')}
${logicalCSS('left', '25%')}
${logicalCSS('right', '25%')}
background: ${euiTheme.colors.darkShade};
}

&:before {
${logicalCSS('top', '0')}
}

&:after {
${logicalCSS('bottom', '0')}
}
color: ${euiTheme.colors.subduedText};
}

h1 {
Expand Down
1 change: 1 addition & 0 deletions upcoming_changelogs/6514.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Updated `EuiText.blockquote` styles to match the `EuiMarkdownFormat.blockquote` styles