diff --git a/atomic_defi_design/Dex/Components/Toast.qml b/atomic_defi_design/Dex/Components/Toast.qml index 9f03e055d..57d9149fd 100644 --- a/atomic_defi_design/Dex/Components/Toast.qml +++ b/atomic_defi_design/Dex/Components/Toast.qml @@ -39,7 +39,7 @@ AnimatedRectangle { radius: margin / 3 opacity: 0 - color: isError ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.colorTheme1 + color: isError ? Dex.CurrentTheme.warningColor : "#3CC9BF" z: 1000 DexLabel { diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index b51612ecb..22fdf94b7 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -212,14 +212,9 @@ ThemeData { addressBookTagColors[i] = Dex.Color.argbStrFromRgbaStr(addressBookTagColors[i]) } - okColor = Dex.Color.argbStrFromRgbaStr(themeData.okColor || defaultTheme.okColor); warningColor = Dex.Color.argbStrFromRgbaStr(themeData.warningColor || defaultTheme.warningColor); swapIconColor = Dex.Color.argbStrFromRgbaStr(themeData.swapIconColor || defaultTheme.swapIconColor); - colorTheme1 = Dex.Color.argbStrFromRgbaStr(themeData.colorTheme1 || defaultTheme.colorTheme1); - colorPlaceholderText = Dex.Color.argbStrFromRgbaStr(themeData.colorPlaceholderText || defaultTheme.colorPlaceholderText); - colorSelectedText = Dex.Color.argbStrFromRgbaStr(themeData.colorSelectedText || defaultTheme.colorSelectedText); - colorSelection = Dex.Color.argbStrFromRgbaStr(themeData.colorSelection || defaultTheme.colorSelection); senderColorStart = Dex.Color.argbStrFromRgbaStr(themeData.senderColorStart || defaultTheme.senderColorStart); receiverColorStart = Dex.Color.argbStrFromRgbaStr(themeData.receiverColorStart || defaultTheme.receiverColorStart); diff --git a/docker-build-linux.sh b/docker-build-linux.sh index ba4dc6f0a..142bf6ea5 100755 --- a/docker-build-linux.sh +++ b/docker-build-linux.sh @@ -1,6 +1,6 @@ #!/bin/bash -sudo rm bundled +sudo rm -rf build bundled # Define the target for the build (Debug or Release) TARGET="${1:-Debug}"