@@ -30,26 +33,35 @@ const MiningViewActions = ({
testId='mining-action-setup-mining-hours'
disabled={!canAnyMiningBeRun}
onClick={openScheduling}
- style={{ paddingLeft: 0 }}
+ style={{ paddingLeft: 0, color: theme.helpTipText }}
>
{t.mining.viewActions.setUpMiningHours}
-
}
- style={{ paddingLeft: 0 }}
- onClick={openSettings}
- testId='mining-view-actions-settings-btn'
- >
- {t.mining.viewActions.miningSettings}
-
+
+ }
+ style={{ paddingLeft: 0, paddingRight: 12, color: theme.helpTipText }}
+ onClick={openSettings}
+ testId='mining-view-actions-settings-btn'
+ >
+ {t.mining.viewActions.miningSettings}
+
+
+ {t.common.nouns.expert}
+
+
}
onClick={toggleStatistics}
- style={{ paddingLeft: 0 }}
+ style={{ paddingLeft: 0, color: theme.helpTipText }}
>
{t.mining.viewActions.statistics}
diff --git a/applications/launchpad/gui-react/src/containers/WalletPasswordWizard/WalletPasswordForm/index.tsx b/applications/launchpad/gui-react/src/containers/WalletPasswordWizard/WalletPasswordForm/index.tsx
index a1fbaa7adc..756e7751a1 100644
--- a/applications/launchpad/gui-react/src/containers/WalletPasswordWizard/WalletPasswordForm/index.tsx
+++ b/applications/launchpad/gui-react/src/containers/WalletPasswordWizard/WalletPasswordForm/index.tsx
@@ -35,11 +35,13 @@ const WalletPasswordForm = ({
{t.walletPasswordWizard.description}
- {t.walletPasswordWizard.warning}
+
+ {t.walletPasswordWizard.warning}
+
{t.walletPasswordWizard.warningBox}
diff --git a/applications/launchpad/gui-react/src/custom.d.ts b/applications/launchpad/gui-react/src/custom.d.ts
index 0a2033a71b..7b9404a678 100644
--- a/applications/launchpad/gui-react/src/custom.d.ts
+++ b/applications/launchpad/gui-react/src/custom.d.ts
@@ -46,22 +46,40 @@ declare module 'styled-components' {
titleBar: string
controlBackground: string
- info: string
+ infoTag: string
infoText: string
on: string
onText: string
onTextLight: string
warning: string
+ warningTag: string
warningText: string
warningDark: string
success: string
error: string
expert: string
expertText: string
+ expertSecText: string
lightTag: string
lightTagText: string
placeholderText: string
textSecondary: string
+ helpTipText: string
+ runningTagBackground: string
+ runningTagText: string
+ dashboardRunningTagText: string
+ dashboardRunningTagBackground: string
+ switchBorder: string
+ switchCircle: string
+ switchController: string
+ nodeBackground: string
+ nodeLightIcon: string
+ nodeSubHeading: string
+ nodeWarningText: string
+ calloutBackground: string
+ inputPlaceholder: string
+ disabledPrimaryButton: string
+ disabledPrimaryButtonText: string
inverted: {
controlBackground: string
@@ -97,6 +115,20 @@ declare module 'styled-components' {
expertText: string
lightTag: string
lightTagText: string
+ expert: string
+ expertText: string
+ expertSecText: string
+ switchBorder: string
+ switchCircle: string
+ switchController: string
+ nodeBackground: string
+ nodeLightIcon: string
+ nodeSubHeading: string
+ nodeWarningText: string
+ calloutBackground: string
+ inputPlaceholder: string
+ disabledPrimaryButton: string
+ disabledPrimaryButtonText: string
}
}
}
diff --git a/applications/launchpad/gui-react/src/styles/themes/dark.ts b/applications/launchpad/gui-react/src/styles/themes/dark.ts
index a4f4ad2917..d7dfa0bca2 100644
--- a/applications/launchpad/gui-react/src/styles/themes/dark.ts
+++ b/applications/launchpad/gui-react/src/styles/themes/dark.ts
@@ -9,14 +9,14 @@ const darkTheme = {
backgroundImage: styles.colors.light.backgroundImage,
accent: styles.colors.tari.purple,
accentDark: styles.colors.tari.purpleDark,
- accentMerged: styles.colors.merged.dark,
+ accentMerged: styles.colors.darkMode.darkLogoCard,
disabledText: styles.colors.dark.placeholder,
tariGradient: styles.gradients.tariDark,
tariTextGradient: styles.gradients.tariText,
mergedGradient: styles.gradients.mergedDark,
warningGradient: styles.gradients.warning,
greenMedium: styles.colors.secondary.greenMedium,
- borderColor: styles.colors.light.backgroundImage,
+ borderColor: styles.colors.darkMode.modalBackground,
titleBar: styles.colors.dark.primary,
borderColorLight: styles.colors.secondary.borderLight,
@@ -24,22 +24,41 @@ const darkTheme = {
resetBackgroundHover: styles.colors.light.overlayDark,
moneroDark: styles.colors.monero.dark,
controlBackground: 'rgba(255,255,255,.2)',
- info: styles.colors.secondary.info,
+ infoTag: styles.colors.darkMode.tags,
infoText: styles.colors.secondary.infoText,
on: styles.colors.secondary.on,
onText: styles.colors.secondary.onText,
onTextLight: styles.colors.secondary.onTextLight,
warning: styles.colors.secondary.warning,
+ warningTag: styles.colors.darkMode.modalBackground,
warningText: styles.colors.secondary.warningText,
warningDark: styles.colors.secondary.warningDark,
success: styles.colors.secondary.onTextLight,
error: styles.colors.secondary.error,
- expert: 'rgba(147, 48, 255, 0.05)',
+ expert: 'rgba(255, 255, 255, 0.06)',
expertText: styles.gradients.tari,
- lightTag: styles.colors.light.backgroundImage,
+ expertSecText: 'rgba(255, 255, 255, 0.32)',
+ lightTag: styles.colors.darkMode.tags,
lightTagText: styles.colors.dark.secondary,
placeholderText: styles.colors.dark.placeholder,
+ textSecondary: styles.colors.light.textSecondary,
mergedAccent: styles.colors.merged.dark,
+ helpTipText: styles.colors.light.textSecondary,
+ runningTagBackground: styles.colors.darkMode.tags,
+ runningTagText: styles.colors.secondary.onTextLight,
+ dashboardRunningTagText: styles.colors.light.primary,
+ dashboardRunningTagBackground: styles.colors.darkMode.modalBackground,
+ switchBorder: styles.colors.darkMode.input,
+ switchCircle: styles.colors.dark.secondary,
+ switchController: styles.colors.light.overlay,
+ nodeBackground: styles.colors.darkMode.modalBackground,
+ nodeLightIcon: styles.colors.darkMode.darkLogoCard,
+ nodeSubHeading: styles.colors.dark.secondary,
+ nodeWarningText: styles.colors.light.textSecondary,
+ calloutBackground: styles.colors.darkMode.tags,
+ inputPlaceholder: styles.colors.dark.secondary,
+ disabledPrimaryButton: styles.colors.darkMode.borders,
+ disabledPrimaryButtonText: styles.colors.darkMode.disabledText,
inverted: {
primary: styles.colors.light.primary,
@@ -50,14 +69,14 @@ const darkTheme = {
backgroundImage: styles.colors.light.backgroundImage,
accent: styles.colors.tari.purple,
accentDark: styles.colors.tari.purpleDark,
- accentMerged: styles.colors.merged.dark,
+ accentMerged: styles.colors.darkMode.darkLogoCard,
disabledText: styles.colors.dark.placeholder,
tariGradient: styles.gradients.tariDark,
tariTextGradient: styles.gradients.tariText,
mergedGradient: styles.gradients.mergedDark,
warningGradient: styles.gradients.warning,
greenMedium: styles.colors.secondary.greenMedium,
- info: styles.colors.secondary.info,
+ infoTag: styles.colors.secondary.info,
infoText: styles.colors.secondary.infoText,
on: styles.colors.secondary.on,
onText: styles.colors.secondary.onText,
@@ -67,16 +86,33 @@ const darkTheme = {
warningDark: styles.colors.secondary.warningDark,
success: styles.colors.secondary.onTextLight,
error: styles.colors.secondary.error,
- expert: 'rgba(147, 48, 255, 0.05)',
+ expert: 'rgba(255, 255, 255, 0.06)',
expertText: styles.gradients.tari,
+ expertSecText: 'rgba(255, 255, 255, 0.32)',
lightTag: styles.colors.light.backgroundImage,
lightTagText: styles.colors.dark.secondary,
+ placeholderText: styles.colors.dark.placeholder,
borderColor: styles.colors.light.backgroundImage,
borderColorLight: styles.colors.secondary.borderLight,
resetBackground: styles.colors.light.overlay,
resetBackgroundHover: styles.colors.light.overlayDark,
moneroDark: styles.colors.monero.dark,
controlBackground: 'transparent',
+ helpTipText: styles.colors.light.textSecondary,
+ runningTagBackground: styles.colors.darkMode.tags,
+ runningTagText: styles.colors.secondary.onTextLight,
+ dashboardRunningTagText: styles.colors.light.primary,
+ dashboardRunningTagBackground: styles.colors.darkMode.modalBackground,
+ switchBorder: styles.colors.darkMode.input,
+ switchCircle: styles.colors.dark.secondary,
+ switchController: styles.colors.light.overlay,
+ nodeBackground: styles.colors.darkMode.modalBackground,
+ nodeLightIcon: styles.colors.darkMode.darkLogoCard,
+ nodeSubHeading: styles.colors.dark.secondary,
+ nodeWarningText: styles.colors.light.textSecondary,
+ calloutBackground: styles.colors.darkMode.tags,
+ inputPlaceholder: styles.colors.dark.secondary,
+ disabledPrimaryButtonText: styles.colors.darkMode.disabledText,
},
}
diff --git a/applications/launchpad/gui-react/src/styles/themes/light.ts b/applications/launchpad/gui-react/src/styles/themes/light.ts
index 7cb8489be1..4716268e01 100644
--- a/applications/launchpad/gui-react/src/styles/themes/light.ts
+++ b/applications/launchpad/gui-react/src/styles/themes/light.ts
@@ -28,22 +28,40 @@ const lightTheme = {
titleBar: styles.colors.light.background,
controlBackground: 'transparent',
- info: styles.colors.secondary.info,
+ infoTag: styles.colors.secondary.info,
infoText: styles.colors.secondary.infoText,
on: styles.colors.secondary.on,
onText: styles.colors.secondary.onText,
onTextLight: styles.colors.secondary.onTextLight,
warning: styles.colors.secondary.warning,
+ warningTag: styles.colors.secondary.warning,
warningText: styles.colors.secondary.warningText,
warningDark: styles.colors.secondary.warningDark,
success: styles.colors.secondary.onTextLight,
error: styles.colors.secondary.error,
expert: 'rgba(147, 48, 255, 0.05)',
expertText: styles.gradients.tari,
+ expertSecText: styles.colors.tari.purple,
lightTag: styles.colors.light.backgroundImage,
lightTagText: styles.colors.dark.secondary,
placeholderText: styles.colors.dark.placeholder,
textSecondary: styles.colors.light.textSecondary,
+ helpTipText: styles.colors.dark.primary,
+ runningTagBackground: styles.colors.secondary.on,
+ runningTagText: styles.colors.secondary.onText,
+ dashboardRunningTagText: styles.colors.secondary.onText,
+ dashboardRunningTagBackground: styles.colors.secondary.on,
+ switchBorder: styles.colors.dark.primary,
+ switchCircle: styles.colors.light.background,
+ switchController: styles.colors.light.background,
+ nodeBackground: styles.colors.light.primary,
+ nodeLightIcon: styles.colors.light.backgroundImage,
+ nodeSubHeading: styles.colors.dark.primary,
+ nodeWarningText: styles.colors.dark.secondary,
+ calloutBackground: styles.colors.secondary.warning,
+ inputPlaceholder: styles.colors.dark.placeholder,
+ disabledPrimaryButton: styles.colors.light.backgroundImage,
+ disabledPrimaryButtonText: styles.colors.dark.placeholder,
inverted: {
primary: styles.colors.light.primary,
@@ -63,7 +81,7 @@ const lightTheme = {
mergedGradient: styles.gradients.merged,
warningGradient: styles.gradients.warning,
greenMedium: styles.colors.secondary.greenMedium,
- info: styles.colors.secondary.info,
+ infoTag: styles.colors.secondary.info,
infoText: styles.colors.secondary.infoText,
on: styles.colors.secondary.on,
onText: styles.colors.secondary.onText,
@@ -75,6 +93,7 @@ const lightTheme = {
error: styles.colors.secondary.error,
expert: 'rgba(147, 48, 255, 0.05)',
expertText: styles.gradients.tari,
+ expertSecText: styles.colors.tari.purple,
lightTag: styles.colors.light.backgroundImage,
lightTagText: styles.colors.dark.secondary,
borderColor: styles.colors.secondary.borderLight,
@@ -84,6 +103,21 @@ const lightTheme = {
resetBackgroundHover: styles.colors.light.overlayDark,
moneroDark: styles.colors.monero.dark,
controlBackground: 'rgba(255,255,255,.2)',
+ helpTipText: styles.colors.dark.primary,
+ runningTagBackground: styles.colors.secondary.on,
+ runningTagText: styles.colors.secondary.onText,
+ dashboardRunningTagText: styles.colors.secondary.onText,
+ dashboardRunningTagBackground: styles.colors.secondary.on,
+ switchBorder: styles.colors.dark.primary,
+ switchController: styles.colors.light.background,
+ nodeBackground: styles.colors.light.primary,
+ nodeLightIcon: styles.colors.light.backgroundImage,
+ nodeSubHeading: styles.colors.dark.primary,
+ nodeWarningText: styles.colors.dark.secondary,
+ calloutBackground: styles.colors.secondary.warning,
+ inputPlaceholder: styles.colors.dark.placeholder,
+ disabledPrimaryButton: styles.colors.light.backgroundImage,
+ disabledPrimaryButtonText: styles.colors.dark.placeholder,
},
}