Wyatt-FOSS/wyatt-packages
Wyatt-FOSS/wyatt-packages
6
2
Fork 0
Code Issues 20 Pull Requests 3 Actions Packages Projects Releases Activity

fix(ui_kit): fix conflicts in card component after rebase

Browse Source
This commit is contained in:
Malo Léon 2023-02-21 08:53:38 +01:00
parent b6d22002ee
commit 8ed8a71c7c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart
View File

@ -112,7 +112,8 @@ class _CardWrapperState extends State<CardWrapper> {
extensionCardColor.backgroundColors != null &&
extensionCardColor.backgroundColors!.isGradient) {
return LinearGradient(
colors: extensionCardColor.backgroundColors!.colors,);
colors: extensionCardColor.backgroundColors!.colors,
);
}
}
return null;
@ -151,15 +152,9 @@ class _CardWrapperState extends State<CardWrapper> {
final extensionCardColor =
Theme.of(context).extension<CardThemeExtension>();
if (extensionCardColor != null &&
<<<<<<< HEAD
extensionCardColor.borderColors != null) {
if (extensionCardColor.borderColors!.isGradient) {
return GradientBoxBorder(
=======
extensionCardColor.borderColor != null) {
if (extensionCardColor.borderColor!.length >= 2) {
return CustomGradientBoxBorder(
>>>>>>> 548df1c (feat(ui_kit): implemement text inputs (#138))
gradient: LinearGradient(
colors: extensionCardColor.borderColors!.colors,
),