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

Revert "feat(@ibm/plex): Update plex dependency to use new packages" #17211

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Revert "feat(@ibm/plex): Update plex dependency to use new packages" #17211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed .yarn/cache/@ibm-plex-mono-npm-0.0.3-alpha.0-2becc6711b-fbdfb70762.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@ibm-plex-npm-6.0.0-next.6-9aee23c93c-1a81475964.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-arabic-npm-0.0.3-alpha.0-5a162c0760-c390dd9788.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-devanagari-npm-0.0.3-alpha.0-7f13ef378d-ef3cd96710.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-hebrew-npm-0.0.3-alpha.0-e21223915a-e67ed6e081.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-npm-0.0.3-alpha.0-eadb18db06-5b0b0521db.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-thai-looped-npm-0.0.3-alpha.0-11cf24af96-11272b1353.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-sans-thai-npm-0.0.3-alpha.0-9228f6228a-baac49d77d.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@ibm-plex-serif-npm-0.0.3-alpha.0-ef5dcb26c6-462dcf3393.zip
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,11 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/nandininarayanofficial"><img src="https://avatars.githubusercontent.com/u/165769075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nandininarayanofficial</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=nandininarayanofficial" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/digiacomo-a"><img src="https://avatars.githubusercontent.com/u/117646602?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea DG</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=digiacomo-a" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/lluisrojass"><img src="https://avatars.githubusercontent.com/u/15043356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luis</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lluisrojass" title="Code">💻</a></td>

<td align="center"><a href="https://github.com/lharrison13"><img src="https://avatars.githubusercontent.com/u/172074450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luke Harrison</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lharrison13" title="Code">💻</a></td>

<td align="center"><a href="https://github.com/tekno0ryder"><img src="https://avatars.githubusercontent.com/u/8721803?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ahmed Alsinan</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=tekno0ryder" title="Code">💻</a></td>

</tr>
</table>

Expand Down
9 changes: 1 addition & 8 deletions packages/styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,7 @@
"@carbon/motion": "^11.20.0",
"@carbon/themes": "^11.38.0",
"@carbon/type": "^11.29.0",
"@ibm/plex-mono": "0.0.3-alpha.0",
"@ibm/plex-sans": "0.0.3-alpha.0",
"@ibm/plex-sans-arabic": "0.0.3-alpha.0",
"@ibm/plex-sans-devanagari": "0.0.3-alpha.0",
"@ibm/plex-sans-hebrew": "0.0.3-alpha.0",
"@ibm/plex-sans-thai": "0.0.3-alpha.0",
"@ibm/plex-sans-thai-looped": "0.0.3-alpha.0",
"@ibm/plex-serif": "0.0.3-alpha.0",
"@ibm/plex": "6.0.0-next.6",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/styles/scss/_reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
border: 0;
margin: 0;
font: inherit;
font-feature-settings: 'liga' 1;
font-size: 100%;
vertical-align: baseline;
}
Expand Down
360 changes: 180 additions & 180 deletions packages/styles/scss/fonts/__tests__/__snapshots__/fonts-test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 9 additions & 66 deletions packages/styles/scss/fonts/_mono.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ $font-family: 'IBM Plex Mono';
$name: 'IBM-Plex-Mono';
$styles: (normal, italic);
$unicode-ranges: (Cyrillic, Pi, Latin3, Latin2, Latin1);
$formats: (woff2);
$package-name: 'mono';
$formats: (woff2, woff);

@mixin thin($styles: $styles, $unicode-ranges: $unicode-ranges) {
@each $style in $styles {
Expand All @@ -24,14 +23,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 100;
src: src.get(
$name,
Thin,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Thin, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -46,14 +38,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 200;
src: src.get(
$name,
ExtraLight,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, ExtraLight, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -68,14 +53,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 300;
src: src.get(
$name,
Light,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Light, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -90,14 +68,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 400;
src: src.get(
$name,
Regular,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Regular, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -112,14 +83,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 450;
src: src.get(
$name,
Text,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Text, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -134,14 +98,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 500;
src: src.get(
$name,
Medium,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Medium, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -156,14 +113,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 600;
src: src.get(
$name,
SemiBold,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, SemiBold, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand All @@ -178,14 +128,7 @@ $package-name: 'mono';
font-family: $font-family;
font-style: $style;
font-weight: 700;
src: src.get(
$name,
Bold,
$style,
$unicode-range,
$formats,
$package-name
);
src: src.get($name, Bold, $style, $unicode-range, $formats);
unicode-range: unicode.get-range($unicode-range);
}
}
Expand Down
25 changes: 8 additions & 17 deletions packages/styles/scss/fonts/_sans-arabic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $font-family: 'IBM Plex Sans Arabic';
$name: 'IBM-Plex-Sans-Arabic';
$styles: (normal);
$formats: (woff2, woff);
$package-name: 'sans-arabic';

@mixin thin() {
@font-face {
Expand All @@ -24,8 +23,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Thin,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -40,8 +38,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: ExtraLight,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -56,8 +53,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Light,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -72,8 +68,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Regular,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -88,8 +83,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Text,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -104,8 +98,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Medium,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -120,8 +113,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: SemiBold,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -136,8 +128,7 @@ $package-name: 'sans-arabic';
$name: $name,
$weight: Bold,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand Down
25 changes: 8 additions & 17 deletions packages/styles/scss/fonts/_sans-devanagari.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $font-family: 'IBM Plex Sans Devanagari';
$name: 'IBM-Plex-Sans-Devanagari';
$styles: (normal);
$formats: (woff2, woff);
$package-name: 'sans-devanagari';

@mixin thin() {
@font-face {
Expand All @@ -24,8 +23,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Thin,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -40,8 +38,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: ExtraLight,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -56,8 +53,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Light,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -72,8 +68,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Regular,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -88,8 +83,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Text,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -104,8 +98,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Medium,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -120,8 +113,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: SemiBold,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand All @@ -136,8 +128,7 @@ $package-name: 'sans-devanagari';
$name: $name,
$weight: Bold,
$style: $styles,
$formats: $formats,
$package-name: $package-name
$formats: $formats
);
}
}
Expand Down
Loading
Loading