Skip to content

Commit

Permalink
fix(UX-1078): fixed button group disabled color.
Browse files Browse the repository at this point in the history
fix(UX-1080): Add snackbar action bold text
fix(UX-1081): Change snackbar action color
fix(UX-977): change indicator border color
  • Loading branch information
ahmed-osman3 authored and thelukewalton committed Jun 17, 2024
1 parent c37e51d commit 88d82d8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions lib/src/components/badges/indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class ZetaIndicator extends StatelessWidget {
width: sizePixels + ZetaSpacing.minimum,
height: sizePixels + ZetaSpacing.minimum,
decoration: BoxDecoration(
border: Border.all(width: ZetaSpacingBase.x0_5, color: zetaColors.borderSubtle),
color: (inverse ? foregroundColor : Colors.transparent),
borderRadius: ZetaRadius.full,
),
Expand Down
6 changes: 3 additions & 3 deletions lib/src/components/button_group/button_group.dart
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ class _ZetaGroupButtonState extends State<ZetaGroupButton> {
if (states.contains(WidgetState.focused)) {
return BorderSide(color: colors.blue.shade50, width: ZetaSpacingBase.x0_5);
}
if (widget.isInverse) return BorderSide(color: colors.black);
if (states.contains(WidgetState.disabled)) {
return BorderSide(color: colors.cool.shade40);
}
if (widget.isInverse) return BorderSide(color: colors.black);
return BorderSide(
color: finalButton ? colors.borderDefault : colors.borderSubtle,
);
Expand Down Expand Up @@ -297,8 +297,6 @@ class _ZetaGroupButtonState extends State<ZetaGroupButton> {
),
),
backgroundColor: WidgetStateProperty.resolveWith<Color?>((states) {
if (widget.isInverse) return colors.cool.shade100;

if (states.contains(WidgetState.disabled)) {
return colors.surfaceDisabled;
}
Expand All @@ -308,6 +306,8 @@ class _ZetaGroupButtonState extends State<ZetaGroupButton> {
if (states.contains(WidgetState.hovered)) {
return colors.cool.shade20;
}
if (widget.isInverse) return colors.cool.shade100;

return colors.surfacePrimary;
}),
foregroundColor: WidgetStateProperty.resolveWith<Color?>((states) {
Expand Down
7 changes: 5 additions & 2 deletions lib/src/components/snack_bar/snack_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class _Action extends StatelessWidget {
ZetaSnackBarType.action => _ActionButton(
onPressed: onPressed,
label: actionLabel,
color: colors.blue.shade50,
color: colors.borderPrimaryMain,
),
ZetaSnackBarType.positive ||
ZetaSnackBarType.info ||
Expand Down Expand Up @@ -294,7 +294,10 @@ class _ActionButton extends StatelessWidget {
onPressed: onPressed,
child: Text(
label ?? '',
style: ZetaTextStyles.labelLarge.copyWith(color: color),
style: ZetaTextStyles.labelLarge.copyWith(
color: color,
fontWeight: FontWeight.bold,
),
),
),
);
Expand Down

0 comments on commit 88d82d8

Please sign in to comment.