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

fix: Add missing text style package #537

Merged
merged 2 commits into from
Feb 7, 2024
Merged

fix: Add missing text style package #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5d6ca0
fix: Add missing text style package
witwash Feb 5, 2024
ae32d38
Merge branch 'master' into fix-typography
witwash Feb 6, 2024
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
17 changes: 17 additions & 0 deletions optimus/lib/src/tokens/tokens_dark.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ class DesignTokensDark {

static const TextStyle bodyExtraSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1,
fontSize: 11,
Expand All @@ -309,6 +310,7 @@ class DesignTokensDark {
);
static const TextStyle bodyExtraSmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1,
fontSize: 11,
Expand All @@ -317,48 +319,55 @@ class DesignTokensDark {
);
static const TextStyle bodyLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 16,
fontFeatures: fontFeatures,
);
static const TextStyle bodyLargeStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 16,
fontFeatures: fontFeatures,
);
static const TextStyle bodyMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 14,
fontFeatures: fontFeatures,
);
static const TextStyle bodyMediumStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 14,
fontFeatures: fontFeatures,
);
static const TextStyle bodySmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 12,
fontFeatures: fontFeatures,
);
static const TextStyle bodySmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 12,
fontFeatures: fontFeatures,
);
static const TextStyle highlightLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 36,
Expand All @@ -367,6 +376,7 @@ class DesignTokensDark {
);
static const TextStyle highlightMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 25,
Expand All @@ -375,48 +385,55 @@ class DesignTokensDark {
);
static const TextStyle highlightSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 18,
fontFeatures: fontFeatures,
);
static const TextStyle titleLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 22,
fontFeatures: fontFeatures,
);
static const TextStyle titleLargeStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.5,
fontSize: 22,
fontFeatures: fontFeatures,
);
static const TextStyle titleMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 20,
fontFeatures: fontFeatures,
);
static const TextStyle titleMediumStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.5,
fontSize: 20,
fontFeatures: fontFeatures,
);
static const TextStyle titleSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.3,
fontSize: 18,
fontFeatures: fontFeatures,
);
static const TextStyle titleSmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.3,
fontSize: 18,
Expand Down
17 changes: 17 additions & 0 deletions optimus/lib/src/tokens/tokens_light.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ class DesignTokensLight {

static const TextStyle bodyExtraSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1,
fontSize: 11,
Expand All @@ -309,6 +310,7 @@ class DesignTokensLight {
);
static const TextStyle bodyExtraSmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1,
fontSize: 11,
Expand All @@ -317,48 +319,55 @@ class DesignTokensLight {
);
static const TextStyle bodyLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 16,
fontFeatures: fontFeatures,
);
static const TextStyle bodyLargeStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 16,
fontFeatures: fontFeatures,
);
static const TextStyle bodyMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 14,
fontFeatures: fontFeatures,
);
static const TextStyle bodyMediumStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 14,
fontFeatures: fontFeatures,
);
static const TextStyle bodySmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 12,
fontFeatures: fontFeatures,
);
static const TextStyle bodySmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.5,
fontSize: 12,
fontFeatures: fontFeatures,
);
static const TextStyle highlightLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 36,
Expand All @@ -367,6 +376,7 @@ class DesignTokensLight {
);
static const TextStyle highlightMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 25,
Expand All @@ -375,48 +385,55 @@ class DesignTokensLight {
);
static const TextStyle highlightSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w500,
height: 1.3,
fontSize: 18,
fontFeatures: fontFeatures,
);
static const TextStyle titleLarge = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 22,
fontFeatures: fontFeatures,
);
static const TextStyle titleLargeStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.5,
fontSize: 22,
fontFeatures: fontFeatures,
);
static const TextStyle titleMedium = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.5,
fontSize: 20,
fontFeatures: fontFeatures,
);
static const TextStyle titleMediumStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.5,
fontSize: 20,
fontFeatures: fontFeatures,
);
static const TextStyle titleSmall = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w400,
height: 1.3,
fontSize: 18,
fontFeatures: fontFeatures,
);
static const TextStyle titleSmallStrong = TextStyle(
fontFamily: 'Inter',
package: 'optimus',
fontWeight: FontWeight.w600,
height: 1.3,
fontSize: 18,
Expand Down
Loading