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(Plex): add plex package to @carbon/styles #9350

Merged
merged 4 commits into from
Jul 29, 2021
Merged

feat(Plex): add plex package to @carbon/styles #9350

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f904db8
feat(Plex): add plex package to @carbon/styles
tw15egan Jul 28, 2021
88bde32
feat(Plex): only emit if css--font-face is true
tw15egan Jul 28, 2021
36161a4
test(snapshot): update snapshots
tw15egan Jul 28, 2021
5563200
Merge branch 'main' into add-plex-dependecy
sstrubberg Jul 29, 2021
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
9 changes: 0 additions & 9 deletions packages/carbon-react/.storybook/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,10 @@ $feature-flags: (
enable-v11-release: true,
);

@use "~@ibm/plex/default" as sans;
@use "~@ibm/plex/mono";
@use "~@ibm/plex/arabic";

@use '../index.scss' as styles;
@use '../scss/components/button';
@use '../scss/components/tag';

// For now, including all weights for testing
@include arabic.all;
@include sans.all;
@include mono.all;

:root {
@include styles.theme(styles.$white, button.$white, tag.$white);
}
Expand Down
5 changes: 3 additions & 2 deletions packages/carbon-react/.storybook/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ export default create({
appBorderRadius: 0,

// Typography
fontBase: '"IBM Plex Sans", sans-serif',
fontCode: '"IBM Plex Mono", monospace',
fontBase: "'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif",
fontCode:
"'IBM Plex Mono', Menlo, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', Courier, monospace",

// Text colors
textColor: text01,
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-react/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
//

@forward '@carbon/styles' with (
$css--font-face: false,
$css--default-type: false,
$css--font-face: true,
$css--plex-arabic: true,
);
1 change: 0 additions & 1 deletion packages/carbon-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"@carbon/icons-react": "^10.36.0",
"@carbon/styles": "^0.11.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"@ibm/plex": "6.0.0-next.6",
"carbon-components-react": "^7.40.0"
},
"devDependencies": {
Expand Down
8 changes: 1 addition & 7 deletions packages/carbon-react/src/components/Grid/Grid.stories.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
@import '~carbon-components/scss/globals/scss/colors';
@import '~carbon-components/scss/globals/scss/typography';

p {
@include type-style('body-short-02');

margin-top: $spacing-05;
}

// Grid modes
.bx--css-grid {
background-color: $blue-20;
Expand All @@ -18,7 +12,7 @@ p {
@include type-style('code-02');
}

p:first-of-type:not(.bx--progress-label) {
.bx--css-grid p:first-of-type {
//messing up progress indicator stories
margin-top: 0;
}
Expand Down
1 change: 1 addition & 0 deletions packages/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

@forward 'scss/config';
@forward 'scss/colors' hide $white;
@forward 'scss/font-face';
@forward 'scss/grid';
@forward 'scss/motion';
@forward 'scss/type';
Expand Down
3 changes: 2 additions & 1 deletion packages/styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"@carbon/layout": "^10.28.0",
"@carbon/motion": "^10.21.0",
"@carbon/themes": "^10.39.0",
"@carbon/type": "^10.32.0"
"@carbon/type": "^10.32.0",
"@ibm/plex": "6.0.0-next.6"
},
"devDependencies": {
"@carbon/test-utils": "^10.16.0",
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/__tests__/__snapshots__/config-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ exports[`@carbon/styles/scss/config Public API 1`] = `
Object {
"css--default-type": true,
"css--font-face": true,
"css--plex-arabic": false,
"css--reset": true,
"prefix": "bx",
}
Expand Down
6 changes: 6 additions & 0 deletions packages/styles/scss/_config.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ $css--reset: true !default;
/// @type Bool
/// @group config
$css--default-type: true !default;

/// If true, include IBM Plex Arabic type
/// @access public
/// @type Bool
/// @group config
$css--plex-arabic: false !default;
13 changes: 13 additions & 0 deletions packages/styles/scss/_font-face.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@use 'config';
@use '@ibm/plex/default' as sans;
@use '@ibm/plex/mono' as mono;
@use '@ibm/plex/arabic' as arabic;

@if config.$css--font-face == true {
@include sans.all;
@include mono.all;

@if config.$css--plex-arabic == true {
@include arabic.all;
}
} ;
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,6 @@ __metadata:
"@carbon/styles": ^0.11.0-rc.0
"@carbon/telemetry": 0.0.0-alpha.6
"@carbon/themes": ^10.39.0
"@ibm/plex": 6.0.0-next.6
"@rollup/plugin-babel": ^5.3.0
"@rollup/plugin-commonjs": ^18.0.0
"@rollup/plugin-node-resolve": ^11.2.1
Expand Down Expand Up @@ -2077,6 +2076,7 @@ __metadata:
"@carbon/test-utils": ^10.16.0
"@carbon/themes": ^10.39.0
"@carbon/type": ^10.32.0
"@ibm/plex": 6.0.0-next.6
css: ^3.0.0
languageName: unknown
linkType: soft
Expand Down