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

master #81

Closed
malo wants to merge 322 commits from master into feat/bloc_layout/new-package
pull from: master
merge into: Wyatt-FOSS:feat/bloc_layout/new-package
Conversation 0 Commits 322 Files Changed 1069 +2 -7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ed8a71c7c - Show all commits

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