Fixed conflicts and added properties to merge()
This commit is contained in:
@@ -510,8 +510,8 @@ class ColorTheme {
|
|||||||
),
|
),
|
||||||
this.borderTop = const Effect(
|
this.borderTop = const Effect(
|
||||||
sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
|
sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
|
||||||
this.borderBottom = const Effect(
|
this.borderBottom =
|
||||||
sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
|
const Effect(sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
|
||||||
this.shadowIconButton = const Effect(
|
this.shadowIconButton = const Effect(
|
||||||
sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
|
sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
|
||||||
this.modalShadow = const Effect(
|
this.modalShadow = const Effect(
|
||||||
@@ -532,8 +532,8 @@ class ColorTheme {
|
|||||||
this.accentGreen = const Color(0xff20E070),
|
this.accentGreen = const Color(0xff20E070),
|
||||||
this.borderTop = const Effect(
|
this.borderTop = const Effect(
|
||||||
sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
|
sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
|
||||||
this.borderBottom = const Effect(
|
this.borderBottom =
|
||||||
sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
|
const Effect(sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
|
||||||
this.shadowIconButton = const Effect(
|
this.shadowIconButton = const Effect(
|
||||||
sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
|
sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
|
||||||
this.modalShadow = const Effect(
|
this.modalShadow = const Effect(
|
||||||
@@ -634,6 +634,10 @@ class ColorTheme {
|
|||||||
overlay: other.overlay,
|
overlay: other.overlay,
|
||||||
overlayDark: other.overlayDark,
|
overlayDark: other.overlayDark,
|
||||||
bgGradient: other.bgGradient,
|
bgGradient: other.bgGradient,
|
||||||
|
borderTop: other.borderTop,
|
||||||
|
borderBottom: other.borderBottom,
|
||||||
|
shadowIconButton: other.shadowIconButton,
|
||||||
|
modalShadow: other.modalShadow,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user