Skip to content

Commit 1e0fd8a

Browse files
authored
[Docs] Updating Text page and Sass guidelines and upgrading to variable font (#5078)
* Refactoring the Sass page as config object to get page sections into sidenav * Updating text scaling example based on current theme * Added `.eui-textNumber` utility class to apply `tnum` font-feature setting
1 parent 166f6cc commit 1e0fd8a

33 files changed

+1797
-1341
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## [`master`](https://github.com/elastic/eui/tree/master)
22

3-
No public interface changes since `37.6.2`.
3+
- Added `.eui-textNumber` utility class to apply `tnum` font-feature setting ([#5078](https://github.com/elastic/eui/pull/5078))
44

55
## [`37.6.2`](https://github.com/elastic/eui/tree/v37.6.2)
66

src-docs/src/routes.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ const createMarkdownExample = (example, title) => {
312312
name: title,
313313
component: () => (
314314
<GuidePage title={title}>
315-
<GuideMarkdownFormat title={title} grow={false}>
315+
<GuideMarkdownFormat grow={false}>
316316
{example.default}
317317
</GuideMarkdownFormat>
318318
</GuidePage>
@@ -331,10 +331,7 @@ const navigation = [
331331
name: 'Colors',
332332
component: ColorGuidelines,
333333
},
334-
{
335-
name: 'Sass',
336-
component: SassGuidelines,
337-
},
334+
createExample(SassGuidelines, 'Sass'),
338335
createExample(WritingGuidelines, 'Writing'),
339336
],
340337
},

src-docs/src/theme_amsterdam_dark.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// sass-lint:disable no-url-domains, no-url-protocols
2-
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&family=Roboto+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Inter:slnt,wght@-10,300..700;0,300..700&family=Roboto+Mono:ital,wght@0,400..700;1,400..700&display=swap');
33

44
@import '../../src/theme_amsterdam_dark';
55
@import './components/index';

src-docs/src/theme_amsterdam_light.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// sass-lint:disable no-url-domains, no-url-protocols
2-
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&family=Roboto+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Inter:slnt,wght@-10,300..700;0,300..700&family=Roboto+Mono:ital,wght@0,400..700;1,400..700&display=swap');
33

44
@import '../../src/theme_amsterdam_light';
55
@import './components/index';

src-docs/src/views/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ $guideDemoHighlightColor: transparentize($euiColorPrimary, .9);
1313
@import './selectable/search';
1414
@import './spacer/spacer';
1515
@import './suggest/index';
16-
@import './text_scaling/text_scaling';
16+
@import './text/text_scaling';
1717
@import './tree_view/tree_view';

src-docs/src/views/guidelines/_get_sass_vars.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import lightColors from '!!sass-vars-to-js-loader!../../../../src/global_styling
22
import darkColors from '!!sass-vars-to-js-loader!../../../../src/themes/eui/eui_colors_dark.scss';
33
import lightAmsterdamColors from '!!sass-vars-to-js-loader!../../../../src/themes/eui-amsterdam/eui_amsterdam_colors_light.scss';
44
import darkAmsterdamColors from '!!sass-vars-to-js-loader!../../../../src/themes/eui-amsterdam/eui_amsterdam_colors_dark.scss';
5+
import { useContext } from 'react';
6+
import { ThemeContext } from '../../components';
57

6-
export const getSassVars = (theme) => {
8+
export const useSassVars = () => {
9+
const themeContext = useContext(ThemeContext);
710
let palette;
8-
switch (theme) {
11+
switch (themeContext.theme) {
912
case 'amsterdam-dark':
1013
palette = { ...darkColors, ...darkAmsterdamColors };
1114
break;

src-docs/src/views/guidelines/colors/_utilities.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import React, { useContext } from 'react';
2-
import { ThemeContext } from '../../../components';
1+
import React from 'react';
32
import { calculateContrast, rgbToHex } from '../../../../../src/services';
4-
import { getSassVars } from '../_get_sass_vars';
3+
import { useSassVars } from '../_get_sass_vars';
54

65
import { EuiBadge, EuiCopy, EuiFlexItem } from '../../../../../src/components';
76
import { EuiIcon } from '../../../../../src/components/icon';
@@ -94,8 +93,7 @@ export const ColorsContrastItem = ({
9493
background,
9594
minimumContrast,
9695
}) => {
97-
const themeContext = useContext(ThemeContext);
98-
const palette = getSassVars(themeContext.theme);
96+
const palette = useSassVars();
9997
const contrastRatings = getContrastRatings(background, foreground, palette);
10098

10199
if (!contrastRatings || contrastRatings.contrast < minimumContrast) {

src-docs/src/views/guidelines/colors/color_section.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import React, { useContext } from 'react';
2-
import { ThemeContext } from '../../../components';
3-
import { getSassVars } from '../_get_sass_vars';
1+
import React from 'react';
2+
import { useSassVars } from '../_get_sass_vars';
43

54
import {
65
EuiIcon,
@@ -26,8 +25,7 @@ export const ColorSection = ({
2625
showTextVariants,
2726
children,
2827
}) => {
29-
const theme = useContext(ThemeContext).theme;
30-
const palette = getSassVars(theme);
28+
const palette = useSassVars();
3129
const colorsForContrast = showTextVariants ? textVariants : allowedColors;
3230
const hex = getHexValueFromColorName(palette, color);
3331
const iconClass =

src-docs/src/views/guidelines/colors/core_palette.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { getSassVars } from '../_get_sass_vars';
2+
import { useSassVars } from '../_get_sass_vars';
33

44
import {
55
EuiFlexGroup,
@@ -21,8 +21,8 @@ export function scrollToSelector(selector, attempts = 5) {
2121
}
2222
}
2323

24-
export const CorePalette = ({ theme, colors }) => {
25-
const palette = getSassVars(theme);
24+
export const CorePalette = ({ colors }) => {
25+
const palette = useSassVars();
2626

2727
function renderPaletteColor(palette, color, index) {
2828
const hex = palette[color];

src-docs/src/views/guidelines/colors/vis_palette.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { getSassVars } from '../_get_sass_vars';
2+
import { useSassVars } from '../_get_sass_vars';
33

44
import {
55
EuiFlexGroup,
@@ -13,8 +13,8 @@ import {
1313
import { rgbToHex } from '../../../../../src/services';
1414

1515
export const VisPalette = ({ variant }) => {
16-
const visColors = getSassVars('light').euiPaletteColorBlind;
17-
const visColorKeys = Object.keys(getSassVars('light').euiPaletteColorBlind);
16+
const visColors = useSassVars().euiPaletteColorBlind;
17+
const visColorKeys = Object.keys(useSassVars().euiPaletteColorBlind);
1818

1919
function renderPaletteColor(palette, color, index, key) {
2020
const hex = key ? palette[color][key] : palette[color];

0 commit comments

Comments
 (0)