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.

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: Padding fixes #235

Merged
merged 1 commit into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions example/lib/src/storybook/stories/carousel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ class CarouselStory extends Story {
showBorder: true,
icon: MoonIcon(
Directionality.of(context) == TextDirection.ltr
? MoonIcons.chevron_left_24
: MoonIcons.chevron_right_24,
? MoonIcons.chevron_left_small_24
: MoonIcons.chevron_right_small_24,
),
decoration: ShapeDecorationWithPremultipliedAlpha(
color: context.moonColors!.gohan,
Expand All @@ -159,8 +159,8 @@ class CarouselStory extends Story {
showBorder: true,
icon: MoonIcon(
Directionality.of(context) == TextDirection.ltr
? MoonIcons.chevron_right_24
: MoonIcons.chevron_left_24,
? MoonIcons.chevron_right_small_24
: MoonIcons.chevron_left_small_24,
),
decoration: ShapeDecorationWithPremultipliedAlpha(
color: context.moonColors!.gohan,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/theme/accordion/accordion_sizes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class MoonAccordionSizes extends ThemeExtension<MoonAccordionSizes> with Diagnos
borderRadius: tokens.borders.interactiveSm,
headerHeight: tokens.sizes.md,
iconSizeValue: tokens.sizes.xs,
headerPadding: EdgeInsets.symmetric(horizontal: tokens.sizes.x4s),
headerPadding: EdgeInsets.symmetric(horizontal: tokens.sizes.x3s),
headerTextStyle: tokens.typography.heading.textDefault,
contentTextStyle: tokens.typography.body.textDefault,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/theme/menu_item/menu_item_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MoonMenuItemTheme extends ThemeExtension<MoonMenuItemTheme> with Diagnosti
borderRadius: tokens.borders.interactiveSm,
verticalGap: tokens.sizes.x5s,
minimumHeight: tokens.sizes.md,
padding: EdgeInsets.all(tokens.sizes.x4s),
padding: EdgeInsets.all(tokens.sizes.x3s),
titleTextStyle: tokens.typography.body.textDefault,
descriptionTextStyle: tokens.typography.body.text12,
);
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/menu_item/menu_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class _MoonMenuItemState extends State<MoonMenuItem> with TickerProviderStateMix

final EdgeInsetsGeometry effectiveHeaderPadding = widget.menuItemPadding ??
context.moonTheme?.menuItemTheme.properties.padding ??
EdgeInsets.all(MoonSizes.sizes.x4s);
EdgeInsets.all(MoonSizes.sizes.x3s);

final EdgeInsets resolvedDirectionalHeaderPadding = effectiveHeaderPadding.resolve(Directionality.of(context));

Expand Down