From 9bdb6aa11daa95af01de39b046251290c77e0419 Mon Sep 17 00:00:00 2001 From: Danilo Date: Tue, 30 Jul 2019 10:18:15 -0700 Subject: [PATCH] Updates v2-integration branch (#1498) * [DDW-761] Fix 'To addresses' in the same line (#1476) * [DDW-761] Fix 'To addresses' in the same line * [DDW-761] Add 2 'TO' addresses in the Storybook Transactions story * [DDW-761] Fix address/transaction hover effect * [DDW-762] Fix broken 'Read the Article' button (#1479) * [DDW-762] Fix broken 'Read the Article' button * [DDW-762] CHANGELOG * [DDW-764] Fix timestamp date format handling (#1482) * [DDW-757] Implement new themes (#1480) * [DDW-757] Introduce yellow / white / dark-cardano themes base setup * [DDW-757] Add new themes to Settings page * [DDW-757] Run translations manager * [DDW-757] Add missing config for new themes create/update and theme images * [DDW-757] Generate css variables for new themes and yellow theme overrides * [DDW-757] Adjusts buttons colors in all states, and input/select border colors * [DDW-757] Auto-updates defaultMessages.json * [DDW-757] Fixes delegation icon in SideBar to use fill/stroke color in CSS vars * [DDW-757] Fixes delegation-progress icon in SideBar to use fill/stroke color in CSS vars * [DDW-757] Fixes create paper wallet icon in SideBar to use fill/stroke color in CSS vars * [DDW-757] Yellow theme fine tuning and storybook menu new themes selection * [DDW-757] Fix dark cardano theme config and vars creation * [DDW-757] Introduce Dark-Cardano theme partial varibles override * [DDW-757] Yellow theme styles improvements * [DDW-757] Generating new additional variables for all themes * [DDW-757] Introduce basic layout variables overrides for White theme * [DDW-757] Small color improvements for BigDialogButtons, StakePool cards and tooltips, delegation dropdowns on Yellow theme * [DDW-757] Dark-Blue theme border color on stake pool boxes fix * [DDW-757] Support icon for yellow theme * [DDW-757] Fix Support icon disappearing * [DDW-757] Main background color change * [DDW-757] Yellow theme - about window fixes * [DDW-757] Stories to get the current theme and dark icon for white theme * [DDW-757] Yellow theme - about window overlay color * [DDW-757] Add MINT variations to White theme and settings page translation improvement * [DDW-757] Adding new theme images for setting page * [DDW-757] White overrides - WIP * [DDW-757] Theme buttons better arrangement * [DDW-757] Finalizing Yellow theme by resolving requested changes * [DDW-757] Run prettier * [DDW-757] UTXO graph colors improvement and options list bg color * [DDW-757] Fix copy notification text color * [DDW-757] Fix dropdown bg colors * [DDW-757] Fix support request hover * [DDW-757] Update dark cardano theme * [DDW-757] White theme - WIP * [DDW-757] White theme - Block consolidation done * [DDW-757] White theme - Paper Wallet * [DDW-757] White theme - Transactions * [DDW-757] Matches Block Consolidation screen to mockups in fine detail * [DDW-757] Imports taller, thinner cross svg for use in About/Block Consolidation screens * [DDW-757] Replaces hard coded fill value with CSS variable * [DDW-757] Uses thinner cross in About.js * [DDW-757] Handles active/pressed button state on Block Consolidation screen * [DDW-757] Color value adjustments in all theme files * [DDW-757] Auto update in defaultMessages.json * [DDW-757] Fixes checkbox and link colors in white theme * [DDW-757] Fixes flat button on white and dark cardano themes, fixes utxo chart on white theme * [DDW-757] Updates white theme with fixes * [DDW-757] Imports correct svg cross icon * [DDW-757] Fixes remaining issues in white theme and also learn more buttons in dark-cardano * [DDW-757] Darkens mnemonics background color in white theme * [DDW-757] White theme CSS fixes * [DDW-757] Add missing stories * [DDW-757] Fixes AdaRedemptionSuccessOverlay styles in white, yellow, and dark-cardano themes * [DDW-757] Fixes AdaRedemptionDisclaimer styles in white, yellow, and dark-cardano themes * [DDW-757] Fixes button colors on trouble syncing/connecting screens in dark-cardano.js * [DDW-757] Fixes Data Layer Migration screen in white, yellow, and dark-cardano themes * [DDW-757] Fixes Data Layer Migration screen in white, yellow, and dark-cardano themes * [DDW-757] Fixes Node Update Notification in yellow theme * [DDW-757] Update storybook stories * [DDW-757] Fixing themes * [DDW-757] Storybook topbar expand icon, loading wallet progress bar color and UTXO charts on white theme * [DDW-757] White theme improvements * [DDW-757] Fixing themes * [DDW-757] White theme final imporvements * [DDW-757] Fixing themes * [DDW-757] Remove testing faked data * [DDW-757] Run prettier * [DDW-757] Fixing themes * [DDW-757] Fixing themes * [DDW-757] Dark Cardano theme UTXO charts improvements * [DDW-757] Failed transactions colors imporovement * [DDW-757] Cardano Dark and White theme improvements * [DDW-757] Eslint warning and prettier fix * [DDW-757] Fix storybook restoration progress * [DDW-757] Different BGs on Overlays * [DDW-757] Syncing screen - tooltip not visible * [DDW-757] Wrong border Staking on Staking screens * [DDW-757] Wrong strip colors on progress bar * [DDW-757] Dropdown triangle arrow on dark theme * [DDW-757] Wrong pop-over colors on Delegation Center * [DDW-757] The final piece of the puzzle * [DDW-757] Adds CHANGELOG entry * [DDW-776] Fix wrong styling of the Stake Pool in the Dark Blue theme (#1484) * DDW-776 Fix wrong styling of the Stake Pool in the Dark Blue theme * DDW-776 CHANGELOG * DDW-776 missing border for big pool * [DDW-776] Stake pool thumb colors improvements * [DDW-776] Apply new stake pool thumb colors to selection box * [DDW-777] Implement link to feature requests (#1487) * [DDW-785] Reverse buttons order (#1489) * DDW-780 Truncated third Loading Dot. (#1490) * [DDW-781] Blank Screen Fix - Default Selection. (#1488) * [DDW-781] Blank Screen Fix - Default Selection. * [DDW-711] Replaces button No by Cancel * [DDW-781] Fixes buttons focus * DDW-781 CHANGELOG * [DDW-789] Fix focused button of the 'Blank Screen fix' prompt on Windows (#1493) * [DDW-775] Cardano SL 3.0.3 integration (#1477) * support haskell.nix builds of cardano * fix icon on `daedalus.exe` * implement HSM client * [DEVOPS-970] re-enable signed uninstallers fix staging cross build * [DDW-775] set cardano revision to 3.0.3 * set target to x86_64-windows in build-cross-windows.sh * add buildNum to release-build and fix suffixes for windows --- CHANGELOG.md | 11 +- appveyor.yml | 45 +- cardano-sl-src.json | 5 +- default.nix | 76 +- gulpfile.js | 3 + installers/daedalus-installer.nix | 1 + lib.nix | 6 +- release-build.nix | 17 + release.nix | 7 +- scripts/build-cross-windows.sh | 2 +- shell.nix | 2 +- source/main/locales/en-US.json | 3 +- source/main/locales/ja-JP.json | 3 +- source/main/menus/MenuActions.types.js | 3 +- source/main/menus/osx.js | 38 +- source/main/menus/win-linux.js | 39 +- source/main/utils/buildAppMenus.js | 63 +- .../block-consolidation/epochs.inline.svg | 18 + .../assets/images/close-cross-thin.inline.svg | 5 + .../app/assets/images/header-logo.inline.svg | 10 + .../sidebar/bug-report-ic-dark.inline.svg | 17 + .../images/sidebar/delegation-ic.inline.svg | 14 +- .../sidebar/delegation-progress-ic.inline.svg | 36 +- .../sidebar/paper-certificate-ic.inline.svg | 16 +- .../assets/images/success-small.inline.svg | 2 +- .../app/assets/images/themes/cardano.png | Bin 1180 -> 4566 bytes .../app/assets/images/themes/dark-blue.png | Bin 1166 -> 4479 bytes .../app/assets/images/themes/dark-cardano.png | Bin 0 -> 4505 bytes .../app/assets/images/themes/light-blue.png | Bin 1362 -> 4644 bytes .../app/assets/images/themes/white.png | Bin 0 -> 4468 bytes .../app/assets/images/themes/yellow.png | Bin 0 -> 4610 bytes .../top-bar/node-sync-spinner.inline.svg | 3 + .../top-bar/node-sync-synced.inline.svg | 6 + .../renderer/app/components/layout/TopBar.js | 7 +- .../app/components/layout/TopBar.scss | 15 +- .../loading/manual-update/ManualUpdate.js | 4 +- .../loading/manual-update/ManualUpdate.scss | 8 + .../loading/syncing-connecting/ReportIssue.js | 16 +- .../SyncingConnectingTitle.scss | 2 +- .../DataLayerMigrationForm.scss | 7 +- .../settings/categories/DisplaySettings.js | 79 +- .../settings/categories/DisplaySettings.scss | 2 +- .../app/components/sidebar/Sidebar.js | 13 +- .../app/components/sidebar/Sidebar.scss | 1 + .../components/sidebar/SidebarCategory.scss | 1 - .../DelegationStepsChooseStakePoolDialog.scss | 13 +- .../components/staking/info/StakingInfo.scss | 4 +- .../renderer/app/components/static/About.js | 7 +- .../renderer/app/components/static/About.scss | 4 +- .../status/BlockConsolidationStatus.js | 14 +- .../status/BlockConsolidationStatus.scss | 38 +- .../components/status/DaedalusDiagnostics.js | 4 +- .../status/DaedalusDiagnostics.scss | 10 + .../AdaRedemptionSuccessOverlay.js | 4 +- .../AdaRedemptionSuccessOverlay.scss | 19 +- .../wallet/transactions/Transaction.js | 77 +- .../wallet/transactions/Transaction.scss | 17 +- .../components/widgets/NodeSyncStatusIcon.js | 8 +- .../widgets/NodeSyncStatusIcon.scss | 21 +- .../widgets/NotificationMessage.scss | 16 +- source/renderer/app/containers/MainLayout.js | 4 +- .../status/DaedalusDiagnosticsDialog.js | 2 +- .../status/DaedalusDiagnosticsDialog.scss | 1 - .../InstructionsDialogContainer.js | 12 +- source/renderer/app/i18n/locales/de-DE.json | 3 + .../app/i18n/locales/defaultMessages.json | 138 ++-- source/renderer/app/i18n/locales/en-US.json | 3 + source/renderer/app/i18n/locales/hr-HR.json | 3 + source/renderer/app/i18n/locales/ja-JP.json | 5 +- source/renderer/app/i18n/locales/ko-KR.json | 3 + source/renderer/app/i18n/locales/zh-CN.json | 3 + .../renderer/app/themes/daedalus/cardano.js | 44 +- .../renderer/app/themes/daedalus/dark-blue.js | 46 +- .../app/themes/daedalus/dark-cardano.js | 724 ++++++++++++++++++ .../app/themes/daedalus/light-blue.js | 50 +- source/renderer/app/themes/daedalus/white.js | 717 +++++++++++++++++ source/renderer/app/themes/daedalus/yellow.js | 718 +++++++++++++++++ source/renderer/app/themes/index.js | 3 + .../app/themes/mixins/animations.scss | 4 +- source/renderer/app/themes/scripts/update.js | 6 + source/renderer/app/themes/types.js | 15 +- .../app/themes/utils/checkCreateTheme.js | 47 +- source/renderer/app/themes/utils/constants.js | 51 ++ .../renderer/app/themes/utils/createTheme.js | 38 +- .../renderer/app/themes/utils/findUpdates.js | 56 +- .../renderer/app/themes/utils/updateThemes.js | 30 +- .../stories/AdaRedemptionDialog.stories.js | 14 + .../Loading-DataLayerMigration.stories.js | 9 + storybook/stories/Loading.stories.js | 4 +- storybook/stories/Sidebar.stories.js | 8 + storybook/stories/Staking.stories.js | 11 +- storybook/stories/TopBar.stories.js | 3 + storybook/stories/WalletScreens.stories.js | 22 +- storybook/stories/Widgets.stories.js | 13 + storybook/stories/support/StoryLayout.js | 12 +- storybook/stories/support/StoryProvider.js | 29 + storybook/stories/support/StoryWrapper.js | 6 + storybook/stories/support/utils.js | 5 +- yarn2nix.nix | 12 +- 99 files changed, 3323 insertions(+), 413 deletions(-) create mode 100644 release-build.nix create mode 100644 source/renderer/app/assets/images/block-consolidation/epochs.inline.svg create mode 100644 source/renderer/app/assets/images/close-cross-thin.inline.svg create mode 100644 source/renderer/app/assets/images/header-logo.inline.svg create mode 100644 source/renderer/app/assets/images/sidebar/bug-report-ic-dark.inline.svg mode change 100644 => 100755 source/renderer/app/assets/images/themes/cardano.png mode change 100644 => 100755 source/renderer/app/assets/images/themes/dark-blue.png create mode 100755 source/renderer/app/assets/images/themes/dark-cardano.png mode change 100644 => 100755 source/renderer/app/assets/images/themes/light-blue.png create mode 100755 source/renderer/app/assets/images/themes/white.png create mode 100755 source/renderer/app/assets/images/themes/yellow.png create mode 100644 source/renderer/app/assets/images/top-bar/node-sync-spinner.inline.svg create mode 100644 source/renderer/app/assets/images/top-bar/node-sync-synced.inline.svg create mode 100644 source/renderer/app/themes/daedalus/dark-cardano.js create mode 100644 source/renderer/app/themes/daedalus/white.js create mode 100644 source/renderer/app/themes/daedalus/yellow.js create mode 100644 storybook/stories/Loading-DataLayerMigration.stories.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 8170a73c7d..3e125e1444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ Changelog - Implemented guided manual updates ([PR 1410](https://github.com/input-output-hk/daedalus/pull/1410), [PR 1423](https://github.com/input-output-hk/daedalus/pull/1423)) - Application menu improvements: - - Implemented "Help" application menu item with "Known Issues", "Blank Screen Fix", "Support Request", "Download Logs", "Block Consolidation Status" and "Daedalus Diagnostics" options ([PR 1382](https://github.com/input-output-hk/daedalus/pull/1382), [PR 1459](https://github.com/input-output-hk/daedalus/pull/1459)) + - Implemented "Help" application menu item with "Known Issues", "Blank Screen Fix", "Feature Request", "Support Request", "Download Logs", "Block Consolidation Status" and "Daedalus Diagnostics" options ([PR 1382](https://github.com/input-output-hk/daedalus/pull/1382), [PR 1459](https://github.com/input-output-hk/daedalus/pull/1459), [PR 1487](https://github.com/input-output-hk/daedalus/issues/1487), [PR 1488](https://github.com/input-output-hk/daedalus/pull/1488), [PR 1493](https://github.com/input-output-hk/daedalus/pull/1493)) - Improved the "Ada redemption" menu item UX by disabling the option while Daedalus is not fully synced ([PR 1458](https://github.com/input-output-hk/daedalus/pull/1458)) - Application dialogs improvements: - Implemented new "About Us" dialog design ([PR 1369](https://github.com/input-output-hk/daedalus/pull/1369), [PR 1450](https://github.com/input-output-hk/daedalus/pull/1450)) @@ -22,22 +22,23 @@ Changelog - "Loading" screen improvements: - Implemented animated Daedalus logo ([PR 1457](https://github.com/input-output-hk/daedalus/pull/1457)) - Implemented status icons ([PR 1325](https://github.com/input-output-hk/daedalus/pull/1325), [PR 1365](https://github.com/input-output-hk/daedalus/pull/1365), [PR 1452](https://github.com/input-output-hk/daedalus/pull/1452)) - - Improved "Having trouble connecting/syncing?" notification ([PR 1453](https://github.com/input-output-hk/daedalus/pull/1453)) + - Improved "Having trouble connecting/syncing?" notification ([PR 1453](https://github.com/input-output-hk/daedalus/pull/1453), [PR 1479](https://github.com/input-output-hk/daedalus/pull/1479), [PR 1489](https://github.com/input-output-hk/daedalus/pull/1489)) - Improved handling of "Invalid TLS certificate" error ([PR 1344](https://github.com/input-output-hk/daedalus/pull/1344)), ([PR 1471](https://github.com/input-output-hk/daedalus/pull/1471)) - Improved clock synchronisation checks (NTP) ([PR 1462](https://github.com/input-output-hk/daedalus/pull/1462)) - Improved code structure by adding containers for each overlay ([PR 1446](https://github.com/input-output-hk/daedalus/pull/1446)) - Implemented "Wallet UTXO distribution" screen ([PR 1353](https://github.com/input-output-hk/daedalus/pull/1353), [PR 1437](https://github.com/input-output-hk/daedalus/pull/1437)) -- Implemented "External link" icon on all links which open external content ([PR 1447](https://github.com/input-output-hk/daedalus/pull/1447), [PR 1455](https://github.com/input-output-hk/daedalus/pull/1455)) +- Implemented "External link" icon on all links which open external content ([PR 1447](https://github.com/input-output-hk/daedalus/pull/1447), [PR 1455](https://github.com/input-output-hk/daedalus/pull/1455), [PR 1476](https://github.com/input-output-hk/daedalus/pull/1476)) - Implemented "Preparing logs for download" notification ([PR 1341](https://github.com/input-output-hk/daedalus/pull/1341)) - Implemented autmated scrolling of error messages into view ([PR 1383](https://github.com/input-output-hk/daedalus/pull/1383)) -- Implemented timestamp on "Paper wallet certificate" PDF ([PR 1385](https://github.com/input-output-hk/daedalus/pull/1385), [PR 1400](https://github.com/input-output-hk/daedalus/pull/1400)) +- Implemented timestamp on "Paper wallet certificate" PDF ([PR 1385](https://github.com/input-output-hk/daedalus/pull/1385), [PR 1400](https://github.com/input-output-hk/daedalus/pull/1400), [PR 1482](https://github.com/input-output-hk/daedalus/pull/1482)) +- Implemented three new themes: "Yellow", "White" and "Dark Cardano" ([PR 1480](https://github.com/input-output-hk/daedalus/pull/1480)) - "Delegation" screens UI: - Implemented "Legacy wallet" notification UI ([PR 1409](https://github.com/input-output-hk/daedalus/pull/1409)) - Implemented "Decentralisation countdown" screen UI ([PR 1390](https://github.com/input-output-hk/daedalus/pull/1390)) - Implemented "Staking" screens navigation ([PR 1395](https://github.com/input-output-hk/daedalus/pull/1395), [PR 1400](https://github.com/input-output-hk/daedalus/pull/1400), [PR 1461](https://github.com/input-output-hk/daedalus/pull/1461)) - Implemented "Delegation center" screen UI ([PR 1440](https://github.com/input-output-hk/daedalus/pull/1440), [PR 1463](https://github.com/input-output-hk/daedalus/pull/1463)) - Implemented "Delegation setup" wizard UI ([PR 1416](https://github.com/input-output-hk/daedalus/pull/1416)), [PR 1430](https://github.com/input-output-hk/daedalus/pull/1430), [PR 1439](https://github.com/input-output-hk/daedalus/pull/1439), [PR 1442](https://github.com/input-output-hk/daedalus/pull/1442)) - - Implemented "Stake pools" screen UI ([PR 1397](https://github.com/input-output-hk/daedalus/pull/1397), [PR 1412](https://github.com/input-output-hk/daedalus/pull/1412), [PR 1420](https://github.com/input-output-hk/daedalus/pull/1420), [PR 1429](https://github.com/input-output-hk/daedalus/pull/1429), [PR 1431](https://github.com/input-output-hk/daedalus/pull/1431)) + - Implemented "Stake pools" screen UI ([PR 1397](https://github.com/input-output-hk/daedalus/pull/1397), [PR 1412](https://github.com/input-output-hk/daedalus/pull/1412), [PR 1420](https://github.com/input-output-hk/daedalus/pull/1420), [PR 1429](https://github.com/input-output-hk/daedalus/pull/1429), [PR 1431](https://github.com/input-output-hk/daedalus/pull/1431), [PR 1484](https://github.com/input-output-hk/daedalus/pull/1484)) - Implemented "Rewards" screen UI ([PR 1403](https://github.com/input-output-hk/daedalus/pull/1403)) - Implemented "Epochs" screen UI ([PR 1418](https://github.com/input-output-hk/daedalus/pull/1418)) - Implemented "Info" screen UI ([PR 1394](https://github.com/input-output-hk/daedalus/pull/1394)) diff --git a/appveyor.yml b/appveyor.yml index b39e43ed4c..afe4a1a3c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,49 +1,6 @@ version: "{build}" -environment: - nodejs_version: "8" - AWS_ACCESS_KEY_ID: - secure: O0+bBTm/Ud3pxP8nvC3ZuDSkmmlr+b8hVluqpRdJGBg= - AWS_SECRET_ACCESS_KEY: - secure: DbpP02aDGoC3Tdsi3+ONm8ov0nuXzEF/Yi453SBKj38qjROzvPXo6qW44bYiKBf4 - CERT_PASS: - secure: Y3pbyZBSORhsefMiSFBBm2nuhHQ2Hmmfppm3E+Fr7U+EXYrXwdCNl8wLwfCCMK2k - GITHUB_OAUTH_TOKEN: - secure: prH84TwXLO2CGaiwmipj05AAndcR7bDDxTv9hL8adIpr2bNjrV7pN15JKVmsxISc - # Avoid long paths on Windows - STACK_ROOT: "c:\\sr" - build: off -cache: - - C:\sr -> installers/stack.yaml - -install: - - ps: Install-Product node $env:nodejs_version x64 - - IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER aws s3 cp --region eu-central-1 s3://iohk-private-2/iohk-windows-certificate-5.p12 C:/iohk-windows-certificate.p12 - test_script: - - scripts\build-installer-win64.bat %APPVEYOR_BUILD_VERSION% - -artifacts: - - path: release\win32-x64\Daedalus-win32-x64 - name: Daedalus Electron application - type: zip - - path: installers\daedalus-*.exe - name: Daedalus Win64 Installer - - path: installers\launcher-config-*.yaml - name: Cardano launcher configuration - - path: installers\wallet-topology-*.yaml - name: Wallet topology - -deploy: - provider: S3 - access_key_id: - secure: IEky6PsMzHaKHNBMxR8tQaQI8X7qWRB9+HuEroTVRBk= - secret_access_key: - secure: cqjzG96hWB1x3JDbVSbF9E+aJ5jKvIGacJRUDWATHaTOYfSt6Rvive/NrF4lKBIm - bucket: appveyor-ci-deploy - region: ap-northeast-1 - folder: - artifact: Daedalus Win64 Installer - set_public: true +- ps: echo "No Longer Used, windows binaries cross compiled in hydra" diff --git a/cardano-sl-src.json b/cardano-sl-src.json index 197d6a2d16..e1bd578c15 100644 --- a/cardano-sl-src.json +++ b/cardano-sl-src.json @@ -1,6 +1,7 @@ { "url": "https://github.com/input-output-hk/cardano-sl", - "rev": "403e26a1d33623f4537517535b7de37773ae9259", - "sha256": "1si78f8019j3zh2y1pdx848yni2ykqkq17s18smh89mcnk09z5cq", + "rev": "9ff0015ce9e4f366c77e93976e4639077959b836", + "date": "2019-07-29T21:46:37-04:00", + "sha256": "0hwabpn1p3p8v7mxrvhkyiw9r8laxnrjpl7sjha3lpvg3b7jgwzs", "fetchSubmodules": false } diff --git a/default.nix b/default.nix index e4e75a14e1..21017c93cb 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,9 @@ let localLib = import ./lib.nix; + system = builtins.currentSystem; # todo in -{ system ? builtins.currentSystem +{ target ? builtins.currentSystem +#system ? builtins.currentSystem , config ? {} , pkgs ? localLib.iohkNix.getPkgs { inherit system config; } , cluster ? "mainnet" @@ -9,6 +11,7 @@ in , buildNum ? null , dummyInstaller ? false , signingKeys ? null +, HSMServer ? null , fudgeConfig ? null }: @@ -22,7 +25,7 @@ let }) {}; installPath = ".daedalus"; lib = pkgs.lib; - cardanoSL = localLib.cardanoSL { inherit system config; }; + cardanoSL = localLib.cardanoSL { inherit target config; }; cardanoJSON = builtins.fromJSON (builtins.readFile ./cardano-sl-src.json); cardanoSrc = pkgs.fetchFromGitHub { owner = "input-output-hk"; @@ -30,6 +33,8 @@ let rev = cardanoJSON.rev; sha256 = cardanoJSON.sha256; }; + needSignedBinaries = (signingKeys != null) || (HSMServer != null); + buildNumSuffix = if buildNum == null then "" else ("-${builtins.toString buildNum}"); cleanSourceFilter = with pkgs.stdenv; name: type: let baseName = baseNameOf (toString name); in ! ( # Filter out .git repo @@ -67,16 +72,10 @@ let # the native makensis binary, with cross-compiled windows stubs nsis = nsisNixPkgs.callPackage ./nsis.nix {}; - # TODO, put the cross bridge into cardano's default.nix - crossCompiledCardano = (import (cardanoSrc + "/release.nix") { cardano = { outPath = cardanoSrc; rev = cardanoJSON.rev; }; }).daedalus-mingw32-pkg; - unsignedUnpackedCardano = pkgs.runCommand "daedalus-bridge" { buildInputs = [ pkgs.unzip ]; } '' - mkdir $out - cd $out - unzip ${self.crossCompiledCardano}/CardanoSL.zip - ''; - unpackedCardano = if dummyInstaller then self.dummyUnpacked else (if signingKeys != null then self.signedCardano else self.unsignedUnpackedCardano); + unsignedUnpackedCardano = cardanoSL.daedalus-bridge; + unpackedCardano = if dummyInstaller then self.dummyUnpacked else (if needSignedBinaries then self.signedCardano else self.unsignedUnpackedCardano); signFile = file: let - signingScript = pkgs.writeScript "signing-script" '' + localSigningScript = pkgs.writeScript "signing-script" '' #!${pkgs.stdenv.shell} exec 3>&1 @@ -99,6 +98,28 @@ let rm -rf $DIR echo $storePath >&3 ''; + remoteSigningScript = pkgs.writeScript "signing-script" '' + #!${pkgs.stdenv.shell} + + exec 3>&1 + exec 1>&2 + + echo signing "${file}" + + set -e + + DIR=$(realpath $(mktemp -d)) + cd $DIR + FILE=$(basename ${file}) + + cat ${file} | ssh ${HSMServer} > $FILE + + storePath=$(nix-store --add-fixed sha256 $FILE) + cd / + rm -rf $DIR + echo $storePath >&3 + ''; + signingScript = if (HSMServer != null) then remoteSigningScript else localSigningScript; # requires --allow-unsafe-native-code-during-evaluation res = builtins.exec [ signingScript ]; in res; @@ -106,11 +127,11 @@ let cp -r ${self.unsignedUnpackedCardano} $out chmod -R +w $out cd $out - rm *.exe - cp ${self.signFile "${self.unsignedUnpackedCardano}/cardano-launcher.exe"} cardano-launcher.exe - cp ${self.signFile "${self.unsignedUnpackedCardano}/cardano-node.exe"} cardano-node.exe - cp ${self.signFile "${self.unsignedUnpackedCardano}/cardano-x509-certificates.exe"} cardano-x509-certificates.exe - cp ${self.signFile "${self.unsignedUnpackedCardano}/wallet-extractor.exe"} wallet-extractor.exe + rm bin/*.exe + cp ${self.signFile "${self.unsignedUnpackedCardano}/bin/cardano-launcher.exe"} bin/cardano-launcher.exe + cp ${self.signFile "${self.unsignedUnpackedCardano}/bin/cardano-node.exe"} bin/cardano-node.exe + cp ${self.signFile "${self.unsignedUnpackedCardano}/bin/cardano-x509-certificates.exe"} bin/cardano-x509-certificates.exe + cp ${self.signFile "${self.unsignedUnpackedCardano}/bin/wallet-extractor.exe"} bin/wallet-extractor.exe ''; dummyUnpacked = pkgs.runCommand "dummy-unpacked-cardano" {} '' mkdir $out @@ -149,16 +170,20 @@ let mkdir $out cp ${self.signFile "${self.unsignedUninstaller}/uninstall.exe"} $out/uninstall.exe ''; - uninstaller = if (signingKeys != null) then self.signedUninstaller else self.unsignedUninstaller; + uninstaller = if needSignedBinaries then self.signedUninstaller else self.unsignedUninstaller; - windows-installer = let + unsigned-windows-installer = let mapping = { mainnet = "Daedalus"; staging = "Daedalus Staging"; testnet = "Daedalus Testnet"; }; installDir = mapping.${cluster}; - in pkgs.runCommand "win64-installer-${cluster}" { buildInputs = [ self.daedalus-installer self.nsis pkgs.unzip self.configMutator pkgs.jq self.yaml2json ]; } '' + in pkgs.runCommand "win64-installer-${cluster}" { + buildInputs = [ + self.daedalus-installer self.nsis pkgs.unzip pkgs.jq self.yaml2json + ] ++ lib.optional (fudgeConfig != null) self.configMutator; + } '' mkdir home export HOME=$(realpath home) @@ -180,8 +205,8 @@ let pushd dlls ${if dummyInstaller then "touch foo" else "unzip ${self.dlls}"} popd - cp -v ${self.unpackedCardano}/* . - cp ${self.unsignedUninstaller}/uninstall.exe ../uninstall.exe + cp -v ${self.unpackedCardano}/{bin,config}/* . + cp ${self.uninstaller}/uninstall.exe ../uninstall.exe cp -v ${self.nsisFiles}/{daedalus.nsi,wallet-topology.yaml,launcher-config.yaml} . chmod -R +w . ${lib.optionalString (fudgeConfig != null) '' @@ -198,6 +223,15 @@ let cp *.yaml $out/cfg-files/ echo file installer $out/*.exe > $out/nix-support/hydra-build-products ''; + signed-windows-installer = let + backend_version = lib.removeSuffix "\n" (builtins.readFile "${self.unpackedCardano}/version"); # TODO, get from a nix expr + frontend_version = (builtins.fromJSON (builtins.readFile ./package.json)).version; + fullName = "daedalus-${frontend_version}-cardano-sl-${backend_version}-${cluster}-windows${buildNumSuffix}.exe"; # must match to packageFileName in make-installer + in pkgs.runCommand "signed-windows-installer-${cluster}" {} '' + mkdir $out + cp -v ${self.signFile "${self.unsigned-windows-installer}/${fullName}"} $out/${fullName} + ''; + windows-installer = if needSignedBinaries then self.signed-windows-installer else self.unsigned-windows-installer; ## TODO: move to installers/nix hsDaedalusPkgs = import ./installers { diff --git a/gulpfile.js b/gulpfile.js index d2c72ef51b..2e4211a477 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -136,6 +136,9 @@ gulp.task('prepare:themes:daedalus', () => 'source/renderer/app/themes/daedalus/cardano.js', 'source/renderer/app/themes/daedalus/dark-blue.js', 'source/renderer/app/themes/daedalus/light-blue.js', + 'source/renderer/app/themes/daedalus/dark-cardano.js', + 'source/renderer/app/themes/daedalus/yellow.js', + 'source/renderer/app/themes/daedalus/white.js', ]) .pipe(flowRemoveTypes()) .pipe(gulp.dest('dist/daedalus')) diff --git a/installers/daedalus-installer.nix b/installers/daedalus-installer.nix index d1f13b59ab..f5cd64646a 100644 --- a/installers/daedalus-installer.nix +++ b/installers/daedalus-installer.nix @@ -11,6 +11,7 @@ mkDerivation { src = ./.; isLibrary = true; isExecutable = true; + doCheck = false; libraryHaskellDepends = [ aeson base bytestring containers dhall dhall-json directory github Glob lens-aeson megaparsec microlens network-uri nsis optional-args diff --git a/lib.nix b/lib.nix index bb8683cf98..367a37d19d 100644 --- a/lib.nix +++ b/lib.nix @@ -15,17 +15,17 @@ let # NIX_PATH=cardano-sl=/path/to/cardano-sl # WARNING: currently broken with infinite recursion - cardanoSL = { config ? {}, system ? builtins.currentSystem }: + cardanoSL = { config ? {}, target }: let try = builtins.tryEval ; in if try.success - then builtins.trace "using host " (import try.value { inherit system config; }) + then builtins.trace "using host " (import try.value { inherit target; }) else let spec = builtins.fromJSON (builtins.readFile ./cardano-sl-src.json); in import (builtins.fetchTarball { url = "${spec.url}/archive/${spec.rev}.tar.gz"; inherit (spec) sha256; - }) { inherit system config; gitrev = spec.rev; }; + }) { inherit target; gitrev = spec.rev; }; # nixpkgs can be overridden for debugging purposes by setting # NIX_PATH=custom_nixpkgs=/path/to/nixpkgs diff --git a/release-build.nix b/release-build.nix new file mode 100644 index 0000000000..fd48715f07 --- /dev/null +++ b/release-build.nix @@ -0,0 +1,17 @@ +{ + buildNum ? null +}: + +let + mkWindows = cluster: (import ./. { inherit cluster buildNum; target = "x86_64-windows"; HSMServer = "HSM"; }).windows-installer; + mkLinux = cluster: (import ./release.nix { inherit buildNum;}).${cluster}.installer.x86_64-linux; + pkgs = (import ./. {}).pkgs; +in pkgs.runCommand "signed-release" {} '' + mkdir $out + cp -v ${mkWindows "mainnet"}/*exe $out/ + cp -v ${mkWindows "staging"}/*exe $out/ + cp -v ${mkWindows "testnet"}/*exe $out/ + cp -v ${mkLinux "mainnet"}/*bin $out/ + cp -v ${mkLinux "staging"}/*bin $out/ + cp -v ${mkLinux "testnet"}/*bin $out/ +'' diff --git a/release.nix b/release.nix index 5f74e5f3c2..82dce1423a 100644 --- a/release.nix +++ b/release.nix @@ -3,7 +3,8 @@ }: let daedalusPkgs = { cluster ? null }: import ./. { - inherit system buildNum cluster; + inherit buildNum cluster; + target = system; version = "${version}${suffix}"; }; shellEnvs = { @@ -12,7 +13,7 @@ let }; suffix = if buildNum == null then "" else "-${toString buildNum}"; version = (builtins.fromJSON (builtins.readFile ./package.json)).version; - daedalusPkgsWithSystem = system: import ./. { inherit system; }; + daedalusPkgsWithSystem = system: import ./. { target = system; }; yaml2json = { x86_64-linux = (daedalusPkgsWithSystem "x86_64-linux").yaml2json; x86_64-darwin = (daedalusPkgsWithSystem "x86_64-darwin").yaml2json; @@ -25,7 +26,7 @@ let makeJobs = cluster: with daedalusPkgs { inherit cluster; }; { daedalus.x86_64-linux = daedalus; installer.x86_64-linux = wrappedBundle newBundle pkgs cluster daedalus-bridge.version; - installer.x86_64-windows = (import ./. { inherit cluster; }).windows-installer; + installer.x86_64-windows = (import ./. { inherit cluster; target = "x86_64-windows"; }).windows-installer; }; wrappedBundle = newBundle: pkgs: cluster: cardanoVersion: let backend = "cardano-sl-${cardanoVersion}"; diff --git a/scripts/build-cross-windows.sh b/scripts/build-cross-windows.sh index e03ece08f7..6e178a0d17 100755 --- a/scripts/build-cross-windows.sh +++ b/scripts/build-cross-windows.sh @@ -16,7 +16,7 @@ CLUSTERS="$(xargs echo -n < "$(dirname "$0")/../installer-clusters.cfg")" for cluster in ${CLUSTERS}; do echo '~~~ Building '"${cluster}"' installer' - nix-build default.nix -A windows-installer --arg signingKeys '{ spc = ./dummy-certs/authenticode.spc; pvk = ./dummy-certs/authenticode.pvk; }' --show-trace --allow-unsafe-native-code-during-evaluation --argstr cluster "$cluster" --argstr buildNum "$BUILDKITE_BUILD_NUMBER" + nix-build default.nix -A windows-installer --arg signingKeys '{ spc = ./dummy-certs/authenticode.spc; pvk = ./dummy-certs/authenticode.pvk; }' --show-trace --allow-unsafe-native-code-during-evaluation --argstr cluster "$cluster" --argstr buildNum "$BUILDKITE_BUILD_NUMBER" --argstr target "x86_64-windows" if [ -n "${BUILDKITE_JOB_ID:-}" ]; then upload_artifacts_public result/daedalus-*-windows*.exe fi diff --git a/shell.nix b/shell.nix index 4a06243846..88d51c2ce7 100644 --- a/shell.nix +++ b/shell.nix @@ -13,7 +13,7 @@ in }: let - daedalusPkgs = import ./. { inherit cluster system; }; + daedalusPkgs = import ./. { inherit cluster; target = system; }; hostPkgs = import pkgs.path { config = {}; overlays = []; }; yaml2json = pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe"; yarn = pkgs.yarn.override { inherit nodejs; }; diff --git a/source/main/locales/en-US.json b/source/main/locales/en-US.json index 41c2e6ecac..d22e87018f 100644 --- a/source/main/locales/en-US.json +++ b/source/main/locales/en-US.json @@ -22,12 +22,13 @@ "menu.helpSupport.gpuSafeModeDialogCancel": "Cancel", "menu.helpSupport.gpuSafeModeDialogConfirm": "Yes", "menu.helpSupport.gpuSafeModeDialogMessage": "Turn off 'Blank screen fix'? \n \nDisabling the blank screen fix setting will improve the performance of user interface rendering by enabling graphics acceleration, however, some users may find that Daedalus runs better with this setting enabled. If you see a blank screen instead of the Daedalus user interface after disabling this setting and restarting Daedalus, please turn this setting back on. \n \nDo you want to disable this setting and restart Daedalus?", - "menu.helpSupport.gpuSafeModeDialogNo": "No", "menu.helpSupport.gpuSafeModeDialogTitle": "Turn off 'Blank screen fix'?", "menu.helpSupport.knownIssues": "Known Issues", "menu.helpSupport.knownIssuesUrl": "https://daedaluswallet.io/known-issues/", "menu.helpSupport.nonGpuSafeModeDialogMessage": "Turn on 'Blank screen fix'? \n \nIf the Daedalus user interface is failing to load then enabling this setting may fix the problem. It will reduce the performance of user interface rendering by disabling graphics acceleration, but some users may find that Daedalus runs better with this setting enabled. \n \nEnable this setting only if the Daedalus user interface is failing to load. If Daedalus is working properly, please click ‘No’. Otherwise, click ‘Yes’ to restart Daedalus with the blank screen fix setting enabled. \n \nDo you want to enable this setting and restart Daedalus?", "menu.helpSupport.nonGpuSafeModeDialogTitle": "Turn on 'Blank screen fix'?", + "menu.helpSupport.featureRequest": "Feature Requests", + "menu.helpSupport.featureRequestUrl": "https://iohk.zendesk.com/hc/en-us/sections/360002144373", "menu.helpSupport.supportRequest": "Support Request", "menu.helpSupport.supportRequestUrl": "https://iohk.zendesk.com/hc/en-us/requests/new/", "menu.view": "View", diff --git a/source/main/locales/ja-JP.json b/source/main/locales/ja-JP.json index f6009b4a1b..f4c977ea9e 100644 --- a/source/main/locales/ja-JP.json +++ b/source/main/locales/ja-JP.json @@ -22,12 +22,13 @@ "menu.helpSupport.gpuSafeModeDialogCancel": "キャンセル", "menu.helpSupport.gpuSafeModeDialogConfirm": "はい", "menu.helpSupport.gpuSafeModeDialogMessage": "「ブランク画面修正」を無効にしますか? \n \nブランク画面修正設定を無効にすると、グラフィックアクセラレーションが有効化されてユーザーインターフェイスのレンダリングパフォーマンスが向上しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。この設定を無効にしてDaedalusを再起動した際にDaedalusユーザーインターフェイスの代わりにブランク画面が表示される場合は、この設定をもう一度有効にしてください。 \n \nこの設定を無効にしてDaedalusを再起動しますか。", - "menu.helpSupport.gpuSafeModeDialogNo": "いいえ", "menu.helpSupport.gpuSafeModeDialogTitle": "「ブランク画面修正」を無効にしますか?", "menu.helpSupport.knownIssues": "既知の問題", "menu.helpSupport.knownIssuesUrl": "https://daedaluswallet.io/ja/known-issues/", "menu.helpSupport.nonGpuSafeModeDialogMessage": "「ブランク画面修正」を有効にしますか? \n \nDaedalusユーザーインターフェイスがロードに失敗した際、この設定を有効にすることにより問題が解消される場合があります。この場合、グラフィックアクセラレーションが無効化されることでユーザーインターフェイスのレンダリングパフォーマンスが低下しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。 \n \nこの設定はDaedalusユーザーインターフェイスがロードに失敗した場合にのみ有効にしてください。Daedalusが正常に作動している場合は[いいえ]をクリックします。正常に作動していない場合には[はい]をクリックし、ブランク画面修正設定を有効にしてDaedalusを再起動してください。 \n \nこの設定を有効にしてDaedalusを再起動しますか。", "menu.helpSupport.nonGpuSafeModeDialogTitle": "「ブランク画面修正」を有効にしますか?", + "menu.helpSupport.featureRequest": "ご意見、要望", + "menu.helpSupport.featureRequestUrl": "https://iohk.zendesk.com/hc/ja/sections/360002144373", "menu.helpSupport.supportRequest": "サポートリクエスト", "menu.helpSupport.supportRequestUrl": "https://iohk.zendesk.com/hc/ja/requests/new/", "menu.view": "見る", diff --git a/source/main/menus/MenuActions.types.js b/source/main/menus/MenuActions.types.js index eeb4438c9b..395c52266c 100644 --- a/source/main/menus/MenuActions.types.js +++ b/source/main/menus/MenuActions.types.js @@ -1,7 +1,6 @@ // @flow export type MenuActions = { - restartInSafeMode: Function, - restartWithoutSafeMode: Function, + toggleOnSafeMode: Function, openAboutDialog: Function, openAdaRedemptionScreen: Function, openBlockConsolidationStatusDialog: Function, diff --git a/source/main/menus/osx.js b/source/main/menus/osx.js index 0d83c4e50f..2b74137393 100644 --- a/source/main/menus/osx.js +++ b/source/main/menus/osx.js @@ -1,6 +1,6 @@ // @flow import { compact } from 'lodash'; -import { dialog, shell } from 'electron'; +import { shell } from 'electron'; import type { App, BrowserWindow } from 'electron'; import type { MenuActions } from './MenuActions.types'; import { getTranslation } from '../utils/getTranslation'; @@ -131,35 +131,19 @@ export const osxMenu = ( type: 'checkbox', checked: isInSafeMode, click(item) { - const gpuSafeModeDialogOptions = { - buttons: [ - translation('helpSupport.gpuSafeModeDialogConfirm'), - translation('helpSupport.gpuSafeModeDialogNo'), - translation('helpSupport.gpuSafeModeDialogCancel'), - ], - type: 'warning', - title: isInSafeMode - ? translation('helpSupport.gpuSafeModeDialogTitle') - : translation('helpSupport.nonGpuSafeModeDialogTitle'), - message: isInSafeMode - ? translation('helpSupport.gpuSafeModeDialogMessage') - : translation('helpSupport.nonGpuSafeModeDialogMessage'), - defaultId: 2, - cancelId: 2, - }; - dialog.showMessageBox(window, gpuSafeModeDialogOptions, buttonId => { - if (buttonId === 0) { - if (isInSafeMode) { - actions.restartWithoutSafeMode(); - } else { - actions.restartInSafeMode(); - } - } - item.checked = isInSafeMode; - }); + actions.toggleOnSafeMode(item); }, }, { type: 'separator' }, + { + label: translation('helpSupport.featureRequest'), + click() { + const featureRequestLinkUrl = translation( + 'helpSupport.featureRequestUrl' + ); + shell.openExternal(featureRequestLinkUrl); + }, + }, { label: translation('helpSupport.supportRequest'), click() { diff --git a/source/main/menus/win-linux.js b/source/main/menus/win-linux.js index 11a736b830..10cacab395 100644 --- a/source/main/menus/win-linux.js +++ b/source/main/menus/win-linux.js @@ -1,6 +1,6 @@ // @flow import { compact } from 'lodash'; -import { dialog, shell } from 'electron'; +import { shell } from 'electron'; import type { App, BrowserWindow } from 'electron'; import type { MenuActions } from './MenuActions.types'; import { getTranslation } from '../utils/getTranslation'; @@ -137,36 +137,19 @@ export const winLinuxMenu = ( type: 'checkbox', checked: isInSafeMode, click(item) { - const gpuSafeModeDialogOptions = { - buttons: [ - translation('helpSupport.gpuSafeModeDialogConfirm'), - translation('helpSupport.gpuSafeModeDialogNo'), - translation('helpSupport.gpuSafeModeDialogCancel'), - ], - type: 'warning', - title: isInSafeMode - ? translation('helpSupport.gpuSafeModeDialogTitle') - : translation('helpSupport.nonGpuSafeModeDialogTitle'), - message: isInSafeMode - ? translation('helpSupport.gpuSafeModeDialogMessage') - : translation('helpSupport.nonGpuSafeModeDialogMessage'), - defaultId: isWindows ? 1 : 2, - cancelId: 2, - noLink: true, - }; - dialog.showMessageBox(window, gpuSafeModeDialogOptions, buttonId => { - if (buttonId === 0) { - if (isInSafeMode) { - actions.restartWithoutSafeMode(); - } else { - actions.restartInSafeMode(); - } - } - item.checked = isInSafeMode; - }); + actions.toggleOnSafeMode(item); }, }, { type: 'separator' }, + { + label: translation('helpSupport.featureRequest'), + click() { + const featureRequestLinkUrl = translation( + 'helpSupport.featureRequestUrl' + ); + shell.openExternal(featureRequestLinkUrl); + }, + }, { label: translation('helpSupport.supportRequest'), click() { diff --git a/source/main/utils/buildAppMenus.js b/source/main/utils/buildAppMenus.js index f46a864f8c..f41d2943be 100644 --- a/source/main/utils/buildAppMenus.js +++ b/source/main/utils/buildAppMenus.js @@ -1,5 +1,5 @@ // @flow -import { app, globalShortcut, Menu, BrowserWindow } from 'electron'; +import { app, globalShortcut, Menu, BrowserWindow, dialog } from 'electron'; import { get } from 'lodash'; import { environment } from '../environment'; import { winLinuxMenu } from '../menus/win-linux'; @@ -10,6 +10,7 @@ import { CardanoNode } from '../cardano/CardanoNode'; import { DIALOGS, SCREENS } from '../../common/ipc/constants'; import { showUiPartChannel } from '../ipc/control-ui-parts'; import { getLocale } from './getLocale'; +import { getTranslation } from './getTranslation'; const localesFillForm = { 'en-US': 'English', @@ -24,6 +25,20 @@ export const buildAppMenus = async ( const { ADA_REDEMPTION } = SCREENS; const { ABOUT, BLOCK_CONSOLIDATION, DAEDALUS_DIAGNOSTICS } = DIALOGS; + const { + isMacOS, + version, + apiVersion, + network, + build, + installerVersion, + os, + buildNumber, + isInSafeMode, + } = environment; + const translations = require(`../locales/${locale}`); + const networkLocale = getLocale(network); + const openAboutDialog = () => { if (mainWindow) showUiPartChannel.send(ABOUT, mainWindow); }; @@ -54,20 +69,35 @@ export const buildAppMenus = async ( safeExitWithCode(22); }; - const { - isMacOS, - version, - apiVersion, - network, - build, - installerVersion, - os, - buildNumber, - } = environment; - - const translations = require(`../locales/${locale}`); - - const networkLocale = getLocale(network); + const toggleOnSafeMode = item => { + const translation = getTranslation(translations, 'menu'); + const gpuSafeModeDialogOptions = { + buttons: [ + translation('helpSupport.gpuSafeModeDialogConfirm'), + translation('helpSupport.gpuSafeModeDialogCancel'), + ], + type: 'warning', + title: isInSafeMode + ? translation('helpSupport.gpuSafeModeDialogTitle') + : translation('helpSupport.nonGpuSafeModeDialogTitle'), + message: isInSafeMode + ? translation('helpSupport.gpuSafeModeDialogMessage') + : translation('helpSupport.nonGpuSafeModeDialogMessage'), + defaultId: 1, + cancelId: 1, + noLink: true, + }; + dialog.showMessageBox(mainWindow, gpuSafeModeDialogOptions, buttonId => { + if (buttonId === 0) { + if (isInSafeMode) { + restartWithoutSafeMode(); + } else { + restartInSafeMode(); + } + } + item.checked = isInSafeMode; + }); + }; const supportRequestData = { frontendVersion: version, @@ -86,8 +116,7 @@ export const buildAppMenus = async ( openAboutDialog, openDaedalusDiagnosticsDialog, openAdaRedemptionScreen, - restartInSafeMode, - restartWithoutSafeMode, + toggleOnSafeMode, openBlockConsolidationStatusDialog, }; diff --git a/source/renderer/app/assets/images/block-consolidation/epochs.inline.svg b/source/renderer/app/assets/images/block-consolidation/epochs.inline.svg new file mode 100644 index 0000000000..08b79b755b --- /dev/null +++ b/source/renderer/app/assets/images/block-consolidation/epochs.inline.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/source/renderer/app/assets/images/close-cross-thin.inline.svg b/source/renderer/app/assets/images/close-cross-thin.inline.svg new file mode 100644 index 0000000000..1fa2f885e0 --- /dev/null +++ b/source/renderer/app/assets/images/close-cross-thin.inline.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/source/renderer/app/assets/images/header-logo.inline.svg b/source/renderer/app/assets/images/header-logo.inline.svg new file mode 100644 index 0000000000..626c8a33f2 --- /dev/null +++ b/source/renderer/app/assets/images/header-logo.inline.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/source/renderer/app/assets/images/sidebar/bug-report-ic-dark.inline.svg b/source/renderer/app/assets/images/sidebar/bug-report-ic-dark.inline.svg new file mode 100644 index 0000000000..cc4732ddea --- /dev/null +++ b/source/renderer/app/assets/images/sidebar/bug-report-ic-dark.inline.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/source/renderer/app/assets/images/sidebar/delegation-ic.inline.svg b/source/renderer/app/assets/images/sidebar/delegation-ic.inline.svg index 5ad8321445..11e2d388c2 100644 --- a/source/renderer/app/assets/images/sidebar/delegation-ic.inline.svg +++ b/source/renderer/app/assets/images/sidebar/delegation-ic.inline.svg @@ -1,14 +1,14 @@ - - - + + + - - - + + + - + diff --git a/source/renderer/app/assets/images/sidebar/delegation-progress-ic.inline.svg b/source/renderer/app/assets/images/sidebar/delegation-progress-ic.inline.svg index 1ccd440fef..0985937afb 100644 --- a/source/renderer/app/assets/images/sidebar/delegation-progress-ic.inline.svg +++ b/source/renderer/app/assets/images/sidebar/delegation-progress-ic.inline.svg @@ -1,27 +1,27 @@ - - - + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + diff --git a/source/renderer/app/assets/images/sidebar/paper-certificate-ic.inline.svg b/source/renderer/app/assets/images/sidebar/paper-certificate-ic.inline.svg index c673dbf88a..afc1e61f81 100644 --- a/source/renderer/app/assets/images/sidebar/paper-certificate-ic.inline.svg +++ b/source/renderer/app/assets/images/sidebar/paper-certificate-ic.inline.svg @@ -2,14 +2,14 @@ - - - - - - - - + + + + + + + + diff --git a/source/renderer/app/assets/images/success-small.inline.svg b/source/renderer/app/assets/images/success-small.inline.svg index a54111c6e2..98ba5a660d 100644 --- a/source/renderer/app/assets/images/success-small.inline.svg +++ b/source/renderer/app/assets/images/success-small.inline.svg @@ -1 +1 @@ - + diff --git a/source/renderer/app/assets/images/themes/cardano.png b/source/renderer/app/assets/images/themes/cardano.png old mode 100644 new mode 100755 index 43af422770035981129e4a83d79f91e93424cfa3..b1f52d80753a80ac2f3e478e5ab655df9d880bcf GIT binary patch literal 4566 zcmeHLX;4&G8h!nI3{8X3vYG_6Q2`^MC@RR>Bbx+hKsFU*iAE5SMGz5bcr73?$YR{s z!E_V_gf_~K&>9iRgdLO}6lqpz_Fb5JAJ+Vss;Q~U%v8;f{GjO9ynD`f&v(9aZ*kR% zVX~g`B?Uo{^`?gm4GH2-?nu0LzO?&N_f%PAMdw&r zNw~=-rkA)5nM$MM22%}* z?rjP`(`fiJL1H0Y5JijD1(=BwOG%@;1Olc-rE=vm9DgL1l3n=#pePW9!jS3&>QM(&eT1@7lUyY^J6LFx-Lmm z7IoUXs~@J1@xX&majL$lg`J++w%euj1#$=7;)vgHstiz_1)G*`5oVRao1(H4-Q?Yd&f6b0d9rrPj z+;R6TiZRSx&xLOF3hVnOVP(sk>D?i-HEKZ%yituinexjkRlP0AZhcX!BH~G?jZa&cq-4O{%pb zz`b>4v7fqMdfi;c@%7Fv@IE+*K z52M&^iH*)(lo9<)@(~^CL94S$W-0vH5}xFU{-+C{Z4oMzP543{WxIDLFuw{uw_+=i zP*Zm~j~|iT6B;x$X2~3A;|&)rROTvQh#acBW)dd1izzCAofD^W4_FxN!gfe){M26% z_mkI(U1LUZQmTr-dL*x-Cj4!Idxb}TR$-%tsaRpZW4*3yiK@h)t?Q!PAWtUu_C=9g zjl8(!+L=8gL8>e}3c1(L(=i%hC32@d0~4!$$#da#I-6xElSrMn%FYW-A90;utUX-1 zS!H4I9%HN$(*pc*&mC{m(*>?r?$?(n|5TV1_rk+jBY1MrI&XX*Y6Kv+RNX&~ekUyA z5~O`CEokOQ@{vo+Eovd}9-VmhCYpS68x1#0y6r4vyNxqj>d^hkX@EW395Vf(ov#rW z9GSOayFDF|(bkHQ*zV}cX$r}m>gmxrC&8}RxB8~ASUy~k^`!vj8)K8NghrA@()AYI zOWB#pViV&utA{v}8^9?r%D`Cf^t~e*(p`kZ9lXou5*wPthBofMz(|s-XzvWI52xQl z^@Oq;pSMf1#IgHsr7O{QUVI4fU+t;u?!hLs-R6JS%vqhRq$X+0U8FuZ%9Zl1Y0B4t zeBJHq&saJMFNvjzvi0{?1So_EC#LMT!JJ5$gAWzxy)Uu9tTL5y_J!$?r;Wfm7sa#b zFqPtO;Yh8gY?3^Tw{nnT<>u{rLLlvEKQC|FwZKd(S`1_peo1lfKBYF9TkX+t(i zWf~qWm--48o^g^ya+;i;X28NLLEHaZ6up5Fm9b+%F%|QTW>uH&I&1)?avRY*JDr_M zc=jx$T)}#x$Gt8^$URAa6D-$v59;XX_|AArsb3zqnWj8Uy~2+amZ1#UCxbt~c5(Ih zS3iJ%646{eFcJ^!O4@2Z1{8tj=DAe3LR%?n2$6 zC?~R{;PSrahh)g{a zgCou{PwZgDI5!1H()z|DAT&A07@S0}+IB!}x+{Z@)cFM+gxHwyr01~$v~E1(e22@+JUzib)=Mp!MtnJt=*kp%Sb;1D?=YPrVgiDBcODUa5m zdEh}dN@Q)_D9d;l`W?iuS=sADb%;9mUutn`+y3XReC8!yrK55Am>S7 zqbG7PuOM>9DInBTz{eO!`HK{l+ZJnl0s>n-0YY6YnKgzLw}HlZnXq@my*vPi^IM(c zm$t%!y+C6M*bN&YY_kf-eu_7$YT>H0DKnM64}3?V4h|bcIgw<>dG%X}cYqEf$q(hA zspuroJY4?tbx1u7WSFUGjwNbBKuz5Er-UbFfC`JJJWYt2a2(m`dgvJ8iA6AmO!fS& zu%_+c1|p-jO_lHj6Tp@ywr_xZlHfifyzxhA!V`J`w#WSA_mGbQt|0;hi0u6a})2_VElN7{UF;hV8-C>P9f@GDG0yviglyu zP;@O|{8WzPP560nCy3M)QBD{kqanCKzVHSYFd%6uj*Km7b61F-Nr0nJsMLt~%mssjmB2uJ~-{RckG%u{1c`cExKFHo)3Jlzsfl zkp&ebtAMl+5dVDJUIOAUPbfoEAS?kAsf_-fc!}x(^0Ls!O8}Niyy!+;yl&?U_$jNCV z2yF*y$*MZz5BcM>LG+*Bvq%V<1#nyX@(;lBU)zD`*ZP7U%91c4VriIUU)o z*r!Q6cvu77zaMFa)bw685-B9%S|9NM7Lhu)=z&fJozn#|Di%Ha=(1M%L8SIJGwjg5rLVNmyC+95z5QDbiM9?2Byk z)gahKx*mv`^rKH3tM5h2I3CEmLF8!?o=(bKcnA(hpqn*#<6q1^68o(U5usQk7=om9 zPbdjU3mVRDm4p%^ti9l{=Vd0r&X5g3uy5aQL?}YDpd)`${3+BwohJV$j$*Bnu5Y(J V=R9eV4gOJsm>Mw*a}T;+{yVQIchvv@ literal 1180 zcmY*ZeM}m67zSOfadFw^n3LAlMolx=vSwCA+tIFKr%T5gSIXQVo7-YPsCGDOw2?Z? zv{R=|ou}4nH8tP{a`lrOv=&#vDT{VO5gn8d5geR=4nHQS-JPsy`^V*e?|bj_ywCIe zlB+mQ{U9_1AA-SPLetYI85j&!i#!3rfk@}ZuQ}(DBJ%jL6RB||GKoZ@QmJGzxwEsg zsi_G7fS#Tn3WZ`anJg9yhr>~;)vc|qjg5_Zy?$_TaCUaqU@*w#a8)|QZv z;BYvUN~KIDTU%RmyWK{k(dYB6uC5Lb4;K{`)z#Grg+hTqP+VL*G&HobvSPE@5)%_) z7#x{ z-QC??Utb?bI%u1-PiPIs*}or7oAl;6uWx<4e z3MZ?o$yzFh^Xhz_@FUEK+)0`FtfjU6Cs?)vq)G`E@8fbfhzYQrhHsf_S_FM4g$c%21U6w`Tfh%+OCs9#xWA}>mz7luGX_?}>Ff=5dTmU)H0fZZ zS!!Q^UXs%o3L1k8RSKaXHjd5?ogsiTc*SzTM*^nXHK$H-dH>ztdQ*~TRRTmh8>c0M z$OH!kd7#|Cc4!mOItQ(FD9H*kV%$wgis|5VL(^?bLmsRHa@D2xl>!^MkE8U&U=~N2xFOSD*@b&;;zg4 zuOc|Om?1&8SsiyPhzOn`8UG!TjlBK(pE)3ceg6wa)S<4GfM3_@RT^hAPWuTmyouNT zamcQ`U_s441$)?AX@IC}`1$CzEV^Cs#uS${CKiOl{4j)`;Ky&}eG1+8Y-39wVn7Iu t`)}lF<4N*Q?gsrH|05a_nj)QpEeS4rv+H(N6!O=>q^D9T;E^vc{|CsHjb{J= diff --git a/source/renderer/app/assets/images/themes/dark-blue.png b/source/renderer/app/assets/images/themes/dark-blue.png old mode 100644 new mode 100755 index 3cefb90395831f5c1929e15835e07ddaaae85498..61d94218d55a9c6124380db4685adf2396052536 GIT binary patch literal 4479 zcmeHLX;72b8vYVP2_O(a!Ag->l%NQRqM`@{tFkDI><9=IM>ZirWsx-zttcWY6vPmg z3oXJGs6{MmNEM6=xDaHMm{2K^H35-D0_izlX71nnqj%c5GyTDQ?-v6XID>d{wb9EKYf>6uDzCexpNOj>I~4ccm{^b=^7h=5zCQM~|@{6u;TIxMOkW zB86GVf7KjuFwg*l*_(a;4BlN|{A7;B7$yzQKh~D!+Y38b9m|=C(!soOiW{~@lfbUg zd|*vil$&f3jfIN5W=l(K`3|}%r_bqQJ6IIQdPO(d#cJh7{bm1UL!Zhh`}8;^6iuiy&M<{uVzj6JH|eXJ;ijMOL@<_ zpBTN{pLKepKT}eF`uDJ-d(Lh1XC_uE@HxpdAD%5|*qu3crb?cE6Svc7oq1eI>3Lb) ziMK7+lV@9KA=31mZ6k1snsvd`dV_^l zQ}4}o%`LE-J$$u{{p_5VmiuPrf8}&Od>~y4S@5i09Pi1=&E<+zEWfvsh)Z53_npBW zz_$bck80k8K z!?&u}ZLL>|{1}pK^E{Q^i^GX~^(%C-a`=2}{-pJnVT+%!_-s3(LZB7~gH2U}t19yY zyJOj@s!!?LwFvC(q!=)r|CYOU_?=$-G@n$tJY6ZZI>&o9Mp^O?*ywVXh8V}3RV2Ao zvCG|bOT7Y8g8Y@6ru)Z6QdO<|dcvF2$o62!N<+)PXQ$zor{;3?MV}I*JFeZHOG=(< z%k4?bpr{*okdfRyyQ4J>`~nyHYtKq}Db;;#Q?b(Tb8@RI7uNDOxKw~R(WgiCw_@o* zoOeDo=|L1--;awd`=S$I0;XrWoQkM)jYA~v4Lw_K-*(}TqAz((_M8!JuqTUkw$s;9 z)9U!|)$0Y!pSsyoMp)cQLu!)x0~5(eb?BHRG5$mG3PXzN!t79`p;VIF;+Q3D5gf?KrL~uigMZ0Inn1#z05oZM z-iaD$xTSH3Ls?P|*hr=!^y6{^7%huE7d41v+J9^glDM*(z;3(dGzdw!{0y>sE504bob8?@DqJUOU?T+~8CCMhBE z=;86|C>i-hzeaY%%zz$VQl3EJ;DvZW_X$lIei`6figh5IMh?ed25z@wW%vLxGPmpg z3YZ8&2si+IvwURu&j7#tU5t!OB_I>NO-Y7N0eJo^6&aaYTBhD9N6(k%m(mwULp{rI zcy~kb@SvVge5`!_MP4!7<Nr5kwID`+HL`>j4m8H!2DsH2 zH|w60sq=2`?|J4B?ZhHdkq-Q%&3ZZ7>+Im zzAi~yWe2whts=04@+%79ONmW1M8*1RIdz~9AaLR}WfdeS18+j4J<7DBLmFET0v3fH$u>x8 z%{`FXDQfLOC?g7t#z5bH4bg6Nif{Vc?Bmz{dFdR^>oj9D!e)U=oWr03n(#GFWJEQ1 zVgrmo+`3vEb-_*1*;8rgb6VA#=y?mU=dl6Ue%0-b2HbxE4EvyMDH$bH0tmf#|Adxd z5D=PI+jJe4^sxbv#xeJ>L^a0&&B^-}H$cs%pt`0`9?q!dW5AwuZ(yMT242O!OAET{ z#w#kAHJN-{#60zlzzstYPnTZ|jt28km9X4^I_P0gNsXo;)HEZ3Y0gQaonboiz!{() z$AN_;^MLD2E{qjGCfh)x92Q?g{kj1#lq)Pa}Tr4W_ z2@&M4$l@kch{p%^pijbIy()N*ha}hpY=`a8!mXzDrA(V52DoNKMtaI99|H;3Dr}P_ zoBcBGekz*FsxJzIzB$n7?SY%hRA z?c0OJ1ho4=hxV97G@~Q12F%>aRf^Co>9@gX`~&zWOaJe!A!u2wje5FoW*`#$qJr2T LaN1wBFYx>y4>4c> literal 1166 zcmeAS@N?(olHy`uVBq!ia0y~yV7v~*OdQNWk=ZMA^MM?-0G|+7B@;Id3pW)Lx7Mx+ z*+rG9IVF9Qr>mN}K6vop@#Du{!EvWfpDC_v$jmRlbLY%Nl{rdH5 z!II^#UcK72d+*ZatA76c`TqU;`}gnv{{8#=_wSpxY;y~UPRTB6>FjT6@AU|ZS+j1# zw{PE`J$v^0_3Qly4!(W+_S&^;mo8oY@Zm#EWBc}#HU&ke zWaO89`SRuS=g*rrZ+`dg-Pf;Q^Gd426Ef`gl8#m9GGv7BnvAt)~ z#HlkUO`BES*#73to0l(N-oAaid%~2ow6wlS)6#NF*(KG)G)(mD0+dbNb!_}p%sdiO zvURMzq*M(hl=b72vpA&GrPNKhWi+{EHMwLoIixjI%-r0f(m7=``pq|GGcYhKd%8G= zR4~4|c(jz6QGn&5m@yD|r_EISUvWm^Z63qC%D?`l`hUz_TwKg%+*FjYoMTYDQ&FmN z&xS{zosGCy5>-Xo5=1%=Md|QuJTcSb&@5%amXIl4OA>V_pRH67dCGlMsG&$TqV$3D zTB(w&j3%>M#f~g0TXcc5j9b2n;n#dqi9W7QGnT~>53g4UY5eJOGMZJ!ZJ+kJInKc( zYMs#Qylwy%(DF`1Y|aV2zcl+1n&$ zV)J8HyI9Koe|2+Xoq2ct{9DECs`34=DZB5BcfViDt-A2;bGGoV3$;HIKmQ16Hv97D z)3tTA66OLe3?h3AYqu4hd$phQ`+*MTw|nj%+RgFXns>%OHP1;ZK(zIB`ZtsI*Gb<( zo@%Xoq_r+)XVKGBp)p58V-6RJh8K!nf3ricIB4tZtiM0EXqMmgGrSQ z(Un~bQv3SxuHY^A)>R*U_0CFD==!W3U8{Eh&6x^P3zY7Dv?}6k?9`3tEuVyMsNY&| z`|S8sklyJab;ll`n)+IER@Lrz$t!oi7V(T(4RppMh+c?2o!L63<-NYMa?5ny zj%z@-gubtOZnflf^Xm!g($_if(%VsVRbky)cgv4Ew#n^1_SkA`xAyf2a43LX4+;)2 z<81rRTh9xC-p-W<1`9Y0Kp_?-4+^A2pp*UACGXm|3GQ&HHn@I>ZbP}5?IbKc)I$ztaD0e0sy@hR4M=f diff --git a/source/renderer/app/assets/images/themes/dark-cardano.png b/source/renderer/app/assets/images/themes/dark-cardano.png new file mode 100755 index 0000000000000000000000000000000000000000..91c1c6e5a2f5b5965840be5bb4adaba896723a85 GIT binary patch literal 4505 zcmeHLX;f3!7QP9gNub3rC{+QkB7!1Ntpy|?!7@_@rGm`XYEd+ZqJSW9Bc*69paP0Q z0uBr!2rY9M5)@kdl%Y~U8RNqm1_|*ILO=-boSW74e!TU5bS?k9wfZ9~`{vwz_P6)` z_ID0k^zv}}NM(%*f*>EcINR?<5P|@F)F>Z-U-sN=4Fz9>$h}Uxkp~?*;|QYe?P72D zWej0zXenKH-)geBvdfp-^*ynSB6nW6#@OIUT~I2%waxjJliY5Jy0JCWsQ9yOo6PSz z`1e2CowaxGmTOTB@k7i$x|>K@Wp%XZ$_(B=^N(90nfonpA z-WVd)Q~2ppC<3)ErVHGIM5>s>cc6_i7)Uf0?gn=NyETz1wCsEQ!NI`(A4hN96YVMU zEt|AMLkWc38OiS+s1j@4u6cXzvYhE%R^?yr-dcJXSb8{R2IW=eeb^FA;qg9-AP%zux<26z{ z{i0{q_(~WrEMx_7C-v!6|B}SjL-~Fd!jcgOYMAb3&9Wy|N5%C1iMKCPLc5by^9qI< z^xP)NEpfupXKl%n2H&|vy}_i0e(i+Wz<%yjGu_k8EeYMVAiCJH+$$;DBMasw=r=9? zYr4Db()H%3W*$oOV<1kPw0_E=tztpah>KZc#fgZNhMIL%LCuZX!EsY7#^;5JS42(G z3GQq&6O$rea!b5?vFMo9hzn^0Ri+zp_h@l4!;ZMms9C;{GcGL~I5ttDGBmZqrsB1@ ztapgF?EbQ0Q;?wp=$v}d?M=jFO76~?ld+@iyh2Gq$my~{`LlIvB=cF5AGj^PO;sAd zlfEmw;=DJtRb&4^=XVEtO4krc+chlDOh_hdtNP7l?C_P3FJ1C|=4RIPye?^EQJS^G zR<bkMQYo2sUbHAUTi)vD0M9-^}XCwLogM@bZ8wrHKXFFzh zqnfPbw_UuZ)8#>e)&i9&24y{HL;yefXJU3XK5HY3S@6HLgugk zR-O7$!oM106Q*3$G#-0`Ws6T&YCaAYWO&Lm)OhiS+~aku7ClNj=1{Mj7-Gu2y|DiB zMSe@7&YE+*GpCrSKM~11af+x^z9)6HT+8F9SONII^B7 z!cKU>%ch0O~{ z$M2R}pF>HCSEupgZ&dAqs)c4^h}vgrZBW1%AtX{n$fhz+s8AFG6#G2&^KDS9y0k%u z{u4sBvD9l+_WEE4o4(vmUNnKh4jBv7EC+tuoC{H$S_S0A({l>?UM>Ry5p`O{5TeLc zCPj2~d(#yjC|0SiLu4NdBmMBfe-;*g_38|R`iImDT-2_C2o?zlY-AWu&t zOL&I2w?&5o(G_Z;Tv-U*vV#9ilCXNB=LmFu)%rf@to<3lS>a z`}py088Il{!S~$il>o_sQ-o-K##(>HVY~zIEA`hvyr`s2AmIC4*>5qg;bXM#z%++l zP*Z3IK>a}CE_AJr=HF3|vBP`UuSw%i`3+ozX@OOe_`*X~2p;X?08(`Jdnib;5yhOe zg5hK#EGej6TyN9{95WC+>)T@3BtS4j6dS0l(S$bbV=%tz$=bMkz71#)r4T4fksgY{tCqm#U7{#3OG{H zi=72oTY=`V>Oe2YF4F~d)6^_{)>;6`1TVuTeu<1!sBbpN)3a505ax+~0wztbvwa`583#6i zfl|-A1e3$~F<>IBEqoRFdl5|MdkqxgWCPI==PqpgL=GQt*oMOF_>|50&A(CxwxEdvqd;5td8ymiw5r8p5pr zv->E`@hb?#>n9+5XSuQZiUp$OnI>zbUyEN Wx#6pEA^2Yl;^N?8|6uol^Zy1fb%WRd literal 0 HcmV?d00001 diff --git a/source/renderer/app/assets/images/themes/light-blue.png b/source/renderer/app/assets/images/themes/light-blue.png old mode 100644 new mode 100755 index d818cca910d347bf5f8f55e965be31d6753cb5c1..84a37416d180ae220004f7f1f171899a72043159 GIT binary patch literal 4644 zcmeHLYc!N=8-C|ClW`stTboQF?2^75GvqBaW2<3DYCENNB{}AhGw*a#Tg2ARRt6mv z8QK`+7^Nc#p@dP%DNN4g^gYjOt^M~~-&*^}x7N3RSf1f|?(4d*`?~Mv;hY_tDJ8yA z96=B%YnJ6M1R)8)mo#-5_{mR~A9{dqq`+OwZ3wSHc>qCVyR0p@I)svjJDtzF?p6{N z?!N8rX``K@@XSDJcO&8!iqE)5qO0`B4m><^-qP#h-d`HOJE^FzpA;HK7nhYZJ!^Qt zvN02rwM$}bwL5Wl29_0){kLG2<~eG*K|4_C9||& znoRZ=?dPi#+tK!EaOl6)p6Np(z2le6Qzux03469=UwZKNl7T7F*zm!l6@f3e=s66P zQ9u4b#{;=(m161}@+SnRdl-t*rYB?UR>I_JiG`M6~Rx>=kmP|mvLfu56y{9HRKGa50ndy-Yt2FISLNsIZVRxPqjc&)C{Gr!#_ z%9+oO0;$UVkzrpDu7S~`IQ7nM;<~=k+R8=Vp2p*5nx{uyC+-M;FKRp0nOCWxu)%m^ zTJ&JHzwjDme@_i%|Cf)CPl(7+&1dUX_6t+Tnl$2SG#loz_IrVQ{%EgM^Uj!Szwg5g z6~5A}ol;?BZJVD}nYwQ}{Gd#2=F}ZrF?pbFhf5fqG=wp>A%b9_jUfU*P_r4CE zwzv?RmENg8neu!$wdzawr&7h5zN%=e(EXcODJpz*m*}T`HD8#z5g&Z)dm`plN2E2= z{aY%9D&6h1dy4pkCZYqxJ89{6VhTEGJTOwXvsQqB;o7OzPU?@ZX`_dz?-rk&5!S1^eLpo4 zHE-maH~gl#-~VLr>+tTG2Sq&`rjfprjVxz5c}~_*+`dtSbAr;^J;^dY@*udUWCin7 zglZSf&}WrQRpooHBHOtni49WEWt>+wgid#Cn`C_GSop>oHdsz$S!2i&KLu#EbbV{Dn+*6iRNQ-Hwhl<$DI^ z9s=2{H{jFpQqkTrajs2{`sp;QFs*Z z(|nOah#n^a^dD2m*J$+MbayRa?FD_4Rp-;|uiYOFi7AiaJDYB&+W<@Uw(IYt`*9wp zhpwHQJHzM;Iy-pi2h|SY=d_Vvc}^M#!ftL_$2mdfxr79UhK&VtJ<77%qAHJe>J)Uo z{}=iOkn(0`9Yez;%Kr=uDH*Sfc@ch=G5R&4z0_;^?sRA(#zRr#wxc z%IM7O;*{mn$07W5392AHM#OjvX9FcW-*xu-zB3kUyZOSnz8Ec2v#)Z=uM4_H-4=4} zDw>nxu%~D=*>x<48;`9;7gHl`yMv7uw9^c~?wGke)GE=vUWeWN-@ z%J#zP!CI?KT{N9EeW1L=A=Be8uz-F<6^)8O&Mi};?J zACD^gb-nPZD*0HiD)bWro9NDfT!9L=j`-jK3N}75!G@&%5+0m>@-v3?nVMC|!>D{9 zcgHKwG)VBTi3t&MairmR&`M1>&C@7k|Ayvf1|)lM9sTcvC{}xMJSfm>?rGM7LGkyU zR*-5D#WC0P*75ov4w8OJYi9htmFVe55{kN&4i8!qCEx&o+*wZW%HoWH zuwi<^YareeaKm|QRM(M%VZ%T*%TrBc3FYX5`tLSiZrUof57rUk zTmlqq8u_cinuMN2(NMeEHh3J%)BskKEA)YDygCy{{!WQT z;kp3FE+6-(rpUCtf|ztypx}si&~`|S0^0FJ?9dU&ERlyJ><~i}P*nuXO|t)k+F*T{ zGHVZ*hK%pIL}4BP1qD4OD`CPnfcKiY@eMF+raR{=C8Pe;8cJO;+me?F9XucrG*gSFPsk|YEJ=Tqp^c5f_Wui9<$wqs67h8ax8+?3Fi9%b8|HnqV^oXy!xt%9Kl={ zFwaPmhK-qtkw`8AJC$<~uSrpO{M5k9+Xd2P;c>hMY42Y^oI)*ul7Cz~AJQhF&7hc0 zH6AcNz4023_{w%T!ZqgZgdw&zGdq@?0f_4y==c=|rS1SSdx~X1G#rZqJgmH(iMJTX zlSDGr>CuCmXh(jkmN-^;mfPX@!C5oF>*p%)v)ek2uj8b{mbpYYh(in?v<rBJyhSjfJ_P8Y7VF??g!2}l8>XTJdm2#TgH$eY zntT-OdVBCcgN!Tcm~Dz)u@nxB2ePRM?@{kzBH%`4kd87lX9>y)?Mld3*i+>@GN^O^ z+s)5~Wa`B3YCSKtlBZu#%_gQZ=`OVaoLIIt0P!8?WQY|G=S8Mh)Z#9xOSnopQXiIsbS^ z_sKAi(=T^Kmrz?)2qjB+f6Nk1QcWY1g*2MZR>Hx9AhY`iMqqVGs0EEyZGjb%iI%wy z$}{w9X$GtaRdOqa$dF#i5!z&eX~tXkDSAl&GVmqY(q_q*_krGjD^Ri8U5J!Qb?{5- z^BLQubjdJ68;lIy$0Lo9Ok)x7a5y?e*wYOpQ-d9&M7PRSpw7MP6!wDETBHS0ABxSW_@`wYC6sMsVTjQIdrP8D@4=n-&oBOw ee&XMYO@L7V literal 1362 zcmYjRc~Fvh7$(gf#@RM%rek&8wWgX~bvHZIwN*;Tyz?MXE3CG(tq4VoJP;j^Jj#>O zXcb#cQ~C^bD+4KStJShZ6w(A0g}4NTz$4xLKA3iz`F%6*?|Gm1d7j_<$CnoplaPS zgQK$!N2UsdGp$_%djn&0X$^}@%gvmBoI~RG2gMauHt!20VB-p;GF9hGp678gGA!}Y z)4qkpWtDpVVoI6+nRJ0rvb6k3Z&-ZV{njOzhzv`J&!VT7)D=}URWLZ-Sc*q@Qh7bQ znBJU0ttVZjI|mclodX~B3llTSqZe{87xN@?O;7(wK}C~Hr5O}V_(oEEuqm%cgtHoL z+1-|o7hI`A9f7}oD!x!KKFt+O;8SU@xMR^tH}(X?;?rpAIbBU-hg_*ix>mh6kdSqg zF|X5Wbb6U;uC}RDK0B}0>a{wL=Hjo?X|+!%g|+*R5DrBo zjZR4XPNn^ZzS8!b>v1gEB_y8lsGHOM259Noe z1R-Dh(V){WoJ+jniXxR&KOTNB{-D&%$W*+ssq(s3)cNcxW_!Tt^t+86r%A<`)cQzb zp+Y_X{PoBnUnrXXzd6U80ErxOfSIt*bSE=bu zO2eIYjX|9j;t1z>dUhjx6TNo8In~u?5x$qOZg61Z#;Y|^YpL6}poThjQ7gAa*&%XK zwIk;}1T{m}`MdTxgq4qPOE4p_ZH~Qj-8?Osv9`4I*or|rZ1wl=|9W?yeTF@75@@|Q zV#^!OJXTXRs9`YJy_%m|Hz~K{Rngh&ZRnAw#>dUeN`%O&v_mUPM9s%$$Ndf8e`_Ir zNh7D6;ffXLW!)=>2%k}jqiA}L^!o;PyzO@p$Mp+Vt!7<0!%jtw3KRmV<0Yny3)W6% zMai|e7n|X`ou3?RpH*fM&IW5&F%Q>wm1G(kt!>?0-I7<5Q_L!hhaPILclHCgoeQ2Z zG3wbZoi_6t-T(#df>^r-5$T(K7CZ0`ZE@%c#r=e3`;VW7vSy{XR9xx~Kk#tHlQKA; z-+feO$DFcbn#XMl2M-g=Ce9cEZ5-vqjf;Fk(W34)C)NE`U97R!hr#wb6#=YkxF0}1 zAIUs8YR$KW6q2yL80<3Z8o<&+TF(kt#Fa=98}Obw{u~^73=P?bgGMWZLRJez!HYqs zQDd{fq_}v{fk}aMw2;nMai#xue@U>0ES;Huzd?gBZSsI~re>)3K_nc?Y1B97^oByr^f~2%<_b~E{j@LmCW-&Gpu+ep6_oi;D6?@4hu|C5 zzc$?F{NhJfEcK9#o0zid`P>Isg;0$#MFM>Q);A^~)AT}U>--X^hL!`;j6k{(z#*Wf gN%8=+?r=J+%y9om40#d({wraAhl9MBo~JYZ1D#*$EC2ui diff --git a/source/renderer/app/assets/images/themes/white.png b/source/renderer/app/assets/images/themes/white.png new file mode 100755 index 0000000000000000000000000000000000000000..4b49c4f1bb0ef04e66c6c2fc6676a21a3c0ab5e0 GIT binary patch literal 4468 zcmeHLX;4#H7JhjIi69|@G_))R5fM?qvO(7HL>QK^qoM*r7u`a`K&081CNJ7ZDGk^? zG)RMhqlk(utsuxEK}FmMOH^zTi3O=Of0A>P|fwUlo>J zUwgO1OiL};`%~*cc-9eH`4dLW=;4GxKcSUSD%zYd7$CIm{%9ngOGv!psjaOY$js?M zQ&UsVjr(bnP%`BQjmB@5{cMjT@P+n#FNUzTjxK;lIwsIW(Rt1A5(gYETBy^wMT#j5 z!p`ypjxbjJQUR=RgySJkp1gRh#EY=Y(WB$JoDn19h!8&#spWE+P>rw)rBDQ+Wyy;F z;%bdzU~|Iu?`D4sJKq0;U19&DacfH5HaZ?qQu1Q;7xc+jsUOQ(w-%1{xlN@c2Pts! z<;h1M@%?N#0<<(u?7BF4M}_~}^)SP#FKP<F^UiOl_^o8Mqj)v1yrCyAMcYSBYx%Se=#!9EjNs)omn4rA#=W_Fa$I>Zj{iye zVqrx%JW~Rc6t^Oo3l8pQ)51NtreD@u?3hsvcNaV^+?mDN!=4*V9BWtD5V%}C_tZaF zXRyP#rsdjvmC)F~`a-j)$=FVOU;ljnBpLk?#CGAEOBq-N3P_)y;fXW1ylegqus5+7 zIxf{`H(O;!OP!1pTgU5)Sx$naA*G0Nn|M_^&6Cbvn$NKjY3}O>dA&6q^})w0VF#xS zMJ-1|@|?=TILlhyp*g?y=N=rWCr7NN2o8y74a`D0zjCZ+7eD7mwCa&aFMDe9+{!dK zow}(XPPCO5w|#xKCXqJkfgy7iJ`!3uCIFQY)FOG8owxYJ&#OGG^*F`?nr=AxJ`>YN zh25pWEuB-|Hy5f5r{bxoogzh`TXDq@Ri?aa_%Ut%b*6%GmoPD5Ir72oO@>9Fyt{Hd zUz1;G+-LReh`VZIKOHEfIBHC`<@Xw1V4ylm?-K7lWcB?xBxl{`x1S*{ihKFp++fyR z5|8!u7`>+w_u3N?a*d&UnWJYEqtB`Iueq3|VR|uE$SYT2%+u{8)BH#_qowymi8~#~ z5vtku@dgw@yaR8JJ_+(r4k)%9?xyk*xm2`Oi6U6Fc^j^!`IG8u8r{qnWHFl@YejU9 zGY%NybuL^PHY~7&A-Vsp6>jDZ_j3o5vd^DCf7|9j32cKmwhO3918-*aLE|H#ZAz37 zQ#k^N_ihaF#~KU>h&1kDIidlU9mA1oJeo+34)|SM z2;Ne{%tbL>ppE9F9;*b5^ptU5y*m8!l|hpKmkmY`?c*Q}>6WOMu_4?`8|ipu?LZz( z(TE8h7fKa-?4i|O5YxWrQEo7dSPdFCmMuS83azdH0=Is!Fo4i+0=eC6L#K%ewhsiW zo=^niaM6#Xp$EDD! z>=ZXAx47~RBZ4oHNPPOe;$y0EM}N7JJ`NV?*KixbeZG$tL>XsH$D4Jk?!lCR1tiB- zr+zIwx&inc=#BURBHjp4{)ZbrIGT7y#ml$2GK1L7YV=wi&LNidJ8F{6RJ{`POFN)S z<1)2x!32`f0l?Kj%#A?$k3` zDEc6AzvoKJ+D?~RtDy9xB+H6~88@8kE+5f4cG^ZzcuP>{0m+L8w-SP6ARBk!-Cdz3 ziclsfvhMow)tdvs8ev~fCV zoimQTMMb#QhB7gsRu3?8MqchEqR9qYyQgp|4Mq^|2QETZyY>;N-vU8?B5fr~=*2o3 zH;U)+6r$^C#F6MU{2>9`0&r0j>t_z3eqkcWwp_m<=}dV%DDT_4%&hvCak|IKqT~9Q0D*JEsUI_02!My|Gd$D)3Pg| ze+({U*Lp&5dSvO$5W9jc6%NwsrvvZW^Q7A) zlE(`r0Z#(-NQvBxknO|}AfEsQb~+~(<^d}^4YERxJV*p>wuz2s#udv(Vg_iRdIug6 z2i zIn?IE9!)~`08zMfS`i+-ftALwdSYtPG(ivBW6gv865%)yx7}*>Lj%{;Ru|hQi=P`$ zh(x+eH%naLA$L$`XXiT_Yl`C)Z1K12h%{{h6OH-cP=O2>7z-rr3K=jX0L<-KlMEOJ zfC(&}2w-jinD4b`GGKB57}9AZ1LlSy1wYlB5C?10Xk0lhg3@`r{s{fLg*mMX*$SRGoh$GL?p*ib`FW; zI7Kyy6rqDthA~2-jA3>;75iPwpM8CQzVFArzN;Vm$6Pb-yodXF?&p5)cg@7u>@k%P zQxtW_3c*YVTf)CHGWvqJKMK%MlqDuF}|l$QQM=pbm;q(1aXu0SWt`b zTjq;7gVMB=sPTx|XHOUq0Va~AI&J865?j))N+T!@eB(hP7OTPd%rX>(Bx(Faum}Mk zLzaR!8bl`$i2~^39&>Cpkyt#maLoU{_@UUH!YILzT7P)K@vmNA{gtnjqTT1@4J`9A zAi4{YALMCZH0|8&r`r@hX;gMUIoQX-Et~j$uAnpTcE&}Bu1TExvo=S-&Q7agj5#qJ z{YrZm#c4$yJEsTV7bEkW)pC8|7;&X@$A1a!_h{_yZ9-EiVj;d8j zGy7!umVrM%IGD-*M&T z52@Xli74#r9H87w6 z`9S`Bhpus`P{O08za?FK@)$FN68H4G>t=cGqsGdTj;fiEF2KX+bY3i40XJFJxEfZg zR2$u|@j1;YJ*~9#+_XKbzuxKT9zRWsY(s^Sa2Cr~ka$C}(o=C2h-haJ1 zw0bt->^4gHm*1<_i{3D3W}xOU%=+W_NEE6HhiGMtc~lCES|W{8lElfp1}4;{_G=`Y zqdGt6naRnt9CF&$!flsXW&s*fWvrU0p}-mjvfkS`wzcU&n(CPP=&mds`n7qYg_qMd zB6*3rAoHPDpZH2&%I(VVfitY&5-tNh4gkwyMlJ%t03~NpPDS;&Wn+_*HTPsOGfw+u zq>4zSkXiw^$>mDv;lG1~} zk0=-aOjv2k`gu#e3?gO4yO({rPtw{uHT0|?g<3Zt*2zGJL56>deu~2!DM1bt+&p%t zE#_V}pxw2?YG#x%|5{BVQWK8Y%3&UtsD;ohnZH@nr;-wo4`&`2`F4iS=BaHeUaBX$TPWsX9o=gTB; zYrSrYLM_?u>+nJJYJ{e2+;ssr(wE8zZRmB$HGE(qBgKwKe0Jbg`$1ZYE%ZEKi4RtZ zl6huVDt^H|TSzAJg39iw;DdM~k-FN9v*6W1pj<|d?J~G=o55UhLz$x%oa(^$o)&|7 zQ2=8f*}L~%NYU1VgqAw@4GZCb2>SKAuvsGcr3z2w<9*hIQ+2>R{oAGAuq7L%^(Us3 zGuHZ(x>K6z`0bEYMT7XhLuPoUuMVJ4K+b6dKkXx6xQb(tfS+~-6g*>C2`7j608q?7 z8@n2hIs+8N!*KCJpnOorstjdOECzNLX{4AJeZJFV(c2!%ijSLZ&Nxed^m_m z5pD6I06Q%Hyn`szF}LK^HZ1-ntB@aZqWH|`PGLlPr#VMlv&>b|f6!*-Yx#1~G@wz$ zmf*mSS-R^0RvDWLp!|?W4{+t10FrM;*eYO&C9XqgjhT1(xbkg*@;|yI;>vdiWhogd z*o;wOW)GBaxXc|_{yR{W&(kBZSS4lT_gj={xvL<*Dl%m9wu^$bA06EC^j4fAb&olZ z?!h&h18(DdP5wfGzk@+|*pE6hrC$>sR>}>_i~HE1Xf+Pf@l@xDu~ZV>F%nTEhX%#w zA777gg1iEDP#IbBJFe(jIVtuA-BFx5q9e%hn$0!*Ns4|QTo^ey53%hu)DnnTrePz# zUurK3)wh;W@b&;O41LG#Z7gpc#kS6hOi`)4-3vTAzmv79!tkzKph0_%EWM5Qa0BRW z_eC9A*ycZeL1=HUM`&OWSsMui=XdOK+#QYsKhXJ*C5FM}?M5MoP1I4Wvrt746T=|y zJQli!tQ0#*!uh{J6qlVID$>!gt=moS*Iqe}Cq1CS6VvZ_k)MW*NauCYuHoog4{P1>5OQNJIfo*#?iIbqzxEN`C+-Lr^y=!LN416#30M zHyy=WPU#IL@&b|d?_&4##gm)~rXuAlz^S09$_S0K=D>oVt^z`To>hT$1_AZ~ye?Pq z!lEGt#TC`5FD3H(zKz-2KEx*0sl4e`?toudBH zuETEzrCTbO^IB1NVIPZUW)QouT7DpR`wgL1kcY z+XogIx)`1O^V`hBS;_SIE((^8lmqX1e_VPmbvCwV=&`RbYVF^P3+r#p8(mP^a**|| z7m8RV5h-wO{y<7~%WqocH6hOuWS2~gZXW~@uCZpzQ-ieIq%r9nMG%_yvIH5dU|B|l z^~TA1Z;Qj~`Eb=688F` + + diff --git a/source/renderer/app/assets/images/top-bar/node-sync-synced.inline.svg b/source/renderer/app/assets/images/top-bar/node-sync-synced.inline.svg new file mode 100644 index 0000000000..2292357252 --- /dev/null +++ b/source/renderer/app/assets/images/top-bar/node-sync-synced.inline.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/source/renderer/app/components/layout/TopBar.js b/source/renderer/app/components/layout/TopBar.js index e9311dadff..d233753a26 100644 --- a/source/renderer/app/components/layout/TopBar.js +++ b/source/renderer/app/components/layout/TopBar.js @@ -9,6 +9,7 @@ import LegacyNotification from '../notifications/LegacyNotification'; import Wallet from '../../domains/Wallet'; import styles from './TopBar.scss'; import { formattedWalletAmount } from '../../utils/formatters'; +import headerLogo from '../../assets/images/header-logo.inline.svg'; type Props = { onLeftIconClick?: ?Function, @@ -54,7 +55,11 @@ export default class TopBar extends Component { {leftIconSVG} )} -
{topBarTitle}
+ {activeWallet ? ( +
{topBarTitle}
+ ) : ( + + )} {children} {activeWallet && activeWallet.isLegacy && ( diff --git a/source/renderer/app/components/layout/TopBar.scss b/source/renderer/app/components/layout/TopBar.scss index 2a6a670014..2d3c7dba15 100644 --- a/source/renderer/app/components/layout/TopBar.scss +++ b/source/renderer/app/components/layout/TopBar.scss @@ -8,9 +8,19 @@ z-index: 100; &.withoutWallet { - background: var(--theme-topbar-background-color) + /* background: var(--theme-topbar-background-color) url('../../assets/images/header-logo.svg') no-repeat center !important; - background-size: 61px !important; + background-size: 61px !important; */ + + .headerLogo { + margin: auto; + width: 61px; + svg { + g { + fill: var(--theme-topbar-logo-color); + } + } + } } &.withWallet { @@ -21,7 +31,6 @@ flex-direction: column; font-family: var(--font-regular); text-align: center; - text-shadow: 0 2.5px 10px rgba(0, 0, 0, 0.25); user-select: text; .walletName { diff --git a/source/renderer/app/components/loading/manual-update/ManualUpdate.js b/source/renderer/app/components/loading/manual-update/ManualUpdate.js index 3c2dea3031..ccab22f1ae 100644 --- a/source/renderer/app/components/loading/manual-update/ManualUpdate.js +++ b/source/renderer/app/components/loading/manual-update/ManualUpdate.js @@ -94,7 +94,9 @@ export default class ManualUpdate extends Component { svg={linkNewWindow} className={styles.linkNewWindow} /> - {formatMessage(messages.actionButtonLabel)} + + {formatMessage(messages.actionButtonLabel)} +

} onClick={() => diff --git a/source/renderer/app/components/loading/manual-update/ManualUpdate.scss b/source/renderer/app/components/loading/manual-update/ManualUpdate.scss index 389e0684fe..01117360d0 100644 --- a/source/renderer/app/components/loading/manual-update/ManualUpdate.scss +++ b/source/renderer/app/components/loading/manual-update/ManualUpdate.scss @@ -69,6 +69,10 @@ } } + .btnLabel { + color: var(--theme-manual-update-overlay-button-label-color); + } + &:not(.disabled):hover { background-color: var( --theme-manual-update-overlay-button-background-color-hover @@ -85,6 +89,10 @@ } } } + + .btnLabel { + color: var(--theme-manual-update-overlay-button-label-color-hover); + } } } } diff --git a/source/renderer/app/components/loading/syncing-connecting/ReportIssue.js b/source/renderer/app/components/loading/syncing-connecting/ReportIssue.js index a86d71ccd8..829b819e79 100644 --- a/source/renderer/app/components/loading/syncing-connecting/ReportIssue.js +++ b/source/renderer/app/components/loading/syncing-connecting/ReportIssue.js @@ -112,33 +112,33 @@ export default class ReportIssue extends Component { : intl.formatMessage(messages.reportSyncingIssueText)} + + + +
+ + + +
); diff --git a/source/renderer/app/components/settings/categories/DisplaySettings.scss b/source/renderer/app/components/settings/categories/DisplaySettings.scss index b6704adb48..97c781f26a 100644 --- a/source/renderer/app/components/settings/categories/DisplaySettings.scss +++ b/source/renderer/app/components/settings/categories/DisplaySettings.scss @@ -8,7 +8,7 @@ } } -.themesWrapper { +.themesRowWrapper { display: flex; margin-bottom: 20px; diff --git a/source/renderer/app/components/sidebar/Sidebar.js b/source/renderer/app/components/sidebar/Sidebar.js index 29feddd6e5..ad59ee3c24 100644 --- a/source/renderer/app/components/sidebar/Sidebar.js +++ b/source/renderer/app/components/sidebar/Sidebar.js @@ -7,7 +7,8 @@ import styles from './Sidebar.scss'; import SidebarCategory from './SidebarCategory'; import SidebarWalletsMenu from './wallets/SidebarWalletsMenu'; import InstructionsDialog from '../wallet/paper-wallet-certificate/InstructionsDialog'; -import supportIcon from '../../assets/images/sidebar/bug-report-ic.inline.svg'; +import supportIconLight from '../../assets/images/sidebar/bug-report-ic.inline.svg'; +import supportIconDark from '../../assets/images/sidebar/bug-report-ic-dark.inline.svg'; import type { SidebarWalletType } from '../../types/sidebarTypes'; import { ROUTES } from '../../routes-config'; import { CATEGORIES_BY_NAME } from '../../config/sidebarConfig.js'; @@ -16,6 +17,7 @@ type Props = { menus: SidebarMenus, categories: SidebarCategories, activeSidebarCategory: string, + currentTheme: string, onCategoryClicked: Function, isShowingSubMenus: boolean, openDialogAction: Function, @@ -46,6 +48,13 @@ export default class Sidebar extends Component { isShowingSubMenus: false, }; + get supportIcon() { + const { currentTheme } = this.props; + return currentTheme === 'yellow' || currentTheme === 'white' + ? supportIconDark + : supportIconLight; + } + render() { const { menus, @@ -99,7 +108,7 @@ export default class Sidebar extends Component { diff --git a/source/renderer/app/components/sidebar/Sidebar.scss b/source/renderer/app/components/sidebar/Sidebar.scss index 6fa2baee2a..9381530d4e 100644 --- a/source/renderer/app/components/sidebar/Sidebar.scss +++ b/source/renderer/app/components/sidebar/Sidebar.scss @@ -12,5 +12,6 @@ .minimized { flex-shrink: 0; + position: relative; width: 84px; } diff --git a/source/renderer/app/components/sidebar/SidebarCategory.scss b/source/renderer/app/components/sidebar/SidebarCategory.scss index 07af141153..d1fc559795 100644 --- a/source/renderer/app/components/sidebar/SidebarCategory.scss +++ b/source/renderer/app/components/sidebar/SidebarCategory.scss @@ -60,7 +60,6 @@ } :nth-child(8) { - fill: rgb(250, 251, 252); opacity: 0.5; } diff --git a/source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.scss b/source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.scss index 578b09b4b8..ffe0426242 100644 --- a/source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.scss +++ b/source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.scss @@ -7,6 +7,13 @@ margin-bottom: 0; } + .StakePoolThumbnail_component { + background-color: 1px solid + var(--theme-delegation-steps-choose-stake-pool-thumb-background-color); + border: 1px solid + var(--theme-delegation-steps-choose-stake-pool-thumb-border-color); + } + .Dialog_subtitle { color: var(--theme-delegation-steps-choose-wallet-steps-indicator-color); } @@ -40,7 +47,8 @@ .selectedPoolBlock { background-color: transparent; - border: 2px solid var(--theme-staking-stake-pool-border-color); + border: 2px solid + var(--theme-delegation-steps-choose-stake-pool-thumb-border-color); border-style: dashed; border-radius: 5.8px; height: 103px; @@ -74,7 +82,8 @@ background-color: var( --theme-staking-stake-pool-selected-background-color ); - border: 2px solid var(--theme-staking-stake-pool-border-color); + border: 2px solid + var(--theme-delegation-steps-choose-stake-pool-thumb-border-color); .label { color: var( diff --git a/source/renderer/app/components/staking/info/StakingInfo.scss b/source/renderer/app/components/staking/info/StakingInfo.scss index ad24950caf..f6179b97b2 100644 --- a/source/renderer/app/components/staking/info/StakingInfo.scss +++ b/source/renderer/app/components/staking/info/StakingInfo.scss @@ -6,7 +6,7 @@ text-align: center; .learnMoreButton { - color: var(--theme-staking-info-learn-more-button-color); + color: var(--theme-staking-info-learn-more-button-text-color); .externalLinkIcon { @include link(--theme-staking-info-learn-more-icon-color); @@ -73,6 +73,6 @@ .progressLabelWhite { @extend %regularText; - color: #fff; + color: var(--theme-staking-progress-label-light); transform: translateX(-8px); } diff --git a/source/renderer/app/components/static/About.js b/source/renderer/app/components/static/About.js index 11f2f42e85..ed896490f2 100644 --- a/source/renderer/app/components/static/About.js +++ b/source/renderer/app/components/static/About.js @@ -5,6 +5,7 @@ import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl'; import DialogCloseButton from '../widgets/DialogCloseButton'; import globalMessages from '../../i18n/global-messages'; import styles from './About.scss'; +import closeCrossThin from '../../assets/images/close-cross-thin.inline.svg'; import daedalusIcon from '../../assets/images/daedalus-logo-loading-grey.inline.svg'; import cardanoIcon from '../../assets/images/cardano-logo.inline.svg'; import externalLinkIcon from '../../assets/images/link-ic.inline.svg'; @@ -88,7 +89,11 @@ export default class About extends Component { return (
- +
diff --git a/source/renderer/app/components/static/About.scss b/source/renderer/app/components/static/About.scss index cd495e63d4..3a67fb6768 100644 --- a/source/renderer/app/components/static/About.scss +++ b/source/renderer/app/components/static/About.scss @@ -30,8 +30,8 @@ margin-top: 16px; width: 12px; - polygon { - fill: var(--theme-about-window-icon-close-button-color); + g { + stroke: var(--theme-about-window-icon-close-button-color); } } } diff --git a/source/renderer/app/components/status/BlockConsolidationStatus.js b/source/renderer/app/components/status/BlockConsolidationStatus.js index ac4ba22b3b..4e7c884090 100644 --- a/source/renderer/app/components/status/BlockConsolidationStatus.js +++ b/source/renderer/app/components/status/BlockConsolidationStatus.js @@ -11,10 +11,11 @@ import classnames from 'classnames'; import { Button } from 'react-polymorph/lib/components/Button'; import { ButtonSkin } from 'react-polymorph/lib/skins/simple/ButtonSkin'; import SVGInline from 'react-svg-inline'; +import DialogCloseButton from '../widgets/DialogCloseButton'; import styles from './BlockConsolidationStatus.scss'; -import epochs from '../../assets/images/block-consolidation/epochs.png'; +import closeCrossThin from '../../assets/images/close-cross-thin.inline.svg'; import externalLinkIcon from '../../assets/images/link-ic.inline.svg'; -import DialogCloseButton from '../widgets/DialogCloseButton'; +import epochs from '../../assets/images/block-consolidation/epochs.inline.svg'; const messages = defineMessages({ title: { @@ -146,8 +147,11 @@ export default class BlockConsolidationStatus extends Component { return (
- {/* */} - +
@@ -178,7 +182,7 @@ export default class BlockConsolidationStatus extends Component { }} />

- +
diff --git a/source/renderer/app/components/status/BlockConsolidationStatus.scss b/source/renderer/app/components/status/BlockConsolidationStatus.scss index dcd8b3f9ad..6aa58353ea 100644 --- a/source/renderer/app/components/status/BlockConsolidationStatus.scss +++ b/source/renderer/app/components/status/BlockConsolidationStatus.scss @@ -14,6 +14,10 @@ background-color: var(--theme-block-consolidation-button-background-color); border: solid 1px var(--theme-block-consolidation-button-border-color); + p { + color: var(--theme-block-consolidation-button-text-color); + } + .externalLinkIcon { @include link(--theme-block-consolidation-button-icon-color); border-bottom: none; @@ -28,7 +32,22 @@ background-color: var( --theme-block-consolidation-button-background-color-hover ); - border: none; + border-color: var(--theme-block-consolidation-button-border-color-hover); + p { + color: var(--theme-block-consolidation-button-text-color-hover); + } + .externalLinkIcon { + g { + stroke: var(--theme-block-consolidation-button-icon-color-hover); + } + } + } + + &:not(.disabled):active { + background-color: var( + --theme-block-consolidation-button-background-color-active + ); + border-color: var(--theme-block-consolidation-button-border-color-hover); p { color: var(--theme-block-consolidation-button-text-color-hover); } @@ -58,15 +77,15 @@ .content { border-radius: 4px; font-family: var(--font-regular); + line-height: 1.2; margin: 20px; padding: 20px; text-align: center; h1 { color: var(--theme-block-consolidation-title-text-color); - font-size: 19px; - font-weight: 600; - margin-bottom: 14px; + font-size: 20px; + margin-bottom: 16px; } p { @@ -85,7 +104,7 @@ } &:last-of-type { - margin-bottom: 40px; + margin-bottom: 29px; } } .descriptionNoCurrentEpoch { @@ -96,7 +115,7 @@ .epochs { height: 149px; - margin: 0 auto 60px; + margin: 0 auto 59px; position: relative; width: 620px; @@ -118,9 +137,10 @@ font-weight: 600; } } - - img { - width: 100%; + svg { + g { + fill: var(--theme-block-consolidation-epochs-image-color); + } } } .epochsNoCurrentEpoch { diff --git a/source/renderer/app/components/status/DaedalusDiagnostics.js b/source/renderer/app/components/status/DaedalusDiagnostics.js index 4f178c26c5..b23707bf37 100644 --- a/source/renderer/app/components/status/DaedalusDiagnostics.js +++ b/source/renderer/app/components/status/DaedalusDiagnostics.js @@ -15,7 +15,7 @@ import { } from '../../config/timingConfig'; import { UNSYNCED_BLOCKS_ALLOWED } from '../../config/numbersConfig'; import { getNetworkEkgUrl } from '../../utils/network'; -import closeCross from '../../assets/images/close-cross.inline.svg'; +import closeCross from '../../assets/images/close-cross-thin.inline.svg'; import iconCopy from '../../assets/images/clipboard-ic.inline.svg'; import externalLinkIcon from '../../assets/images/link-ic.inline.svg'; import LocalizableError from '../../i18n/LocalizableError'; @@ -662,7 +662,7 @@ export default class DaedalusDiagnostics extends Component { +
{daedalusStateDirectoryPath}
} diff --git a/source/renderer/app/components/status/DaedalusDiagnostics.scss b/source/renderer/app/components/status/DaedalusDiagnostics.scss index d1d3ea3049..680bd21132 100644 --- a/source/renderer/app/components/status/DaedalusDiagnostics.scss +++ b/source/renderer/app/components/status/DaedalusDiagnostics.scss @@ -62,6 +62,7 @@ tbody > tr:first-child > th { color: var(--theme-network-window-text-color); display: inline-block; + font-family: var(font-medium); font-size: 14px; font-stretch: normal; font-style: normal; @@ -72,11 +73,15 @@ text-align: left; white-space: nowrap; width: 100%; + span { + opacity: 1; + } } th, td { color: var(--theme-network-window-text-color); + font-family: var(--font-regular); font-size: 14px; font-stretch: normal; font-style: normal; @@ -103,6 +108,7 @@ } td { + font-weight: 500; text-align: right; user-select: text; @@ -139,6 +145,10 @@ cursor: pointer; position: relative; + .tooltipLabelWrapper { + text-align: center; + } + p { display: inline-block; font-size: 14px; diff --git a/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.js b/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.js index 698ef44d05..70ab3c23e6 100644 --- a/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.js +++ b/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.js @@ -8,7 +8,7 @@ import { ButtonSkin } from 'react-polymorph/lib/skins/simple/ButtonSkin'; import DialogCloseButton from '../../widgets/DialogCloseButton'; import styles from './AdaRedemptionSuccessOverlay.scss'; import successIcon from '../../../assets/images/success-big.inline.svg'; -import closeCrossWhite from '../../../assets/images/close-cross-white.inline.svg'; +import closeCrossThin from '../../../assets/images/close-cross-thin.inline.svg'; const messages = defineMessages({ headline: { @@ -53,7 +53,7 @@ export default class AdaRedemptionSuccessOverlay extends Component { skin={ButtonSkin} />
- +
); } diff --git a/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.scss b/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.scss index f15187e77a..8432bdf6fc 100644 --- a/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.scss +++ b/source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay.scss @@ -69,8 +69,23 @@ :global { .DialogCloseButton_component { - top: 36px; - right: 55px; + height: 44px; + right: 15px; + top: 15px; + width: 44px; + &:hover { + border-radius: 50%; + background-color: var( + --theme-ada-redemption-success-overlay-close-button-background-color-hover + ); + } + svg { + g { + stroke: var( + --theme-ada-redemption-success-overlay-close-button-color + ); + } + } } } } diff --git a/source/renderer/app/components/wallet/transactions/Transaction.js b/source/renderer/app/components/wallet/transactions/Transaction.js index 0fe1e75594..f3e9412cd6 100644 --- a/source/renderer/app/components/wallet/transactions/Transaction.js +++ b/source/renderer/app/components/wallet/transactions/Transaction.js @@ -288,39 +288,48 @@ export default class Transaction extends Component {

{intl.formatMessage(messages.fromAddresses)}

{data.addresses.from.map((address, addressIndex) => ( - - {address} - - + + {address} + + +
))} +

{intl.formatMessage(messages.toAddresses)}

{data.addresses.to.map((address, addressIndex) => ( - - {address} - - + + {address} + + +
))}
@@ -344,15 +353,17 @@ export default class Transaction extends Component {

{intl.formatMessage(messages.transactionId)}

- - {data.id} - - +
+ + {data.id} + + +
{/*
diff --git a/source/renderer/app/components/wallet/transactions/Transaction.scss b/source/renderer/app/components/wallet/transactions/Transaction.scss index b849f22643..5d072c0f75 100644 --- a/source/renderer/app/components/wallet/transactions/Transaction.scss +++ b/source/renderer/app/components/wallet/transactions/Transaction.scss @@ -138,6 +138,7 @@ .failedLabel { background-color: var(--theme-transactions-state-failed-background-color); + color: var(--theme-transactions-state-failed-text-secondary-color); } .low { @@ -200,6 +201,11 @@ margin-bottom: 8px; } + .addressRow, + .transactionIdRow { + line-height: 17px; + } + span { font-family: var(--font-light); font-size: 14px; @@ -212,22 +218,15 @@ letter-spacing: -0.4px; opacity: 0.8; } - - &.address { - display: block; - line-height: 19px; - } } &.clickable { .transactionId, .address { @include link(--theme-transactions-list-item-details-color); - border-bottom: none; - display: initial; + border-bottom: 1px solid transparent; &:hover { - border-bottom: 1px solid - var(--theme-transactions-list-item-details-color); + border-bottom-color: var(--theme-transactions-list-item-details-color); } } } diff --git a/source/renderer/app/components/widgets/NodeSyncStatusIcon.js b/source/renderer/app/components/widgets/NodeSyncStatusIcon.js index 7adca31ec5..6c573350dd 100644 --- a/source/renderer/app/components/widgets/NodeSyncStatusIcon.js +++ b/source/renderer/app/components/widgets/NodeSyncStatusIcon.js @@ -1,9 +1,10 @@ // @flow import React, { Component } from 'react'; +import SVGInline from 'react-svg-inline'; import { defineMessages, intlShape } from 'react-intl'; import classNames from 'classnames'; -import spinnerIcon from '../../assets/images/top-bar/node-sync-spinner.png'; -import syncedIcon from '../../assets/images/top-bar/node-sync-synced.png'; +import spinnerIcon from '../../assets/images/top-bar/node-sync-spinner.inline.svg'; +import syncedIcon from '../../assets/images/top-bar/node-sync-synced.inline.svg'; import styles from './NodeSyncStatusIcon.scss'; const messages = defineMessages({ @@ -38,9 +39,10 @@ export default class NodeSyncStatusIcon extends Component { isSynced ? styles.synced : styles.syncing, isMainnet && styles.mainnet, ]); + return (
- +
{intl.formatMessage(messages.blocksSynced, { percentage: syncPercentage.toFixed(0), diff --git a/source/renderer/app/components/widgets/NodeSyncStatusIcon.scss b/source/renderer/app/components/widgets/NodeSyncStatusIcon.scss index 976d0be0e5..97526ffb08 100644 --- a/source/renderer/app/components/widgets/NodeSyncStatusIcon.scss +++ b/source/renderer/app/components/widgets/NodeSyncStatusIcon.scss @@ -10,22 +10,31 @@ &.mainnet { right: 40px; .icon { - height: 31px; - width: 31px; + svg { + height: 22px; + width: 22px; + path { + fill: var(--theme-node-sync-icon-color); + } + } } } } .icon { - height: 22px; pointer-events: none; - width: 22px; + svg { + height: 22px; + width: 22px; + } } .syncing { .icon :global { - animation: loading-spin 1.5s linear; - animation-iteration-count: infinite; + svg { + animation: loading-spin 1.5s linear; + animation-iteration-count: infinite; + } } } diff --git a/source/renderer/app/components/widgets/NotificationMessage.scss b/source/renderer/app/components/widgets/NotificationMessage.scss index ea37c9d7a1..796598800b 100644 --- a/source/renderer/app/components/widgets/NotificationMessage.scss +++ b/source/renderer/app/components/widgets/NotificationMessage.scss @@ -13,6 +13,15 @@ &.theme-override-grey { background-color: rgba(94, 96, 102, 0.95); + + .closeButton svg polygon, + .icon svg g path:nth-child(2) { + fill: var(--rp-tooltip-text-color); + } + + .message { + color: var(--rp-tooltip-text-color); + } } } @@ -37,6 +46,11 @@ & > svg { height: 44px; width: 44px; + g { + path:nth-child(2) { + fill: var(--theme-notification-message-checkmark-icon-color); + } + } } } @@ -64,7 +78,7 @@ width: 11px; height: 11px; polygon { - fill: #fff; + fill: var(--theme-notification-message-close-icon-color); } } } diff --git a/source/renderer/app/containers/MainLayout.js b/source/renderer/app/containers/MainLayout.js index 990bb7d342..03a025b019 100644 --- a/source/renderer/app/containers/MainLayout.js +++ b/source/renderer/app/containers/MainLayout.js @@ -21,10 +21,11 @@ export default class MainLayout extends Component { render() { const { actions, stores } = this.props; - const { nodeUpdate, sidebar, wallets } = stores; + const { nodeUpdate, sidebar, wallets, profile } = stores; const { isUpdateAvailable, isUpdatePostponed } = nodeUpdate; const activeWallet = wallets.active; const activeWalletId = activeWallet ? activeWallet.id : null; + const { currentTheme } = profile; const sidebarMenus = sidebar.wallets.length > 0 @@ -59,6 +60,7 @@ export default class MainLayout extends Component { actions.router.goToRoute.trigger({ route: ROUTES.SETTINGS.SUPPORT }) } pathname={this.props.stores.router.location.pathname} + currentTheme={currentTheme} /> ); diff --git a/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js b/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js index cc853d69ff..7d0595e439 100644 --- a/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js +++ b/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js @@ -149,8 +149,8 @@ export default class DaedalusDiagnosticsDialog extends Component { )} closeNotification={actions.notifications.closeActiveNotification} icon="success" - themeOverride="grey" hasCloseButton + themeOverride="grey" > {intl.formatMessage(messages.stateDirectoryCopyNotificationMessage)} diff --git a/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.scss b/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.scss index af2a71cf72..b23f445ac0 100644 --- a/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.scss +++ b/source/renderer/app/containers/status/DaedalusDiagnosticsDialog.scss @@ -4,7 +4,6 @@ } .overlay { - background-color: var(--theme-modal-overlay-background-color); bottom: 0; left: 0; overflow-y: overlay; diff --git a/source/renderer/app/containers/wallet/dialogs/paper-wallet-certificate/InstructionsDialogContainer.js b/source/renderer/app/containers/wallet/dialogs/paper-wallet-certificate/InstructionsDialogContainer.js index 23f7aa3e48..2d1530fd96 100644 --- a/source/renderer/app/containers/wallet/dialogs/paper-wallet-certificate/InstructionsDialogContainer.js +++ b/source/renderer/app/containers/wallet/dialogs/paper-wallet-certificate/InstructionsDialogContainer.js @@ -33,17 +33,9 @@ export default class InstructionsDialogContainer extends Component { onPrint = () => { const { intl } = this.context; const date = moment(); - const locale = this.props.stores.profile.currentLocale; + const localizedTimestampFormat = intl.formatMessage(messages.timestamp); + const timestamp = moment(date).format(localizedTimestampFormat); - moment.updateLocale(locale, { - longDateFormat: { - pdfTimestamp: intl.formatMessage(messages.timestamp), - }, - }); - const localizedDateFormat = moment() - .localeData() - .longDateFormat('pdfTimestamp'); - const timestamp = moment(date).format(localizedDateFormat); const name = generateFileNameWithTimestamp({ prefix: 'paper-wallet-certificate', date, diff --git a/source/renderer/app/i18n/locales/de-DE.json b/source/renderer/app/i18n/locales/de-DE.json index 300eaac530..c054179c48 100644 --- a/source/renderer/app/i18n/locales/de-DE.json +++ b/source/renderer/app/i18n/locales/de-DE.json @@ -221,7 +221,10 @@ "settings.display.themeLabel": "!!!Theme", "settings.display.themeNames.cardano": "!!!Cardano", "settings.display.themeNames.darkBlue": "!!!Dark blue", + "settings.display.themeNames.darkCardano": "!!!Dark cardano", "settings.display.themeNames.lightBlue": "!!!Light blue", + "settings.display.themeNames.white": "!!!White", + "settings.display.themeNames.yellow": "!!!Yellow", "settings.general.languageSelect.label": "!!!Language", "settings.menu.display.link.label": "!!!Themes", "settings.menu.general.link.label": "!!!General", diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json index 6bb4b994fd..a9be1774d1 100644 --- a/source/renderer/app/i18n/locales/defaultMessages.json +++ b/source/renderer/app/i18n/locales/defaultMessages.json @@ -1472,13 +1472,13 @@ "description": "Label for the \"Theme\" selection on the display settings page.", "end": { "column": 3, - "line": 18 + "line": 21 }, "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", "id": "settings.display.themeLabel", "start": { "column": 14, - "line": 13 + "line": 16 } }, { @@ -1486,13 +1486,13 @@ "description": "Name of the \"Light blue\" theme on the display settings page.", "end": { "column": 3, - "line": 23 + "line": 26 }, "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", "id": "settings.display.themeNames.lightBlue", "start": { "column": 18, - "line": 19 + "line": 22 } }, { @@ -1500,13 +1500,13 @@ "description": "Name of the \"Cardano\" theme on the display settings page.", "end": { "column": 3, - "line": 28 + "line": 31 }, "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", "id": "settings.display.themeNames.cardano", "start": { "column": 16, - "line": 24 + "line": 27 } }, { @@ -1514,13 +1514,55 @@ "description": "Name of the \"Dark blue\" theme on the display settings page.", "end": { "column": 3, - "line": 33 + "line": 36 }, "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", "id": "settings.display.themeNames.darkBlue", "start": { "column": 17, - "line": 29 + "line": 32 + } + }, + { + "defaultMessage": "!!!Dark Cardano", + "description": "Name of the \"Dark cardano\" theme on the display settings page.", + "end": { + "column": 3, + "line": 43 + }, + "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", + "id": "settings.display.themeNames.darkCardano", + "start": { + "column": 20, + "line": 38 + } + }, + { + "defaultMessage": "!!!Yellow", + "description": "Name of the \"Yellow\" theme on the display settings page.", + "end": { + "column": 3, + "line": 49 + }, + "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", + "id": "settings.display.themeNames.yellow", + "start": { + "column": 15, + "line": 45 + } + }, + { + "defaultMessage": "!!!White", + "description": "Name of the \"White\" theme on the display settings page.", + "end": { + "column": 3, + "line": 55 + }, + "file": "source/renderer/app/components/settings/categories/DisplaySettings.js", + "id": "settings.display.themeNames.white", + "start": { + "column": 14, + "line": 51 } } ], @@ -3492,13 +3534,13 @@ "description": "About \"title\"", "end": { "column": 3, - "line": 17 + "line": 18 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.title", "start": { "column": 14, - "line": 13 + "line": 14 } }, { @@ -3506,13 +3548,13 @@ "description": "About page daedalus team headline", "end": { "column": 3, - "line": 22 + "line": 23 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.content.daedalus.headline", "start": { "column": 32, - "line": 18 + "line": 19 } }, { @@ -3520,13 +3562,13 @@ "description": "About page cardano team headline", "end": { "column": 3, - "line": 27 + "line": 28 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.content.cardano.headline", "start": { "column": 31, - "line": 23 + "line": 24 } }, { @@ -3534,13 +3576,13 @@ "description": "About page daedalus team members", "end": { "column": 3, - "line": 33 + "line": 34 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.content.daedalus.members", "start": { "column": 31, - "line": 28 + "line": 29 } }, { @@ -3548,13 +3590,13 @@ "description": "About page cardano team members", "end": { "column": 3, - "line": 39 + "line": 40 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.content.cardano.members", "start": { "column": 30, - "line": 34 + "line": 35 } }, { @@ -3562,13 +3604,13 @@ "description": "About \"copyright\"", "end": { "column": 3, - "line": 44 + "line": 45 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.copyright", "start": { "column": 18, - "line": 40 + "line": 41 } }, { @@ -3576,13 +3618,13 @@ "description": "About page license name", "end": { "column": 3, - "line": 49 + "line": 50 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.license", "start": { "column": 15, - "line": 45 + "line": 46 } }, { @@ -3590,13 +3632,13 @@ "description": "About page build information", "end": { "column": 3, - "line": 54 + "line": 55 }, "file": "source/renderer/app/components/static/About.js", "id": "static.about.buildInfo", "start": { "column": 18, - "line": 50 + "line": 51 } } ], @@ -3609,13 +3651,13 @@ "description": "Title of \"Block consolidation status\" page.", "end": { "column": 3, - "line": 24 + "line": 25 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.title", "start": { "column": 9, - "line": 20 + "line": 21 } }, { @@ -3623,13 +3665,13 @@ "description": "Description 1 of \"Block consolidation status\" page.", "end": { "column": 3, - "line": 29 + "line": 30 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.description1", "start": { "column": 16, - "line": 25 + "line": 26 } }, { @@ -3637,13 +3679,13 @@ "description": "Description 2 of \"Block consolidation status\" page.", "end": { "column": 3, - "line": 35 + "line": 36 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.description2", "start": { "column": 16, - "line": 30 + "line": 31 } }, { @@ -3651,13 +3693,13 @@ "description": "Description 3 of \"Block consolidation status\" page.", "end": { "column": 3, - "line": 41 + "line": 42 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.description3", "start": { "column": 16, - "line": 36 + "line": 37 } }, { @@ -3665,13 +3707,13 @@ "description": "Epochs Consolidated Of Total on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 48 + "line": 49 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.epochsConsolidatedOfTotal", "start": { "column": 29, - "line": 42 + "line": 43 } }, { @@ -3679,13 +3721,13 @@ "description": "Singular Epoch on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 53 + "line": 54 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.epoch", "start": { "column": 9, - "line": 49 + "line": 50 } }, { @@ -3693,13 +3735,13 @@ "description": "Plural Epochs on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 58 + "line": 59 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.epochs", "start": { "column": 10, - "line": 54 + "line": 55 } }, { @@ -3707,13 +3749,13 @@ "description": "Epochs consolidated on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 63 + "line": 64 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.epochsConsolidated", "start": { "column": 22, - "line": 59 + "line": 60 } }, { @@ -3721,13 +3763,13 @@ "description": "synced on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 68 + "line": 69 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.synced", "start": { "column": 10, - "line": 64 + "line": 65 } }, { @@ -3735,13 +3777,13 @@ "description": "Learn more Button on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 73 + "line": 74 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.learnMoreButton", "start": { "column": 19, - "line": 69 + "line": 70 } }, { @@ -3749,13 +3791,13 @@ "description": "URL of Learn more Button on \"Block consolidation status\" page.", "end": { "column": 3, - "line": 80 + "line": 81 }, "file": "source/renderer/app/components/status/BlockConsolidationStatus.js", "id": "blockConsolidationStatus.learnMoreButtonURL", "start": { "column": 22, - "line": 74 + "line": 75 } } ], @@ -8237,13 +8279,13 @@ "description": "Label for the blocks synced info overlay on node sync status icon.", "end": { "column": 3, - "line": 15 + "line": 16 }, "file": "source/renderer/app/components/widgets/NodeSyncStatusIcon.js", "id": "cardano.node.sync.status.blocksSynced", "start": { "column": 16, - "line": 10 + "line": 11 } } ], diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json index 7403c1ebcf..958a756112 100644 --- a/source/renderer/app/i18n/locales/en-US.json +++ b/source/renderer/app/i18n/locales/en-US.json @@ -221,7 +221,10 @@ "settings.display.themeLabel": "Theme", "settings.display.themeNames.cardano": "Cardano", "settings.display.themeNames.darkBlue": "Dark blue", + "settings.display.themeNames.darkCardano": "Dark Cardano", "settings.display.themeNames.lightBlue": "Light blue", + "settings.display.themeNames.white": "White", + "settings.display.themeNames.yellow": "Yellow", "settings.general.languageSelect.label": "Language", "settings.menu.display.link.label": "Themes", "settings.menu.general.link.label": "General", diff --git a/source/renderer/app/i18n/locales/hr-HR.json b/source/renderer/app/i18n/locales/hr-HR.json index 6711cd8db8..0b115199b9 100644 --- a/source/renderer/app/i18n/locales/hr-HR.json +++ b/source/renderer/app/i18n/locales/hr-HR.json @@ -221,7 +221,10 @@ "settings.display.themeLabel": "!!!Theme", "settings.display.themeNames.cardano": "!!!Cardano", "settings.display.themeNames.darkBlue": "!!!Dark blue", + "settings.display.themeNames.darkCardano": "!!!Dark cardano", "settings.display.themeNames.lightBlue": "!!!Light blue", + "settings.display.themeNames.white": "!!!White", + "settings.display.themeNames.yellow": "!!!Yellow", "settings.general.languageSelect.label": "!!!Jezik", "settings.menu.display.link.label": "!!!Themes", "settings.menu.general.link.label": "!!!Općenito", diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index ae2eddffd6..50ee196555 100644 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -219,9 +219,12 @@ "profile.termsOfUse.checkboxLabelWithDisclaimer": "利用規約が英語でのみ利用可能であることを理解し、利用規約に同意します。", "profile.termsOfUse.submitLabel": "次", "settings.display.themeLabel": "テーマ", - "settings.display.themeNames.cardano": "カルダノ", + "settings.display.themeNames.cardano": "Cardano", "settings.display.themeNames.darkBlue": "ダークブルー", + "settings.display.themeNames.darkCardano": "Cardanoダーク", "settings.display.themeNames.lightBlue": "ライトブルー", + "settings.display.themeNames.white": "ホワイト", + "settings.display.themeNames.yellow": "イエロー", "settings.general.languageSelect.label": "言語", "settings.menu.display.link.label": "テーマ", "settings.menu.general.link.label": "一般", diff --git a/source/renderer/app/i18n/locales/ko-KR.json b/source/renderer/app/i18n/locales/ko-KR.json index ef5f6dfcb1..e92aa6b1dd 100644 --- a/source/renderer/app/i18n/locales/ko-KR.json +++ b/source/renderer/app/i18n/locales/ko-KR.json @@ -221,7 +221,10 @@ "settings.display.themeLabel": "!!!Theme", "settings.display.themeNames.cardano": "!!!Cardano", "settings.display.themeNames.darkBlue": "!!!Dark blue", + "settings.display.themeNames.darkCardano": "!!!Dark cardano", "settings.display.themeNames.lightBlue": "!!!Light blue", + "settings.display.themeNames.white": "!!!White", + "settings.display.themeNames.yellow": "!!!Yellow", "settings.general.languageSelect.label": "!!!Language", "settings.menu.display.link.label": "!!!Themes", "settings.menu.general.link.label": "!!!General", diff --git a/source/renderer/app/i18n/locales/zh-CN.json b/source/renderer/app/i18n/locales/zh-CN.json index 168a036593..02439d0cf7 100644 --- a/source/renderer/app/i18n/locales/zh-CN.json +++ b/source/renderer/app/i18n/locales/zh-CN.json @@ -221,7 +221,10 @@ "settings.display.themeLabel": "!!!Theme", "settings.display.themeNames.cardano": "!!!Cardano", "settings.display.themeNames.darkBlue": "!!!Dark blue", + "settings.display.themeNames.darkCardano": "!!!Dark cardano", "settings.display.themeNames.lightBlue": "!!!Light blue", + "settings.display.themeNames.white": "!!!White", + "settings.display.themeNames.yellow": "!!!Yellow", "settings.general.languageSelect.label": "!!!Language", "settings.menu.display.link.label": "!!!Themes", "settings.menu.general.link.label": "!!!General", diff --git a/source/renderer/app/themes/daedalus/cardano.js b/source/renderer/app/themes/daedalus/cardano.js index e732dea85d..c406bb4f1d 100644 --- a/source/renderer/app/themes/daedalus/cardano.js +++ b/source/renderer/app/themes/daedalus/cardano.js @@ -39,6 +39,9 @@ export const CARDANO_THEME_CONFIG = { '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', '--theme-ada-redemption-no-wallets-instructions-color': '#5e6066', '--theme-ada-redemption-disclaimer-button-border-color': '#f9f9f9', + '--theme-ada-redemption-success-overlay-close-button-color': '#fff', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(0, 0, 0, 0.07)', }, blockConsolidation: { '--theme-block-consolidation-background-color': 'rgba(32, 34, 37, 0.96)', @@ -60,11 +63,16 @@ export const CARDANO_THEME_CONFIG = { '--theme-block-consolidation-stripe-light-1-background-color': '#e0e5ea', '--theme-block-consolidation-stripe-light-2-background-color': '#fafbfc', '--theme-block-consolidation-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-button-background-color-active': '#e9e9ea', '--theme-block-consolidation-button-background-color-hover': '#fafbfc', - '--theme-block-consolidation-button-icon-color': 'rgba(250, 251, 252, 0.7)', + '--theme-block-consolidation-button-icon-color': '#fafbfc', '--theme-block-consolidation-button-icon-color-hover': '#202225', + '--theme-block-consolidation-button-text-color': '#fafbfc', '--theme-block-consolidation-button-text-color-hover': '#202225', '--theme-block-consolidation-button-border-color': '#fafbfc', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': + 'rgba(255, 255, 255, 0.9)', }, body: { '--theme-main-body-background-color': '#efefef', @@ -130,8 +138,9 @@ export const CARDANO_THEME_CONFIG = { '--theme-data-migration-layer-box-shadow-color': 'rgba(0, 0, 0, 0.25)', '--theme-data-migration-layer-button-background-color-hover': '#fafbfc', '--theme-data-migration-layer-text-color': '#fafbfc', - '--theme-data-migration-layer-text-opacity-color': - 'rgba(250, 251, 252, 0.5)', + '--theme-data-migration-layer-text-opacity-color': '#fafbfc', + '--theme-data-migration-button-border-color': '#fafbfc', + '--theme-data-migration-button-label-color': '#fafbfc', }, delegationSetupWizard: { '--theme-delegation-steps-activation-steps-indicator-color': '#5e6066', @@ -150,6 +159,9 @@ export const CARDANO_THEME_CONFIG = { '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': '#fafbfc', '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': '#c6cdd6', '--theme-delegation-steps-choose-stake-pool-title-color': 'rgba(94, 96, 102, 0.8)', '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': @@ -266,7 +278,7 @@ export const CARDANO_THEME_CONFIG = { '--theme-input-text-color': '#5e6066', }, link: { - '--theme-link-main-color': 'rgba(28, 172, 99, 1)', + '--theme-link-main-color': '#26AB5F', }, loading: { '--theme-loading-background-color': '#fafbfc', @@ -289,10 +301,13 @@ export const CARDANO_THEME_CONFIG = { '--theme-manual-update-overlay-button-icon-color': 'rgba(250, 251, 252, 1)', '--theme-manual-update-overlay-button-icon-color-hover': 'rgba(32, 34, 37, 1)', + '--theme-manual-update-overlay-button-label-color-hover': + 'rgba(32, 34, 37, 1)', '--theme-manual-update-overlay-button-text-color-hover': '#202225', '--theme-manual-update-overlay-text-color': 'rgba(250, 251, 252, 0.7)', '--theme-manual-update-overlay-text-highlight-color': '#fafbfc', '--theme-manual-update-overlay-title-text-color': '#fafbfc', + '--theme-manual-update-overlay-button-label-color': '#fafbfc', }, mnemonic: { '--theme-backup-mnemonic-background-color': 'rgba(68, 91, 124, 0.05)', @@ -306,7 +321,7 @@ export const CARDANO_THEME_CONFIG = { '--theme-nav-dropdown-item-text-color': '#5e6066', '--theme-nav-dropdown-item-background-color': '#fafbfc', '--theme-nav-dropdown-item-background-color-hover': - 'rgba(32, 34, 37, 0.07)', + 'rgba(239, 239, 239, 0.5)', '--theme-nav-dropdown-item-color-hover': '#5e6066', }, navItem: { @@ -337,6 +352,7 @@ export const CARDANO_THEME_CONFIG = { '--theme-node-update-background-color': '#efefef', '--theme-node-update-title-color': '#5e6066', '--theme-node-update-message-color': '#5e6066', + '--theme-node-sync-icon-color': '#fff', '--theme-node-sync-info-message-background-color': '#fafbfc', '--theme-node-sync-info-message-text-color': '#5e6066', '--theme-node-update-accept-button-background-color': '#56c887', @@ -353,6 +369,8 @@ export const CARDANO_THEME_CONFIG = { notification: { '--theme-notification-message-background-color': 'rgba(44, 187, 105, 0.95)', '--theme-notification-message-text-color': '#fafbfc', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', '--theme-legacy-badge-background-color': '#ab1700', '--theme-legacy-notification-background-color': '#ab2712', '--theme-legacy-notification-learn-more-button-text-color': '#fafbfc', @@ -373,7 +391,7 @@ export const CARDANO_THEME_CONFIG = { }, paperWallet: { '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': - '#5e6066', + '#26ab5f', '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': 'rgba(68, 91, 124, 0.05)', }, @@ -568,6 +586,7 @@ export const CARDANO_THEME_CONFIG = { '--theme-staking-stake-pool-background-color': '#fafbfc', '--theme-staking-stake-pool-border-color': '#c6cdd6', '--theme-staking-stake-pool-glow-color': '#7cfeb54c', + '--theme-staking-progress-label-light': '#fafbfc', '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', '--theme-staking-stake-pool-selected-background-color': '#5da377', '--theme-staking-stake-pool-selected-checkmark-icon-color': '#fafbfc', @@ -625,7 +644,7 @@ export const CARDANO_THEME_CONFIG = { '--theme-staking-delegation-center-gear-icon-fill-color-active': '#5e6066', '--theme-staking-delegation-center-no-wallets-instructions-color': '#5e6066', - '--theme-staking-info-learn-more-button-color': '#fafbfc', + '--theme-staking-info-learn-more-button-text-color': '#fafbfc', '--theme-staking-info-learn-more-icon-color': 'rgba(250, 251, 252, 1)', '--theme-staking-learn-more-button-color': '#fafbfc', '--theme-staking-learn-more-icon-color': 'rgba(250, 251, 252, 1)', @@ -659,14 +678,15 @@ export const CARDANO_THEME_CONFIG = { '--theme-topbar-layout-body-background-color': '#ebeff2', '--theme-topbar-wallet-name-color': '#fafbfc', '--theme-topbar-wallet-info-color': '#fafbfc', + '--theme-topbar-logo-color': 'rgb(250, 251, 252)', }, transactions: { '--theme-transactions-list-background-color': '#fafbfc', '--theme-transactions-list-border-color': '#c6cdd6', '--theme-transactions-list-group-date-color': '#5e6066', '--theme-transactions-list-item-details-color': '#5e6066', - '--theme-transactions-state-failed-background-color': '#bdc5ce', - '--theme-transactions-state-failed-text-color': '#bdc5ce', + '--theme-transactions-state-failed-background-color': + 'rgba(189, 197, 206, 0.8)', '--theme-transactions-state-pending-background-color': '#bdc5ce', '--theme-transactions-state-pending-stripes-color': '#b2bac2', '--theme-transactions-priority-color': '#fafbfc', @@ -679,6 +699,8 @@ export const CARDANO_THEME_CONFIG = { '--theme-transactions-icon-type-exchange-background-color': '#10aca4', '--theme-transactions-icon-type-failed-background-color': '#ea4c5b', '--theme-transactions-arrow-stroke-color': '#5e6066', + '--theme-transactions-state-failed-text-color': 'rgba(94, 96, 102, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': '#fafbfc', }, uploader: { '--theme-uploader-text-color': '#5e6066', @@ -696,6 +718,10 @@ export const CARDANO_THEME_CONFIG = { '--theme-utxo-tooltip-shadow-color': 'rgba(0, 0, 0, 0.18)', '--theme-utxo-tooltip-text-color': '#fafbfc', }, + rpTooltip: { + '--rp-tooltip-bg-color': '#5e6066', + '--rp-tooltip-text-color': '#fafbfc', + }, }; const CARDANO_THEME_PARAMS: CreateThemeParams = { diff --git a/source/renderer/app/themes/daedalus/dark-blue.js b/source/renderer/app/themes/daedalus/dark-blue.js index 2d1f0d4355..465c492afd 100644 --- a/source/renderer/app/themes/daedalus/dark-blue.js +++ b/source/renderer/app/themes/daedalus/dark-blue.js @@ -39,6 +39,9 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', '--theme-ada-redemption-no-wallets-instructions-color': '#e9f4fe', '--theme-ada-redemption-disclaimer-button-border-color': '#a8adb5', + '--theme-ada-redemption-success-overlay-close-button-color': '#fff', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(0, 0, 0, 0.07)', }, blockConsolidation: { '--theme-block-consolidation-background-color': 'rgba(38, 51, 69, 0.96)', @@ -60,11 +63,16 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-block-consolidation-stripe-light-1-background-color': '#e0e5ea', '--theme-block-consolidation-stripe-light-2-background-color': '#fafbfc', '--theme-block-consolidation-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-button-background-color-active': '#e9e9ea', '--theme-block-consolidation-button-background-color-hover': '#fafbfc', - '--theme-block-consolidation-button-icon-color': 'rgba(250, 251, 252, 0.7)', + '--theme-block-consolidation-button-icon-color': '#fafbfc', '--theme-block-consolidation-button-icon-color-hover': '#263345', + '--theme-block-consolidation-button-text-color': '#fafbfc', '--theme-block-consolidation-button-text-color-hover': '#263345', '--theme-block-consolidation-button-border-color': '#fafbfc', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': + 'rgba(255, 255, 255, 0.9)', }, body: { '--theme-main-body-background-color': '#0b1926', @@ -130,8 +138,9 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-data-migration-layer-box-shadow-color': 'rgba(0, 0, 0, 0.25)', '--theme-data-migration-layer-button-background-color-hover': '#fafbfc', '--theme-data-migration-layer-text-color': '#fafbfc', - '--theme-data-migration-layer-text-opacity-color': - 'rgba(250, 251, 252, 0.5)', + '--theme-data-migration-layer-text-opacity-color': '#fafbfc', + '--theme-data-migration-button-border-color': '#ffffff', + '--theme-data-migration-button-label-color': '#ffffff', }, delegationSetupWizard: { '--theme-delegation-steps-activation-steps-indicator-color': '#e9f4fe', @@ -150,6 +159,10 @@ export const DARK_BLUE_THEME_CONFIG = { '#fafbfc', '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#fafbfc', '--theme-delegation-steps-choose-stake-pool-slug-color': '#536370', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': + '#263345', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': + 'rgba(102, 122, 138, 0.2)', '--theme-delegation-steps-choose-stake-pool-title-color': 'rgba(233, 244, 254, 0.8)', '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': @@ -246,7 +259,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-icon-add-wallet-dialog-big-button-color': 'rgba(233, 244, 254, 0.8)', '--theme-icon-back-button-color': '#e9f4fe', - '--theme-icon-close-button-color': '#e9f4fe', + '--theme-icon-close-button-color': '#fafbfc', '--theme-icon-connecting-logo-color': '#fafbfc', '--theme-icon-copy-address-color': '#8793a1', '--theme-icon-file-upload-color': '#8793a1', @@ -254,6 +267,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-icon-syncing-logo-color': '#e9f4fe', '--theme-icon-transactions-ada-symbol-color': '#e9f4fe', '--theme-icon-transaction-type-color': '#fafbfc', + '--theme-icon-ada-api-logo-color': 'rgba(250, 251, 252, 0.5)', }, input: { '--theme-input-background-color': '#263345', @@ -267,7 +281,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-input-text-color': '#e9f4fe', }, link: { - '--theme-link-main-color': 'rgba(32, 181, 107, 1)', + '--theme-link-main-color': 'rgb(32, 181, 107)', }, loading: { '--theme-loading-background-color': '#0b1926', @@ -289,11 +303,14 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-manual-update-overlay-button-icon-color': 'rgba(250, 251, 252, 1)', '--theme-manual-update-overlay-button-icon-color-hover': 'rgba(38, 51, 69, 1)', + '--theme-manual-update-overlay-button-label-color-hover': + 'rgba(38, 51, 69, 1)', '--theme-manual-update-overlay-button-text-color-hover': '#263345', '--theme-manual-update-overlay-button-border-color': '#fafbfc', '--theme-manual-update-overlay-text-color': 'rgba(250, 251, 252, 0.7)', '--theme-manual-update-overlay-text-highlight-color': '#fafbfc', '--theme-manual-update-overlay-title-text-color': '#fafbfc', + '--theme-manual-update-overlay-button-label-color': '#fafbfc', }, mnemonic: { '--theme-backup-mnemonic-background-color': 'rgba(233, 244, 254, 0.05)', @@ -340,6 +357,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-node-update-message-color': '#e9f4fe', '--theme-node-sync-info-message-background-color': '#536370', '--theme-node-sync-info-message-text-color': '#e9f4fe', + '--theme-node-sync-icon-color': '#fff', '--theme-node-update-accept-button-background-color': '#263345', '--theme-node-update-accept-button-background-color-hover': '#34465e', '--theme-node-update-accept-button-background-color-active': '#18202b', @@ -353,6 +371,8 @@ export const DARK_BLUE_THEME_CONFIG = { notification: { '--theme-notification-message-background-color': 'rgba(83, 99, 112, 0.95)', '--theme-notification-message-text-color': '#fafbfc', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', '--theme-legacy-badge-background-color': '#ab1700', '--theme-legacy-notification-background-color': '#ab2712', '--theme-legacy-notification-learn-more-button-text-color': '#fafbfc', @@ -373,7 +393,7 @@ export const DARK_BLUE_THEME_CONFIG = { }, paperWallet: { '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': - '#e9f4fe', + 'rgb(32, 181, 107)', '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': 'rgba(233, 244, 254, 0.05)', }, @@ -568,8 +588,9 @@ export const DARK_BLUE_THEME_CONFIG = { }, stakePools: { '--theme-staking-stake-pool-background-color': '#263345', - '--theme-staking-stake-pool-border-color': '#536370', + '--theme-staking-stake-pool-border-color': '#263345', '--theme-staking-stake-pool-glow-color': '#7cfeb54c', + '--theme-staking-progress-label-light': '#fafbfc', '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', '--theme-staking-stake-pool-selected-background-color': '#5da377', '--theme-staking-stake-pool-selected-checkmark-icon-color': '#fafbfc', @@ -627,7 +648,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-staking-delegation-center-gear-icon-fill-color-active': '#e9f4fe', '--theme-staking-delegation-center-no-wallets-instructions-color': '#e9f4fe', - '--theme-staking-info-learn-more-button-color': '#fafbfc', + '--theme-staking-info-learn-more-button-text-color': '#fafbfc', '--theme-staking-info-learn-more-icon-color': 'rgba(250, 251, 252, 1)', '--theme-staking-learn-more-button-color': '#fafbfc', '--theme-staking-learn-more-icon-color': 'rgba(250, 251, 252, 1)', @@ -661,6 +682,7 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-topbar-layout-body-background-color': '#0b1926', '--theme-topbar-wallet-name-color': '#e9f4fe', '--theme-topbar-wallet-info-color': '#e9f4fe', + '--theme-topbar-logo-color': 'rgb(250, 251, 252)', }, transactions: { '--theme-transactions-list-background-color': '#263345', @@ -669,7 +691,6 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-transactions-list-item-details-color': '#e9f4fe', '--theme-transactions-state-failed-background-color': 'rgba(189, 197, 206, 0.4)', - '--theme-transactions-state-failed-text-color': 'rgba(233, 244, 254, 0.4)', '--theme-transactions-state-pending-background-color': 'rgba(189, 197, 206, 0.4)', '--theme-transactions-state-pending-stripes-color': @@ -685,6 +706,9 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-transactions-icon-type-failed-background-color': 'rgba(234, 76, 91, 0.5)', '--theme-transactions-arrow-stroke-color': '#e9f4fe', + '--theme-transactions-state-failed-text-color': 'rgba(233, 244, 254, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': + 'rgba(250, 251, 252, 0.8)', }, uploader: { '--theme-uploader-text-color': '#e9f4fe', @@ -702,6 +726,10 @@ export const DARK_BLUE_THEME_CONFIG = { '--theme-utxo-tooltip-shadow-color': 'rgba(0, 0, 0, 0.18)', '--theme-utxo-tooltip-text-color': '#fafbfc', }, + rpTooltip: { + '--rp-tooltip-bg-color': '#e9f4fe', + '--rp-tooltip-text-color': '#fafbfc', + }, }; const DARK_BLUE_THEME_PARAMS: CreateThemeParams = { diff --git a/source/renderer/app/themes/daedalus/dark-cardano.js b/source/renderer/app/themes/daedalus/dark-cardano.js new file mode 100644 index 0000000000..ce61ebdb7f --- /dev/null +++ b/source/renderer/app/themes/daedalus/dark-cardano.js @@ -0,0 +1,724 @@ +// @flow +import { createTheme } from '../utils/createTheme'; +import type { CreateThemeParams } from '../types'; + +// ==== dark-cardano theme config for Daedalus and react-polymorph components === // +export const DARK_CARDANO_THEME_CONFIG = { + rpAutocomplete: { + '--rp-autocomplete-bg-color': '#1e1f31', + '--rp-autocomplete-border': '1px solid rgba(255, 255, 255, 0.2)', + '--rp-autocomplete-border-color-opened': 'rgba(255, 255, 255, 0.4)', + '--rp-autocomplete-input-text-color': '#ffffff', + '--rp-autocomplete-placeholder-color': '#ffffff80', + '--rp-autocomplete-selected-word-box-bg-color': '#1fc1c3', + '--rp-autocomplete-selected-word-text-color': '#121326', + '--rp-autocomplete-selected-words-font-family': + 'NotoSans-Regular, NotoSansCJKjp-Regular', + }, + rpBubble: { + '--rp-bubble-bg-color': '#1e1f31', + '--rp-bubble-border-color': 'rgba(255, 255, 255, 0.2)', + '--rp-bubble-border-radius': '2px', + '--rp-bubble-arrow-bg-color': '#343646', + }, + rpButton: { + '--rp-button-bg-color': '#1fc1c3', + '--rp-button-bg-color-active': '#1cabad', + '--rp-button-bg-color-disabled': 'rgba(31, 193, 195, 0.3)', + '--rp-button-bg-color-hover': '#26e7eb', + '--rp-button-font-family': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-button-font-size': '14px', + '--rp-button-height': '50px', + '--rp-button-line-height': '20px', + '--rp-button-padding': '0', + '--rp-button-text-color': 'rgba(18, 19, 38, 1)', + '--rp-button-text-color-disabled': 'rgba(18, 19, 38, 0.5)', + '--rp-button-text-transform': 'none', + '--rp-button-width': '360px', + }, + rpCheckbox: { + '--rp-checkbox-border': '1px solid #1fc1c3', + '--rp-checkbox-border-color-disabled': '#1fc1c366', + '--rp-checkbox-check-bg-color': '#1fc1c3', + '--rp-checkbox-label-text-color': '#ffffff', + '--rp-checkbox-label-text-color-disabled': '#ffffff4d', + }, + rpColors: { + '--rp-theme-color-error': '#ea4c5b', + }, + rpFonts: { + '--rp-theme-font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--rp-theme-font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--rp-theme-font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-theme-font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--rp-theme-font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + }, + rpFormfield: { + '--rp-formfield-bg-color-disabled': 'none', + '--rp-formfield-label-text-color': '#ffffff', + '--rp-formfield-label-text-color-disabled': '#ffffff', + '--rp-formfield-error-text-color': '#ea4c5b', + '--rp-formfield-error-text-opacity': '0.75', + }, + rpInput: { + '--rp-input-bg-color': '#1e1f31', + '--rp-input-bg-color-disabled': 'rgba(255, 255, 255, 0.05)', + '--rp-input-border-color': 'rgba(255, 255, 255, 0.2)', + '--rp-input-border-color-disabled': 'rgba(255, 255, 255, 0.05)', + '--rp-input-border-color-errored': '#ea4c5b', + '--rp-input-border-color-focus': 'rgba(255, 255, 255, 0.4)', + '--rp-input-line-height': '22px', + '--rp-input-padding': '12px 20px', + '--rp-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--rp-input-placeholder-color-disabled': 'rgba(255, 255, 255, 0.5)', + '--rp-input-text-color': '#ffffff', + '--rp-input-text-color-disabled': '#ffffff80', + }, + rpModal: { + '--rp-modal-bg-color': '#1e1f31', + '--rp-modal-max-height': '90%', + '--rp-modal-overlay-bg-color': 'rgba(0, 0, 0, 0.4)', + }, + rpOptions: { + '--rp-option-bg-color': '#1e1f31', + '--rp-option-bg-color-highlighted': '#343646', + '--rp-option-border-color': 'rgba(255, 255, 255, 0.1)', + '--rp-option-checkmark-color': 'rgba(255, 255, 255, 0.7)', + '--rp-option-line-height': '22px', + '--rp-option-text-color': '#ffffff', + '--rp-options-border-color': '#787883', + '--rp-options-shadow': 'none', + }, + rpSelect: { + '--rp-select-arrow-bg-color': 'rgba(255, 255, 255, 0.3)', + '--rp-select-arrow-bg-color-open': 'rgba(255, 255, 255, 0.7)', + '--rp-select-input-bg-color': '#1e1f31', + '--rp-select-input-border-color': 'rgba(255, 255, 255, 0.2)', + '--rp-select-input-border-color-focus': 'rgba(255, 255, 255, 0.4)', + '--rp-select-input-text-color': '#ffffff', + '--rp-select-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + }, + rpStepper: { + '--rp-stepper-bullet-background-color-disabled': '#1e1f31', + '--rp-stepper-bullet-border-color': 'rgba(255, 255, 255, 0.1)', + '--rpstepper-bullet-height': '12px', + '--rpstepper-bullet-width': '12px', + '--rp-stepper-label-color': 'rgba(255, 255, 255, 1)', + '--rp-stepper-label-color-light': 'rgba(255, 255, 255, 0.3)', + '--rp-stepper-main-color': '#1fc1c3', + '--rp-stepper-main-color-light': '#1fc1c31a', + '--rpstepper-stepper-step-label-bottom-margin': '6px', + '--rpstepper-steps-bar-color-disabled': 'rgba(255, 255, 255, 0.1)', + '--rpstepper-steps-bar-top-position': '6px', + }, + rpSwitch: { + '--rp-switch-bg-color-off': 'rgba(31, 193, 195, 0.3)', + '--rp-switch-bg-color-on': '#1fc1c3', + '--rp-switch-label-margin': '0 30px 0 0', + '--rp-switch-label-opacity': '0.5', + '--rp-switch-label-text-color': '#ffffff', + '--rp-switch-label-width': '100%', + '--rp-switch-opacity-off': '0.3', + '--rp-switch-root-margin': '0 0 30px 0', + '--rp-switch-thumb-bg-color': '#ffffff', + }, + rpTextArea: { + '--rp-textarea-bg-color': '#121326', + '--rp-textarea-bg-color-disabled': '#12132680', + '--rp-textarea-border': '1px solid rgba(255, 255, 255, 0.2)', + '--rp-textarea-border-color-disabled': '#ffffff80', + '--rp-textarea-border-color-errored': '#ea4c5b', + '--rp-textarea-border-color-focus': 'rgba(255, 255, 255, 0.4)', + '--rp-textarea-border-radius': '2px', + '--rp-textarea-line-height': '20px', + '--rp-textarea-placeholder-color': '#ffffff80', + '--rp-textarea-resize': 'none', + '--rp-textarea-text-color': '#ffffff', + }, + aboutWindow: { + '--theme-about-window-background-color': '#36374df5', + '--theme-about-window-header-bottom-border-color': '#ffffff4d', + '--theme-about-window-daedalus-icon-color': '#ffffff', + '--theme-about-window-cardano-icon-color': '#ffffff', + '--theme-about-window-title-varsion-color': '#ffffff', + '--theme-about-window-title-stroke-color': '#ffffff', + '--theme-about-window-content-color': '#ffffff', + '--theme-about-window-content-text-color': '#ffffff', + '--theme-about-window-content-bottom-border-color': '#ffffff4d', + '--theme-about-window-icon-close-button-color': '#fafbfc', + '--theme-about-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.16)', + }, + adaRedemption: { + '--theme-ada-redemption-headline-color': '#ffffff', + '--theme-ada-redemption-instructions-color': '#ffffff', + '--theme-ada-redemption-success-overlay-background-color': '#36374d', + '--theme-ada-redemption-success-overlay-border-color': '#ffffff', + '--theme-ada-redemption-success-overlay-message-color': '#ffffff', + '--theme-ada-redemption-success-overlay-button-text-color': '#ffffff', + '--theme-ada-redemption-success-overlay-button-text-color-hover': '#36374d', + '--theme-ada-redemption-success-overlay-button-background-color-hover': + '#ffffff', + '--theme-ada-redemption-disclaimer-background-color': + 'rgba(171, 23, 0, 0.94)', + '--theme-ada-redemption-disclaimer-text-color': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-check': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-checked': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-after': '#ab1700', + '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', + '--theme-ada-redemption-no-wallets-instructions-color': '#ffffff', + '--theme-ada-redemption-disclaimer-button-border-color': '#a0a1a8', + '--theme-ada-redemption-success-overlay-close-button-color': '#fafbfc', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(0, 0, 0, 0.07)', + }, + blockConsolidation: { + '--theme-block-consolidation-background-color': '#36374df5', + '--theme-block-consolidation-title-text-color': '#fafbfc', + '--theme-block-consolidation-text-color': 'rgba(250, 251, 252, 0.7)', + '--theme-block-consolidation-text-highlight-color': + 'rgba(250, 251, 252, 1)', + '--theme-block-consolidation-epochs-text-color': '#2a2b3c', + '--theme-block-consolidation-indicator-text-color': '#ffffff', + '--theme-block-consolidation-indicator-container-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-indicator-epochs-behind-background-color-1': + '#a0a1a8', + '--theme-block-consolidation-indicator-epochs-behind-background-color-2': + '#36374d', + '--theme-block-consolidation-stripe-dark-1-background-color': + 'rgba(224, 229, 234, 0.3)', + '--theme-block-consolidation-stripe-dark-2-background-color': + 'rgba(250, 251, 252, 0.3)', + '--theme-block-consolidation-stripe-light-1-background-color': + 'rgba(224, 229, 234, 1)', + '--theme-block-consolidation-stripe-light-2-background-color': + 'rgba(250, 251, 252, 1)', + '--theme-block-consolidation-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-button-background-color-active': '#e9e9ea', + '--theme-block-consolidation-button-background-color-hover': '#fafbfc', + '--theme-block-consolidation-button-icon-color': '#fafbfc', + '--theme-block-consolidation-button-icon-color-hover': '#2a2b3c', + '--theme-block-consolidation-button-text-color': '#fafbfc', + '--theme-block-consolidation-button-text-color-hover': '#2a2b3c', + '--theme-block-consolidation-button-border-color': '#fafbfc', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': + 'rgba(255, 255, 255, 0.9)', + }, + body: { + '--theme-main-body-background-color': '#121326', + '--theme-main-body-messages-color': '#ffffff', + }, + borderedBox: { + '--theme-bordered-box-background-color': '#1e1f31', + '--theme-bordered-box-border': '1px solid 1e1f31', + '--theme-bordered-box-text-color': '#ffffff', + }, + button: { + '--theme-button-spinner-color': '#121326', + '--theme-label-button-color': '#ffffff', + }, + buttonAttention: { + '--theme-button-attention-background-color': '#ea4c5b', + '--theme-button-attention-background-color-hover': '#ee707c', + '--theme-button-attention-background-color-active': '#a43540', + '--theme-button-attention-background-color-disabled': + 'rgba(234, 76, 91, 0.3)', + '--theme-button-attention-text-color': '#ffffff', + '--theme-button-attention-text-color-disabled': '#ffffff', + '--theme-button-attention-outline-color': '#f2949d', + }, + buttonDisclaimer: { + '--theme-button-disclaimer-background-color': '#ab1700', + '--theme-button-disclaimer-background-color-hover': '#fafbfc', + '--theme-button-disclaimer-background-color-active': '#fafbfc', + '--theme-button-disclaimer-background-color-disabled': + 'rgba(171, 23, 0, .3)', + '--theme-button-disclaimer-text-color-disabled': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-text-color': '#fafbfc', + '--theme-button-disclaimer-outline-color': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-border-color': '#fafbfc', + '--theme-button-disclaimer-border-color-disabled': + 'rgba(250, 251, 252, .3)', + }, + buttonFlat: { + '--theme-button-flat-background-color': '#414251', + '--theme-button-flat-background-color-hover': '#71717d', + '--theme-button-flat-background-color-active': '#31323D', + '--theme-button-flat-background-color-disabled': 'rgba(65, 66, 81, 0.3)', + '--theme-button-flat-text-color-disabled': '#ffffff', + '--theme-button-flat-text-color': '#ffffff', + '--theme-button-flat-outline-color': '#71717d', + }, + buttonPrimary: { + '--theme-button-primary-background-color': '#1fc1c3', + '--theme-button-primary-background-color-hover': '#26e7eb', + '--theme-button-primary-background-color-active': '#1cabad', + '--theme-button-primary-background-color-disabled': + 'rgba(31, 193, 195, 0.3)', + '--theme-button-primary-text-color-disabled': '#121326', + '--theme-button-primary-text-color': '#121326', + '--theme-button-primary-outline-color': 'rgba(255, 255, 255, 0.5)', + }, + connecting: { + '--theme-connecting-background-color': '#36374d', + '--theme-connecting-text-color': '#ffffff', + }, + dataMigration: { + '--theme-data-migration-layer-background-color': '#36374d', + '--theme-data-migration-layer-box-shadow-color': '#36374d', + '--theme-data-migration-layer-button-background-color-hover': '#ffffff', + '--theme-data-migration-layer-text-color': '#ffffff', + '--theme-data-migration-layer-text-opacity-color': '#000000', + '--theme-data-migration-button-border-color': '#ffffff', + '--theme-data-migration-button-label-color': '#ffffff', + }, + delegationSetupWizard: { + '--theme-delegation-steps-activation-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-activation-description-color': '#ffffffcc', + '--theme-delegation-steps-activation-fees-label-color': '#ffffff', + '--theme-delegation-steps-activation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-activation-address-value-color': '#ffffff', + '--theme-delegation-steps-choose-stake-pool-checkmark-icon-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-delegated-pools-label-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-slug-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-select-box-placeholder-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#ffffff', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': + 'rgba(42, 43, 60, 1)', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-title-color': '#ffffffcc', + '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': + '#ffffffe6', + '--theme-delegation-steps-choose-stake-pool-tooltip-background-color': + '#ffffffe6', + '--theme-delegation-steps-choose-stake-pool-tooltip-box-shadow': + '0 5px 20px 0 rgba(0, 0, 0, 0.25)', + '--theme-delegation-steps-choose-stake-pool-tooltip-description-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-slug-color': + '#ffffff99', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-label-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-value-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-title-color': '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-url-color': '#85b6f9', + '--theme-delegation-steps-choose-wallet-custom-value-color': '#ffffff', + '--theme-delegation-steps-choose-wallet-description-color': '#ffffffcc', + '--theme-delegation-steps-choose-wallet-description-highlighted-color': + '#ffffff', + '--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b', + '--theme-delegation-steps-choose-wallet-error-message-light-color': + '#ea4c5bb3', + '--theme-delegation-steps-choose-wallet-error-select-options-color': + '#ffffff', + '--theme-delegation-steps-choose-wallet-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-confirmation-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-confirmation-description-color': '#ffffffcc', + '--theme-delegation-steps-confirmation-fees-label-color': '#ffffff', + '--theme-delegation-steps-confirmation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-intro-content-text-color': '#ffffffcc', + '--theme-delegation-steps-intro-divider-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-intro-link-color': '#36374d', + '--theme-delegation-steps-intro-list-label-color': '#ffffff', + '--theme-delegation-steps-intro-list-numbers-color': '#ffffff', + '--theme-delegation-steps-intro-list-optional-label-color': '#ffffff80', + '--theme-delegation-steps-not-available-description-text-color': + '#ffffffcc', + '--theme-delegation-steps-not-available-description-highlight-text-color': + '#ffffff', + '--theme-delegation-steps-not-available-icon-color': '#ffffff', + '--theme-delegation-steps-not-available-subtitle-text-color': '#ffffff', + }, + dialog: { + '--theme-dialog-choice-tabs-text-color': '#ffffff', + '--theme-dialog-choice-tabs-text-color-active': '#ffffff', + '--theme-dialog-choice-tabs-bottom-border-color-active': + 'rgba(255, 255, 255, 0.4)', + '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)', + '--theme-dialog-big-button-border-color': 'none', + '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)', + '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)', + '--theme-dialog-title-color': '#ffffff', + '--theme-dialog-text-color': '#ffffff', + '--theme-dialog-border-color': 'rgba(255, 255, 255, 0.2)', + }, + errors: { + '--theme-color-error': '#ea4c5b', + }, + fonts: { + '--font-ultralight': 'NotoSans-ExtraLight, NotoSansCJKjp-Thin', + '--font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--font-semibold': 'NotoSans-SemiBold, NotoSansCJKjp-Medium', + '--font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + '--font-heavy': 'NotoSans-ExtraBold, NotoSansCJKjp-Black', + '--font-black': 'NotoSans-Black, NotoSansCJKjp-Black', + '--font-mono': 'SFMono-Light', + }, + icon: { + '--theme-icon-nav-color': 'rgba(255, 255, 255, 0.6)', + '--theme-icon-nav-color-active': 'rgba(255, 255, 255, 1)', + '--theme-icon-sidebar-color': '#ffffff', + '--theme-icon-toggle-menu-color': '#ffffff', + '--theme-icon-node-update-notification-arrow-color': '#ffffff', + '--theme-icon-add-wallet-from-sidebar-color': '#ffffff', + '--theme-icon-ada-redemption-attention-color': '#ffffff', + '--theme-icon-ada-redemption-success-color': '#ffffff', + '--theme-icon-ada-redemption-certificate-color': 'rgba(255, 255, 255, 0.5)', + '--theme-icon-ada-redemption-no-wallets': '#ffffff', + '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff', + '--theme-icon-ada-summary-wallet-pending-confirmation-symbol-color': + '#ffffff', + '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff', + '--theme-icon-back-button-color': '#ffffff', + '--theme-icon-close-button-color': '#ffffff', + '--theme-icon-connecting-logo-color': '#ffffff', + '--theme-icon-copy-address-color': '#ffffff', + '--theme-icon-delegation-center-no-wallets': '#ffffff', + '--theme-icon-file-upload-color': '#ffffff', + '--theme-icon-syncing-logo-color': '#ffffff', + '--theme-icon-transactions-ada-symbol-color': '#ffffff', + '--theme-icon-transaction-type-color': '#fafbfc', + }, + input: { + '--theme-input-background-color': '#1e1f31', + '--theme-input-border-color': 'rgba(255, 255, 255, 0.2)', + '--theme-input-focus-border-color': 'rgba(255, 255, 255, 0.4)', + '--theme-input-hint-font': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--theme-input-label-color': '#ffffff', + '--theme-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--theme-input-remove-color-light': '#ea4c5b', + '--theme-input-right-floating-text-color': 'rgba(255, 255, 255, 0.5)', + '--theme-input-text-color': '#ffffff', + }, + link: { + '--theme-link-main-color': '#1fc1c3', + }, + loading: { + '--theme-loading-background-color': '#121326', + '--theme-loading-no-disk-space-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-loading-no-disk-space-text-color': '#ffffff', + '--theme-loading-no-disk-space-attention-icon-color': '#ffffff', + '--theme-loading-status-icons-on-color': '#2dc06c', + '--theme-loading-status-icons-off-color': '#ea4c5b', + '--theme-loading-status-icons-unloaded-loading-color': '#ffffff', + '--theme-loading-status-icons-unloaded-syncing-color': '#ffffff', + '--theme-loading-status-icons-tooltip-color': '#56576b', + '--theme-loading-spinner-color': '#ffffff', + }, + manualUpdate: { + '--theme-manual-update-overlay-background-color': '#36374df5', + '--theme-manual-update-overlay-button-background-color': '#313245', + '--theme-manual-update-overlay-button-background-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-icon-color': '#ffffff', + '--theme-manual-update-overlay-button-icon-color-hover': '#36374d', + '--theme-manual-update-overlay-button-text-color-hover': '#36374d', + '--theme-manual-update-overlay-button-border-color': '#ffffff', + '--theme-manual-update-overlay-text-color': '#ffffffb3', + '--theme-manual-update-overlay-text-highlight-color': '#ffffff', + '--theme-manual-update-overlay-title-text-color': '#ffffff', + '--theme-manual-update-overlay-button-label-color': '#ffffff', + '--theme-manual-update-overlay-button-label-color-hover': '#000000', + }, + mnemonic: { + '--theme-mnemonic-background-color': 'rgba(255, 255, 255, 0.07)', + '--theme-mnemonic-background-color-hover': '#101122', + '--theme-backup-mnemonic-background-color': '#414251', + }, + modal: { + '--theme-modal-overlay-background-color': 'rgba(0, 0, 0, 0.4)', + }, + navDropdown: { + '--theme-nav-dropdown-item-text-color': '#ffffff', + '--theme-nav-dropdown-item-background-color': '#36374d', + '--theme-nav-dropdown-item-background-color-hover': + 'rgba(233, 244, 254, 0.07)', + '--theme-nav-dropdown-item-color-hover': '#ffffff', + }, + navItem: { + '--theme-nav-item-background-color': '#2a2b3c', + '--theme-nav-item-background-color-active': 'rgba(255, 255, 255, 0.1)', + '--theme-nav-item-background-color-hover': '#afafb833', + '--theme-nav-item-text-color': 'rgba(255, 255, 255, 0.6)', + '--theme-nav-item-text-color-active': '#ffffff', + }, + network: { + '--theme-network-window-background-color': '#36374df5', + '--theme-network-window-text-color': '#ffffff', + '--theme-network-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.16)', + '--theme-network-window-red-color': '#f06e05', + '--theme-network-window-green-color': '#05f079', + '--theme-network-window-white-color': '#ffffff', + '--theme-network-window-transparent-color': 'transparent', + '--theme-network-window-border-color': '#ffffffb3', + '--theme-network-window-button-text-color': '#ffffff', + '--theme-network-window-button-background-color': '#afafb866', + '--theme-network-window-button-background-color-hover': '#afafb899', + '--theme-network-window-button-background-color-active': '#afafb8cc', + }, + nodeUpdate: { + '--theme-node-update-background-color': '#121326', + '--theme-node-update-title-color': '#ffffff', + '--theme-node-update-message-color': '#ffffff', + '--theme-node-sync-info-message-background-color': '#121326', + '--theme-node-sync-info-message-text-color': '#ffffff', + '--theme-node-sync-icon-color': '#fff', + '--theme-node-update-accept-button-background-color': '#36374d', + '--theme-node-update-accept-button-background-color-hover': '#5e5f71', + '--theme-node-update-accept-button-background-color-active': '#262736', + '--theme-node-update-deny-button-background-color': 'rgba(54, 55, 77, 0.3)', + '--theme-node-update-deny-button-background-color-hover': + 'rgba(94, 95, 113, 0.3)', + '--theme-node-update-deny-button-background-color-active': + 'rgba(38, 39, 54, 0.3)', + '--theme-node-update-button-text-color': '#ffffff', + }, + notification: { + '--theme-notification-message-background-color': '#36374df2', + '--theme-notification-message-text-color': '#ffffff', + '--theme-legacy-badge-background-color': '#d34452', + '--theme-legacy-notification-background-color': '#ab2712', + '--theme-legacy-notification-learn-more-button-text-color': '#ffffff', + '--theme-legacy-notification-learn-more-button-background-color': + '#12132633', + '--theme-legacy-notification-learn-more-button-background-color-hover': + '#1213264d', + '--theme-legacy-notification-learn-more-button-background-color-active': + '#12132666', + '--theme-legacy-notification-move-button-text-color': '#ab2712', + '--theme-legacy-notification-move-button-background-color': '#ffffff', + '--theme-legacy-notification-move-button-background-color-hover': + '#121326e6', + '--theme-legacy-notification-move-button-background-color-active': + '#121326cc', + '--theme-legacy-notification-title-color': '#ffffff', + '--theme-legacy-notification-description-color': '#ffffff', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', + }, + paperWallet: { + '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': + '#1fc1c3', + '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': + 'rgba(255, 255, 255, 0.07)', + }, + progressBar: { + '--theme-progress-bar-background-color': 'rgba(255, 255, 255, 0.3)', + '--theme-progress-bar-foreground-color': 'rgba(255, 255, 255, 0.7)', + }, + receiveQRCode: { + '--theme-receive-qr-code-background-color': '#fff', + '--theme-receive-qr-code-foreground-color': '#000', + }, + reportIssue: { + '--theme-report-issue-button-background-color': '#1fc1c3', + '--theme-report-issue-button-background-color-hover': '#26e7eb', + '--theme-report-issue-button-background-color-active': '#1cabad', + '--theme-report-issue-connecting-background-color': + 'rgba(255, 255, 255, 0.05)', + '--theme-report-issue-icon-color': '#121326', + '--theme-report-issue-connecting-text-color': '#ffffff', + '--theme-report-issue-syncing-background-color': + 'rgba(255, 255, 255, 0.05)', + '--theme-report-issue-syncing-text-color': '#ffffff', + '--theme-report-issue-syncing-download-logs-text-color': '#ffffff', + '--theme-report-issue-syncing-download-logs-text-color-connecting': + '#ffffff', + }, + scrollbar: { + '--theme-scrollbar-thumb-background': '#0e0f1e', + }, + sendConfirmation: { + '--theme-send-confirmation-dialog-send-values-color': '#ea4c5b', + }, + settings: { + '--theme-settings-body-background-color': '#121326', + '--theme-settings-pane-background-color': '#1e1f31', + '--theme-settings-pane-border': 'none', + '--theme-settings-menu-box-background-color': '#1e1f31', + '--theme-settings-menu-box-border': 'none', + '--theme-settings-menu-item-text-color': '#ffffff', + '--theme-settings-menu-item-text-color-active': '#ffffff', + '--theme-settings-menu-item-text-color-disabled': '#ffffff80', + '--theme-settings-menu-item-background-color-active': '#121326', + '--theme-settings-menu-item-left-border-color-active': '#36374d', + '--theme-settings-theme-select-title-color': '#ffffff', + }, + sidebar: { + '--theme-sidebar-background-color': '#36374d', + '--theme-sidebar-category-background-color-hover': '#313245', + '--theme-sidebar-category-background-color-active': '#2b2c3e', + '--theme-sidebar-category-text-color': '#ffffff', + '--theme-sidebar-menu-background-color': '#2b2c3e', + '--theme-sidebar-menu-item-background-color-hover': 'rgba(32, 33, 46, 0.5)', + '--theme-sidebar-menu-item-background-color-active': '#20212e', + '--theme-sidebar-menu-item-wallet-name-color': '#ffffff', + '--theme-sidebar-menu-item-wallet-info-color': '#ffffff', + '--theme-sidebar-menu-add-button-background-color': '#20212e', + '--theme-sidebar-menu-add-button-background-color-active': '#20212ea8', + '--theme-sidebar-menu-add-button-background-color-hover': '#20212ea8', + '--theme-sidebar-menu-add-button-text-color': '#ffffff', + }, + stakePools: { + '--theme-staking-stake-pools-title-color': '#ffffff', + '--theme-staking-stake-pools-search-button-color': '#ffffff', + '--theme-staking-stake-pool-background-color': 'rgba(42, 43, 60, 1)', + '--theme-staking-stake-pool-border-color': 'rgba(42, 43, 60, 1)', + '--theme-staking-stake-pool-glow-color': '#afafb8', + '--theme-staking-stake-pools-search-icon-color': '#ffffff', + '--theme-staking-stake-pool-selected-background-color': '#5da377', + '--theme-staking-stake-pool-selected-checkmark-icon-color': '#ffffff', + '--theme-staking-stake-pool-selected-slug-color': '#ffffff', + '--theme-staking-stake-pool-slug-color': '#ffffff', + '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-background-color': + 'rgba(42, 43, 60, 0.98)', + '--theme-staking-stake-pool-tooltip-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-staking-stake-pool-tooltip-shadow-color': 'rgba(0, 0, 0, 0.25)', + '--theme-staking-stake-pool-tooltip-text-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-link-color': '#1fc1c3', + '--theme-staking-stake-pool-tooltip-table-title-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-table-param-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-retirement-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-delegate-button-background-color': + '#36374d', + '--theme-staking-stake-pool-tooltip-delegate-button-hover-background-color': + '#5e5f71', + '--theme-staking-stake-pool-tooltip-delegate-button-active-background-color': + '#262736', + '--theme-staking-stake-pool-tooltip-delegate-button-text-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-delegate-button-inverse-text-color': + '#ffffff', + '--theme-staking-stake-pool-tooltip-delegate-button-border-color': + 'transparent', + '--theme-staking-progress-label-light': '#fff', + }, + staking: { + '--theme-staking-content-background-color': '#1e1f31', + '--theme-staking-content-border-color': '#1e1f31', + '--theme-staking-font-color-accent': 'rgba(255, 255, 255, 0.4)', + '--theme-staking-font-color-regular': '#ffffff', + '--theme-staking-font-color-light': '#ffffffb3', + '--theme-staking-font-color-lighter': '#ffffff80', + '--theme-staking-table-head-background-color': 'rgba(255, 255, 255, 0.07)', + '--theme-staking-table-border-color': 'rgba(255, 255, 255, 0.2)', + '--theme-staking-link-color': '#1fc1c3', + '--theme-staking-link-color-light': 'rgba(31, 193, 195, 0.5)', + '--theme-staking-progress-bar-background-color': + 'rgba(255, 255, 255, 0.07)', + '--theme-staking-progress-stripe-dark-1-background-color': '#1fc1c3', + '--theme-staking-progress-stripe-dark-2-background-color': '#0da2a4', + '--theme-staking-table-body-highlighted-text-color': '#313245', + '--theme-staking-info-learn-more-button-text-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-info-learn-more-icon-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-learn-more-button-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-learn-more-icon-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-donut-ring-completed-color': '#ea4c5b', + '--theme-staking-donut-ring-remaining-color': '#fbdbde', + '--theme-staking-wallet-row-border-color': 'rgba(255, 255, 255, 0.2)', + '--theme-staking-dropdown-item-text-color-hover': '#ffffff', + '--theme-staking-dropdown-item-background-color': '#36374d', + '--theme-staking-dropdown-item-background-color-hover': + 'rgba(233, 244, 254, 0.07)', + '--theme-staking-delegation-center-gear-icon-fill-color': '#ffffff80', + '--theme-staking-delegation-center-gear-icon-fill-color-active': '#ffffff', + '--theme-staking-delegation-center-no-wallets-instructions-color': + '#ffffff', + }, + support: { + '--theme-support-settings-item-color': '#ffffff', + '--theme-support-settings-link-color': '#36374d', + '--theme-support-settings-text-color': '#ffffff', + }, + syncing: { + '--theme-syncing-background-color': '#121326', + '--theme-syncing-text-color': '#ffffff', + }, + systemError: { + '--theme-system-error-overlay-attention-icon-color': '#ffffff', + '--theme-system-error-overlay-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-system-error-overlay-support-link-icon-color': '#ffffff', + '--theme-system-error-overlay-text-color': '#ffffff', + }, + tabs: { + '--theme-choice-tabs-text-color': '#ffffff', + '--theme-choice-tabs-text-color-active': '#ffffff', + '--theme-choice-tabs-bottom-border-color-active': '#ffffff', + }, + testEnvironment: { + '--theme-test-environment-label-background-color': '#ab1700', + '--theme-test-environment-label-text-color': '#ffffff', + }, + topBar: { + '--theme-topbar-background-color': '#2a2b3c', + '--theme-topbar-layout-body-background-color': '#36374d', + '--theme-topbar-wallet-name-color': '#ffffff', + '--theme-topbar-wallet-info-color': '#ffffff', + '--theme-topbar-logo-color': '#ffffff', + }, + transactions: { + '--theme-transactions-list-background-color': '#1e1f31', + '--theme-transactions-list-border-color': '1e1f31', + '--theme-transactions-list-group-date-color': '#ffffff', + '--theme-transactions-list-item-details-color': '#ffffff', + '--theme-transactions-state-failed-background-color': + 'rgba(189, 196, 206, 0.4)', + '--theme-transactions-state-pending-background-color': + 'rgba(188, 196, 205, 0.4)', + '--theme-transactions-state-pending-stripes-color': + 'rgba(189, 197, 206, 0.4)', + '--theme-transactions-priority-color': '#121326', + '--theme-transactions-priority-low-background-color': '#d34452', + '--theme-transactions-priority-medium-background-color': '#e6aa00', + '--theme-transactions-priority-high-background-color': '#007600', + '--theme-transactions-search-background-color': '#121326', + '--theme-transactions-icon-type-expend-background-color': '#84a2d2', + '--theme-transactions-icon-type-income-background-color': '#2dc06c', + '--theme-transactions-icon-type-exchange-background-color': '#10aca4', + '--theme-transactions-icon-type-failed-background-color': '#ee707c', + '--theme-transactions-arrow-stroke-color': '#ffffff', + '--theme-transactions-state-failed-text-color': 'rgba(255, 255, 255, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': + 'rgba(255, 255, 255, 0.8)', + }, + uploader: { + '--theme-uploader-text-color': '#ffffff', + '--theme-uploader-border-color': 'rgba(255, 255, 255, 0.2)', + }, + utxo: { + '--theme-utxo-background-color': 'rgba(31, 193, 195, 0.05)', + '--theme-utxo-title-text-color': '#ffffff', + '--theme-utxo-title-description-color': '#ffffffb3', + '--theme-utxo-bar-color': '#1fc1c3', + '--theme-utxo-label-text-color': '#ffffff73', + '--theme-utxo-tick-text-color': '#ffffff73', + '--theme-utxo-cursor-background-color': 'rgba(31, 193, 195, 0.1)', + '--theme-utxo-tooltip-background-color': '#1fc1c3', + '--theme-utxo-tooltip-shadow-color': 'rgba(31, 193, 195, 0.18)', + '--theme-utxo-tooltip-text-color': '#fff', + }, + rpTooltip: { + '--rp-tooltip-bg-color': '#ffffff', + '--rp-tooltip-text-color': '#000000', + }, +}; + +const DARK_CARDANO_THEME_PARAMS: CreateThemeParams = { + config: DARK_CARDANO_THEME_CONFIG, +}; + +export default createTheme(DARK_CARDANO_THEME_PARAMS); diff --git a/source/renderer/app/themes/daedalus/light-blue.js b/source/renderer/app/themes/daedalus/light-blue.js index c5decb2457..c694e11001 100644 --- a/source/renderer/app/themes/daedalus/light-blue.js +++ b/source/renderer/app/themes/daedalus/light-blue.js @@ -39,6 +39,9 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', '--theme-ada-redemption-no-wallets-instructions-color': '#5e6066', '--theme-ada-redemption-disclaimer-button-border-color': '#f7f9fa', + '--theme-ada-redemption-success-overlay-close-button-color': '#fff', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(0, 0, 0, 0.07)', }, blockConsolidation: { '--theme-block-consolidation-background-color': 'rgba(36, 62, 98, 0.96)', @@ -60,11 +63,16 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-block-consolidation-stripe-light-1-background-color': '#e0e5ea', '--theme-block-consolidation-stripe-light-2-background-color': '#fafbfc', '--theme-block-consolidation-button-background-color': '#243e62', + '--theme-block-consolidation-button-background-color-active': '#e9e9ea', '--theme-block-consolidation-button-background-color-hover': '#fafbfc', - '--theme-block-consolidation-button-icon-color': 'rgba(250, 251, 252, 0.7)', + '--theme-block-consolidation-button-icon-color': '#fafbfc', '--theme-block-consolidation-button-icon-color-hover': '#243e62', + '--theme-block-consolidation-button-text-color': '#fafbfc', '--theme-block-consolidation-button-text-color-hover': '#243e62', '--theme-block-consolidation-button-border-color': '#fafbfc', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': + 'rgba(255, 255, 255, 0.9)', }, body: { '--theme-main-body-background-color': '#ebeff2', @@ -129,8 +137,9 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-data-migration-layer-box-shadow-color': 'rgba(0, 0, 0, 0.25)', '--theme-data-migration-layer-button-background-color-hover': '#fafbfc', '--theme-data-migration-layer-text-color': '#fafbfc', - '--theme-data-migration-layer-text-opacity-color': - 'rgba(250, 251, 252, 0.5)', + '--theme-data-migration-layer-text-opacity-color': '#fafbfc', + '--theme-data-migration-button-border-color': '#fafbfc', + '--theme-data-migration-button-label-color': '#fafbfc', }, delegationSetupWizard: { '--theme-delegation-steps-activation-steps-indicator-color': '#5e6066', @@ -149,6 +158,9 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': '#fafbfc', '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': '#c6cdd6', '--theme-delegation-steps-choose-stake-pool-title-color': 'rgba(94, 96, 102, 0.8)', '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': @@ -205,7 +217,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-dialog-choice-tabs-text-color': '#5e6066', '--theme-dialog-choice-tabs-text-color-active': '#5e6066', '--theme-dialog-choice-tabs-bottom-border-color-active': '#5e6066', - '--theme-dialog-big-button-background-color': '#FAFBFC', + '--theme-dialog-big-button-background-color': '#fafbfc', '--theme-dialog-big-button-border-color': '#c6cdd6', '--theme-dialog-big-button-label-color': '#5e6066', '--theme-dialog-big-button-description-color': '#5e6066', @@ -265,7 +277,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-input-text-color': '#5e6066', }, link: { - '--theme-link-main-color': 'rgba(41, 111, 208, 1)', + '--theme-link-main-color': 'rgb(41, 111, 208)', }, loading: { '--theme-loading-background-color': '#fafbfc', @@ -287,10 +299,13 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-manual-update-overlay-button-icon-color': 'rgba(250, 251, 252, 1)', '--theme-manual-update-overlay-button-icon-color-hover': 'rgba(36, 62, 98, 1)', + '--theme-manual-update-overlay-button-label-color-hover': + 'rgba(36, 62, 98, 1)', '--theme-manual-update-overlay-button-text-color-hover': '#243e62', '--theme-manual-update-overlay-text-color': 'rgba(250, 251, 252, 0.7)', '--theme-manual-update-overlay-text-highlight-color': '#fafbfc', '--theme-manual-update-overlay-title-text-color': '#fafbfc', + '--theme-manual-update-overlay-button-label-color': '#fafbfc', }, mnemonic: { '--theme-mnemonic-background-color': '#e6e9ee', @@ -302,7 +317,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { }, navDropdown: { '--theme-nav-dropdown-item-text-color': '#1d2e47', - '--theme-nav-dropdown-item-background-color': '#fafbfc', + '--theme-nav-dropdown-item-background-color': '#fff', '--theme-nav-dropdown-item-background-color-hover': 'rgba(68, 91, 124, 0.07)', '--theme-nav-dropdown-item-color-hover': '#1d2e47', @@ -337,6 +352,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-node-update-message-color': '#5e6066', '--theme-node-sync-info-message-background-color': '#fafbfc', '--theme-node-sync-info-message-text-color': '#5e6066', + '--theme-node-sync-icon-color': '#fff', '--theme-node-update-accept-button-background-color': '#445b7c', '--theme-node-update-accept-button-background-color-hover': '#243e62', '--theme-node-update-accept-button-background-color-active': '#1e304a', @@ -351,6 +367,8 @@ export const LIGHT_BLUE_THEME_CONFIG = { notification: { '--theme-notification-message-background-color': 'rgba(36, 61, 98, 0.95)', '--theme-notification-message-text-color': '#fafbfc', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', '--theme-legacy-badge-background-color': '#ab1700', '--theme-legacy-notification-background-color': '#ab2712', '--theme-legacy-notification-learn-more-button-text-color': '#fafbfc', @@ -371,7 +389,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { }, paperWallet: { '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': - '#5e6066', + 'rgb(41, 111, 208)', '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': 'rgba(68, 91, 124, 0.05)', }, @@ -409,7 +427,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { 'NotoSans-Regular, NotoSansCJKjp-Regular', }, rpBubble: { - '--rp-bubble-bg-color': '#fafbfc', + '--rp-bubble-bg-color': '#fff', '--rp-bubble-border-color': '#c6cdd6', '--rp-bubble-border-radius': '2px', '--rp-bubble-arrow-bg-color': '#ebeff2', @@ -473,7 +491,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--rp-modal-overlay-bg-color': 'rgba(0, 0, 0, 0.4)', }, rpOptions: { - '--rp-option-bg-color': '#fafbfc', + '--rp-option-bg-color': '#fff', '--rp-option-bg-color-highlighted': '#edf0f3', '--rp-option-border-color': '#c6cdd6', '--rp-option-checkmark-color': '#5e6066', @@ -566,6 +584,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-staking-stake-pool-background-color': '#fafbfc', '--theme-staking-stake-pool-border-color': '#c6cdd6', '--theme-staking-stake-pool-glow-color': 'rgba(0, 149, 255, 0.3)', + '--theme-staking-progress-label-light': '#fafbfc', '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', '--theme-staking-stake-pool-selected-background-color': '#5da377', '--theme-staking-stake-pool-selected-checkmark-icon-color': '#fafbfc', @@ -622,7 +641,7 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-staking-delegation-center-gear-icon-fill-color-active': '#5e6066', '--theme-staking-delegation-center-no-wallets-instructions-color': '#5e6066', - '--theme-staking-info-learn-more-button-color': '#fafbfc', + '--theme-staking-info-learn-more-button-text-color': '#fafbfc', '--theme-staking-info-learn-more-icon-color': 'rgba(250, 251, 252, 1)', '--theme-staking-learn-more-button-color': '#fafbfc', '--theme-staking-learn-more-icon-color': 'rgba(250, 251, 252, 1)', @@ -656,14 +675,15 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-topbar-layout-body-background-color': '#ebeff2', '--theme-topbar-wallet-name-color': '#fafbfc', '--theme-topbar-wallet-info-color': '#fafbfc', + '--theme-topbar-logo-color': 'rgb(250, 251, 252)', }, transactions: { '--theme-transactions-list-background-color': '#fafbfc', '--theme-transactions-list-border-color': '#c6cdd6', '--theme-transactions-list-group-date-color': '#5e6066', '--theme-transactions-list-item-details-color': '#5e6066', - '--theme-transactions-state-failed-background-color': '#bdc5ce', - '--theme-transactions-state-failed-text-color': '#bdc5ce', + '--theme-transactions-state-failed-background-color': + 'rgba(189, 197, 206, 0.8)', '--theme-transactions-state-pending-background-color': '#bdc5ce', '--theme-transactions-state-pending-stripes-color': '#b2bac2', '--theme-transactions-priority-color': '#fafbfc', @@ -676,6 +696,8 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-transactions-icon-type-exchange-background-color': '#10aca4', '--theme-transactions-icon-type-failed-background-color': '#ea4c5b', '--theme-transactions-arrow-stroke-color': '#243e62', + '--theme-transactions-state-failed-text-color': 'rgba(94, 96, 102, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': '#fafbfc', }, uploader: { '--theme-uploader-text-color': '#5e6066', @@ -693,6 +715,10 @@ export const LIGHT_BLUE_THEME_CONFIG = { '--theme-utxo-tooltip-shadow-color': 'rgba(0, 0, 0, 0.18)', '--theme-utxo-tooltip-text-color': '#fafbfc', }, + rpTooltip: { + '--rp-tooltip-bg-color': '#5e6066', + '--rp-tooltip-text-color': '#fafbfc', + }, }; const LIGHT_BLUE_THEME_PARAMS: CreateThemeParams = { diff --git a/source/renderer/app/themes/daedalus/white.js b/source/renderer/app/themes/daedalus/white.js new file mode 100644 index 0000000000..a7ad0019c3 --- /dev/null +++ b/source/renderer/app/themes/daedalus/white.js @@ -0,0 +1,717 @@ +// @flow +import { createTheme } from '../utils/createTheme'; +import type { CreateThemeParams } from '../types'; + +// ==== white theme config for Daedalus and react-polymorph components === // +export const WHITE_THEME_CONFIG = { + rpAutocomplete: { + '--rp-autocomplete-bg-color': '#fff', + '--rp-autocomplete-border': '1px solid rgba(45, 45, 45, 0.1)', + '--rp-autocomplete-border-color-opened': '#2d2d2d', + '--rp-autocomplete-input-text-color': '#2d2d2d', + '--rp-autocomplete-placeholder-color': '#2d2d2d80', + '--rp-autocomplete-selected-word-box-bg-color': '#29b595', + '--rp-autocomplete-selected-word-text-color': '#ffffff', + '--rp-autocomplete-selected-words-font-family': + 'NotoSans-Regular, NotoSansCJKjp-Regular', + }, + rpBubble: { + '--rp-bubble-bg-color': '#fff', + '--rp-bubble-border-color': 'rgba(94, 96, 102, 0.2)', + '--rp-bubble-border-radius': '2px', + '--rp-bubble-arrow-bg-color': 'rgba(94, 96, 102, 0.07)', + }, + rpButton: { + '--rp-button-bg-color': '#29b595', + '--rp-button-bg-color-active': '#25a386', + '--rp-button-bg-color-disabled': 'rgba(41, 181, 149, 0.3)', + '--rp-button-bg-color-hover': '#54c4aa', + '--rp-button-font-family': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-button-font-size': '14px', + '--rp-button-height': '50px', + '--rp-button-line-height': '20px', + '--rp-button-padding': '0', + '--rp-button-text-color': '#fff', + '--rp-button-text-color-disabled': '#fff', + '--rp-button-text-transform': 'none', + '--rp-button-width': '360px', + }, + rpCheckbox: { + '--rp-checkbox-border': '1px solid #29b595', + '--rp-checkbox-border-color-disabled': 'rgba(41, 181, 149, 0.3)', + '--rp-checkbox-border-color': '#29b595', + '--rp-checkbox-check-bg-color': '#29b595', + '--rp-checkbox-label-text-color': '#2d2d2d', + '--rp-checkbox-label-text-color-disabled': '#2d2d2d4d', + }, + rpColors: { + '--rp-theme-color-error': '#ea4c5b', + }, + rpFonts: { + '--rp-theme-font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--rp-theme-font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--rp-theme-font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-theme-font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--rp-theme-font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + }, + rpFormfield: { + '--rp-formfield-bg-color-disabled': 'none', + '--rp-formfield-label-text-color': '#2d2d2d', + '--rp-formfield-label-text-color-disabled': '#2d2d2d', + '--rp-formfield-error-text-color': '#ea4c5b', + '--rp-formfield-error-text-opacity': '0.75', + }, + rpInput: { + '--rp-input-bg-color': '#fff', + '--rp-input-bg-color-disabled': 'rgba(94, 96, 102, 0.05)', + '--rp-input-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-input-border-color-disabled': 'rgba(94, 96, 102, 0.05)', + '--rp-input-border-color-errored': '#ea4c5b', + '--rp-input-border-color-focus': '#2d2d2d', + '--rp-input-line-height': '22px', + '--rp-input-padding': '12px 20px', + '--rp-input-placeholder-color': '#2d2d2d80', + '--rp-input-placeholder-color-disabled': '#2d2d2d80', + '--rp-input-text-color': '#2d2d2d', + '--rp-input-text-color-disabled': '#2d2d2d80', + }, + rpModal: { + '--rp-modal-bg-color': '#fff', + '--rp-modal-max-height': '90%', + '--rp-modal-overlay-bg-color': 'rgba(0, 0, 0, 0.4)', + }, + rpOptions: { + '--rp-option-bg-color': '#fff', + '--rp-option-bg-color-highlighted': '#edeeef', + '--rp-option-border-color': 'rgba(94, 96, 102, 0.2)', + '--rp-option-checkmark-color': '#2d2d2d', + '--rp-option-line-height': '22px', + '--rp-option-text-color': '#2d2d2d', + '--rp-options-border-color': 'rgba(94, 96, 102, 0.2)', + '--rp-options-shadow': 'none', + }, + rpSelect: { + '--rp-select-arrow-bg-color': 'rgba(45, 45, 45, 0.1)', + '--rp-select-arrow-bg-color-open': '#2d2d2d', + '--rp-select-input-bg-color': '#fff', + '--rp-select-input-border-color': 'rgba(45, 45, 45, 0.1)', + '--rp-select-input-border-color-focus': '#2d2d2d', + '--rp-select-input-text-color': '#2d2d2d', + '--rp-select-input-placeholder-color': '#2d2d2d80', + }, + rpStepper: { + '--rp-stepper-bullet-background-color-disabled': '#fff', + '--rp-stepper-bullet-border-color': 'rgba(45, 45, 45, 0.1)', + '--rpstepper-bullet-height': '12px', + '--rpstepper-bullet-width': '12px', + '--rp-stepper-label-color': '#2d2d2d', + '--rp-stepper-label-color-light': 'rgba(45, 45, 45, 0.3)', + '--rp-stepper-main-color': '#29b595', + '--rp-stepper-main-color-light': '#29b5951a', + '--rpstepper-stepper-step-label-bottom-margin': '6px', + '--rpstepper-steps-bar-color-disabled': 'rgba(45, 45, 45, 0.1)', + '--rpstepper-steps-bar-top-position': '6px', + }, + rpSwitch: { + '--rp-switch-bg-color-off': '#29b595', + '--rp-switch-bg-color-on': '#29b595', + '--rp-switch-label-margin': '0 30px 0 0', + '--rp-switch-label-opacity': '0.5', + '--rp-switch-label-text-color': '#2d2d2d', + '--rp-switch-label-width': '100%', + '--rp-switch-opacity-off': '0.3', + '--rp-switch-root-margin': '0 0 30px 0', + '--rp-switch-thumb-bg-color': '#fafbfc', + }, + rpTextArea: { + '--rp-textarea-bg-color': '#f9f9f9', + '--rp-textarea-bg-color-disabled': '#f9f9f980', + '--rp-textarea-border': '1px solid rgba(45, 45, 45, 0.1)', + '--rp-textarea-border-color-disabled': '#2d2d2d80', + '--rp-textarea-border-color-errored': '#ea4c5b', + '--rp-textarea-border-color-focus': '#2d2d2d', + '--rp-textarea-border-radius': '2px', + '--rp-textarea-line-height': '20px', + '--rp-textarea-placeholder-color': '#2d2d2d80', + '--rp-textarea-resize': 'none', + '--rp-textarea-text-color': '#2d2d2d', + }, + aboutWindow: { + '--theme-about-window-background-color': '#fffffff5', + '--theme-about-window-header-bottom-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-about-window-daedalus-icon-color': '#29b595', + '--theme-about-window-cardano-icon-color': '#29b595', + '--theme-about-window-title-varsion-color': '#2d2d2d', + '--theme-about-window-title-stroke-color': '#2d2d2d', + '--theme-about-window-content-color': '#2d2d2d', + '--theme-about-window-content-text-color': '#2d2d2d', + '--theme-about-window-content-bottom-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-about-window-icon-close-button-color': '#2d2d2d', + '--theme-about-window-icon-close-hover-background': + 'rgba(41, 181, 149, 0.1)', + }, + adaRedemption: { + '--theme-ada-redemption-headline-color': '#2d2d2d', + '--theme-ada-redemption-instructions-color': '#2d2d2d', + '--theme-ada-redemption-success-overlay-background-color': '#ffffff', + '--theme-ada-redemption-success-overlay-border-color': '#29b595', + '--theme-ada-redemption-success-overlay-message-color': '#2d2d2d', + '--theme-ada-redemption-success-overlay-button-text-color': '#29b595', + '--theme-ada-redemption-success-overlay-button-text-color-hover': '#ffffff', + '--theme-ada-redemption-success-overlay-button-background-color-hover': + '#29b595', + '--theme-ada-redemption-disclaimer-background-color': + 'rgba(171, 23, 0, 0.94)', + '--theme-ada-redemption-disclaimer-text-color': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-check': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-checked': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-after': '#ab1700', + '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', + '--theme-ada-redemption-no-wallets-instructions-color': '#2d2d2d', + '--theme-ada-redemption-disclaimer-button-border-color': '#fff', + '--theme-ada-redemption-success-overlay-close-button-color': '#2d2d2d', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(41, 181, 149, 0.07)', + }, + blockConsolidation: { + '--theme-block-consolidation-background-color': '#ffffff', + '--theme-block-consolidation-title-text-color': '#2d2d2d', + '--theme-block-consolidation-text-color': 'rgba(45, 45, 45, 0.7)', + '--theme-block-consolidation-text-highlight-color': '#2d2d2d', + '--theme-block-consolidation-epochs-text-color': '#ffffff', + '--theme-block-consolidation-indicator-text-color': '#2d2d2d', + '--theme-block-consolidation-indicator-container-background-color': + 'rgba(105, 203, 180, 0.1)', + '--theme-block-consolidation-indicator-epochs-behind-background-color-1': + '#2d2d2d', + '--theme-block-consolidation-indicator-epochs-behind-background-color-2': + '#2d2d2d00', + '--theme-block-consolidation-stripe-dark-1-background-color': '#B4E5DA', + '--theme-block-consolidation-stripe-dark-2-background-color': '#C1E9E1', + '--theme-block-consolidation-stripe-light-1-background-color': '#29b595', + '--theme-block-consolidation-stripe-light-2-background-color': '#53C3AA', + '--theme-block-consolidation-button-background-color': + 'rgba(41, 181, 149, 0.1)', + '--theme-block-consolidation-button-background-color-active': '#25a386', + '--theme-block-consolidation-button-background-color-hover': '#29b595', + '--theme-block-consolidation-button-icon-color': '#29b595', + '--theme-block-consolidation-button-icon-color-hover': '#ffffff', + '--theme-block-consolidation-button-text-color': '#29b595', + '--theme-block-consolidation-button-text-color-hover': '#ffffff', + '--theme-block-consolidation-button-border-color': '#29b595', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': 'rgba(41, 181, 149, 0.9)', + }, + body: { + '--theme-main-body-background-color': '#f9f9f9', + '--theme-main-body-messages-color': '#2d2d2d', + }, + borderedBox: { + '--theme-bordered-box-background-color': '#fff', + '--theme-bordered-box-border': '1px solid #fff', + '--theme-bordered-box-text-color': '#2d2d2d', + }, + button: { + '--theme-button-spinner-color': '#fff', + '--theme-label-button-color': '#2d2d2d', + }, + buttonAttention: { + '--theme-button-attention-background-color': '#ea4c5b', + '--theme-button-attention-background-color-hover': '#ee707c', + '--theme-button-attention-background-color-active': '#a43540', + '--theme-button-attention-background-color-disabled': '#fbdbde', + '--theme-button-attention-text-color': '#fafbfc', + '--theme-button-attention-text-color-disabled': '#fafbfc', + '--theme-button-attention-outline-color': '#f2949d', + }, + buttonDisclaimer: { + '--theme-button-disclaimer-background-color': '#ab1700', + '--theme-button-disclaimer-background-color-hover': '#fafbfc', + '--theme-button-disclaimer-background-color-active': '#fafbfc', + '--theme-button-disclaimer-background-color-disabled': + 'rgba(171, 23, 0, .3)', + '--theme-button-disclaimer-text-color-disabled': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-text-color': '#fafbfc', + '--theme-button-disclaimer-outline-color': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-border-color': '#fafbfc', + '--theme-button-disclaimer-border-color-disabled': + 'rgba(250, 251, 252, .3)', + }, + buttonFlat: { + '--theme-button-flat-background-color': 'rgba(41, 181, 149, 0.1)', + '--theme-button-flat-background-color-hover': 'rgba(41, 181, 149, 0.05)', + '--theme-button-flat-background-color-active': 'rgba(41, 181, 149, 0.12)', + '--theme-button-flat-background-color-disabled': 'rgba(41, 181, 149, 0.02)', + '--theme-button-flat-text-color-disabled': 'rgba(45, 45, 45, 0.3)', + '--theme-button-flat-text-color': '#2d2d2d', + '--theme-button-flat-outline-color': 'rgba(94, 96, 102, 0.2)', + }, + buttonPrimary: { + '--theme-button-primary-background-color': '#29b595', + '--theme-button-primary-background-color-hover': '#54c4aa', + '--theme-button-primary-background-color-active': '#25a386', + '--theme-button-primary-background-color-disabled': + 'rgba(41, 181, 149, 0.3)', + '--theme-button-primary-text-color-disabled': 'rgba(255, 255, 255, 0.7)', + '--theme-button-primary-text-color': '#fff', + '--theme-button-primary-outline-color': '#54c4aa', + }, + connecting: { + '--theme-connecting-background-color': '#ffffff', + '--theme-connecting-text-color': '#2d2d2d', + }, + dataMigration: { + '--theme-data-migration-layer-background-color': '#ffffff', + '--theme-data-migration-layer-box-shadow-color': '#29b595', + '--theme-data-migration-layer-button-background-color-hover': '#29b595', + '--theme-data-migration-layer-text-color': '#2d2d2d', + '--theme-data-migration-layer-text-opacity-color': '#fafbfc', + '--theme-data-migration-button-border-color': '#29b595', + '--theme-data-migration-button-label-color': '#29b595', + }, + delegationSetupWizard: { + '--theme-delegation-steps-activation-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-activation-description-color': '#2d2d2dcc', + '--theme-delegation-steps-activation-fees-label-color': '#2d2d2d', + '--theme-delegation-steps-activation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-activation-address-value-color': '#2d2d2d', + '--theme-delegation-steps-choose-stake-pool-checkmark-icon-color': + 'rgba(45, 45, 45, 0.1)', + '--theme-delegation-steps-choose-stake-pool-delegated-pools-label-color': + '#2d2d2d', + '--theme-delegation-steps-choose-stake-pool-slug-color': + 'rgba(45, 45, 45, 0.1)', + '--theme-delegation-steps-choose-stake-pool-select-box-placeholder-color': + 'rgba(45, 45, 45, 0.1)', + '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': '#fff', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': + 'rgba(45, 45, 45, 0.1)', + '--theme-delegation-steps-choose-stake-pool-title-color': '#2d2d2dcc', + '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': + '#2d2d2de6', + '--theme-delegation-steps-choose-stake-pool-tooltip-background-color': + '#2d2d2de6', + '--theme-delegation-steps-choose-stake-pool-tooltip-box-shadow': + '0 5px 20px 0 rgba(0, 0, 0, 0.25)', + '--theme-delegation-steps-choose-stake-pool-tooltip-description-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-slug-color': + '#2d2d2d99', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-label-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-value-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-title-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-url-color': '#85b6f9', + '--theme-delegation-steps-choose-wallet-custom-value-color': '#2d2d2d', + '--theme-delegation-steps-choose-wallet-description-color': '#2d2d2dcc', + '--theme-delegation-steps-choose-wallet-description-highlighted-color': + '#2d2d2d', + '--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b', + '--theme-delegation-steps-choose-wallet-error-message-light-color': + '#ea4c5bb3', + '--theme-delegation-steps-choose-wallet-error-select-options-color': + '#2d2d2d', + '--theme-delegation-steps-choose-wallet-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-description-color': '#2d2d2dcc', + '--theme-delegation-steps-confirmation-fees-label-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-intro-content-text-color': '#2d2d2dcc', + '--theme-delegation-steps-intro-divider-border-color': + 'rgba(45, 45, 45, 0.1)', + '--theme-delegation-steps-intro-link-color': '#ffffff', + '--theme-delegation-steps-intro-list-label-color': '#2d2d2d', + '--theme-delegation-steps-intro-list-numbers-color': '#2d2d2d', + '--theme-delegation-steps-intro-list-optional-label-color': '#2d2d2d80', + '--theme-delegation-steps-not-available-description-text-color': + '#2d2d2dcc', + '--theme-delegation-steps-not-available-description-highlight-text-color': + '#2d2d2d', + '--theme-delegation-steps-not-available-icon-color': '#2d2d2d', + '--theme-delegation-steps-not-available-subtitle-text-color': '#2d2d2d', + }, + dialog: { + '--theme-dialog-choice-tabs-text-color': '#2d2d2d', + '--theme-dialog-choice-tabs-text-color-active': '#2d2d2d', + '--theme-dialog-choice-tabs-bottom-border-color-active': '#2d2d2d', + '--theme-dialog-big-button-background-color': '#ffffff', + '--theme-dialog-big-button-border-color': 'none', + '--theme-dialog-big-button-label-color': '#2d2d2d', + '--theme-dialog-big-button-description-color': 'rgba(45, 45, 45, 0.6)', + '--theme-dialog-title-color': '#2d2d2d', + '--theme-dialog-text-color': '#2d2d2d', + '--theme-dialog-border-color': 'rgba(45, 45, 45, 0.1)', + }, + errors: { + '--theme-color-error': '#ea4c5b', + }, + fonts: { + '--font-ultralight': 'NotoSans-ExtraLight, NotoSansCJKjp-Thin', + '--font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--font-semibold': 'NotoSans-SemiBold, NotoSansCJKjp-Medium', + '--font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + '--font-heavy': 'NotoSans-ExtraBold, NotoSansCJKjp-Black', + '--font-black': 'NotoSans-Black, NotoSansCJKjp-Black', + '--font-mono': 'SFMono-Light', + }, + icon: { + '--theme-icon-nav-color': 'rgba(45, 45, 45, 0.6)', + '--theme-icon-nav-color-active': '#29b595', + '--theme-icon-sidebar-color': '#2d2d2d', + '--theme-icon-toggle-menu-color': '#2d2d2d', + '--theme-icon-node-update-notification-arrow-color': '#2d2d2d', + '--theme-icon-add-wallet-from-sidebar-color': '#2d2d2d', + '--theme-icon-ada-redemption-attention-color': '#fafbfc', + '--theme-icon-ada-redemption-success-color': '#2d2d2d', + '--theme-icon-ada-redemption-certificate-color': 'rgba(45, 45, 45, 0.5)', + '--theme-icon-ada-redemption-no-wallets': '#2d2d2d', + '--theme-icon-ada-summary-wallet-amount-symbol-color': '#2d2d2d', + '--theme-icon-ada-summary-wallet-pending-confirmation-symbol-color': + '#2d2d2d', + '--theme-icon-add-wallet-dialog-big-button-color': '#2d2d2d', + '--theme-icon-back-button-color': '#2d2d2d', + '--theme-icon-close-button-color': '#2d2d2d', + '--theme-icon-connecting-logo-color': '#2d2d2d', + '--theme-icon-copy-address-color': '#2d2d2d', + '--theme-icon-delegation-center-no-wallets': '#2d2d2d', + '--theme-icon-file-upload-color': '#2d2d2d', + '--theme-icon-syncing-logo-color': '#2d2d2d', + '--theme-icon-transactions-ada-symbol-color': '#2d2d2d', + '--theme-icon-transaction-type-color': '#fafbfc', + }, + input: { + '--theme-input-background-color': '#fff', + '--theme-input-border-color': 'rgba(45, 45, 45, 0.1)', + '--theme-input-focus-border-color': '#2d2d2d', + '--theme-input-hint-font': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--theme-input-label-color': '#2d2d2d', + '--theme-input-placeholder-color': '#2d2d2d80', + '--theme-input-remove-color-light': '#ea4c5b', + '--theme-input-right-floating-text-color': '#2d2d2d80', + '--theme-input-text-color': '#2d2d2d', + }, + link: { + '--theme-link-main-color': '#29b595', + }, + loading: { + '--theme-loading-background-color': '#f9f9f9', + '--theme-loading-no-disk-space-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-loading-no-disk-space-text-color': '#fafbfc', + '--theme-loading-no-disk-space-attention-icon-color': '#fafbfc', + '--theme-loading-status-icons-on-color': '#2dc06c', + '--theme-loading-status-icons-off-color': '#ea4c5b', + '--theme-loading-status-icons-unloaded-loading-color': '#2d2d2d', + '--theme-loading-status-icons-unloaded-syncing-color': '#2d2d2d', + '--theme-loading-status-icons-tooltip-color': '#2d2d2d', + '--theme-loading-spinner-color': '#2d2d2d', + }, + manualUpdate: { + '--theme-manual-update-overlay-background-color': '#fffffff5', + '--theme-manual-update-overlay-button-background-color': '#fff', + '--theme-manual-update-overlay-button-background-color-hover': '#29b595', + '--theme-manual-update-overlay-button-icon-color': '#29b595', + '--theme-manual-update-overlay-button-icon-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-text-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-border-color': '#29b595', + '--theme-manual-update-overlay-text-color': '#2d2d2db3', + '--theme-manual-update-overlay-text-highlight-color': '#2d2d2d', + '--theme-manual-update-overlay-title-text-color': '#2d2d2d', + '--theme-manual-update-overlay-button-label-color': '#29b595', + '--theme-manual-update-overlay-button-label-color-hover': '#fff', + }, + mnemonic: { + '--theme-mnemonic-background-color': 'rgba(94, 96, 102, 0.07)', + '--theme-mnemonic-background-color-hover': '#e0e0e0', + '--theme-backup-mnemonic-background-color': 'rgba(219, 219, 219, 0.2)', + }, + modal: { + '--theme-modal-overlay-background-color': 'rgba(0, 0, 0, 0.4)', + }, + navDropdown: { + '--theme-nav-dropdown-item-text-color': '#2d2d2d', + '--theme-nav-dropdown-item-background-color': '#fff', + '--theme-nav-dropdown-item-background-color-hover': + 'rgba(94, 96, 102, 0.07)', + '--theme-nav-dropdown-item-color-hover': '#2d2d2d', + }, + navItem: { + '--theme-nav-item-background-color': '#ffffff', + '--theme-nav-item-background-color-active': 'transparent', + '--theme-nav-item-background-color-hover': 'rgba(94, 96, 102, 0.1)', + '--theme-nav-item-text-color': 'rgba(45, 45, 45, 0.6)', + '--theme-nav-item-text-color-active': '#29b595', + }, + network: { + '--theme-network-window-background-color': '#fffffff5', + '--theme-network-window-text-color': '#2d2d2d', + '--theme-network-window-icon-close-hover-background': + 'rgba(41, 181, 149, 0.1)', + '--theme-network-window-red-color': '#f06e05', + '--theme-network-window-green-color': 'rgb(0, 129, 20)', + '--theme-network-window-white-color': '#2d2d2d', + '--theme-network-window-transparent-color': 'transparent', + '--theme-network-window-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-network-window-button-text-color': '#fafbfc', + '--theme-network-window-button-background-color': 'rgba(94, 96, 102, 0.4)', + '--theme-network-window-button-background-color-hover': + 'rgba(94, 96, 102, 0.6)', + '--theme-network-window-button-background-color-active': + 'rgba(94, 96, 102, 0.8)', + }, + nodeUpdate: { + '--theme-node-update-background-color': '#f9f9f9', + '--theme-node-update-title-color': '#2d2d2d', + '--theme-node-update-message-color': '#2d2d2d', + '--theme-node-sync-icon-color': '#2d2d2d', + '--theme-node-sync-info-message-background-color': '#f9f9f9', + '--theme-node-sync-info-message-text-color': '#2d2d2d', + '--theme-node-update-accept-button-background-color': '#29b595', + '--theme-node-update-accept-button-background-color-hover': '#54c4aa', + '--theme-node-update-accept-button-background-color-active': '#25a386', + '--theme-node-update-deny-button-background-color': + 'rgba(41, 181, 149, 0.3)', + '--theme-node-update-deny-button-background-color-hover': + 'rgba(84, 196, 170, 0.3)', + '--theme-node-update-deny-button-background-color-active': + 'rgba(37, 163, 134, 0.3)', + '--theme-node-update-button-text-color': '#fafbfc', + }, + notification: { + '--theme-notification-message-background-color': 'rgba(41, 181, 149, 0.9)', + '--theme-notification-message-text-color': '#fafbfc', + '--theme-legacy-badge-background-color': '#d34452', + '--theme-legacy-notification-background-color': '#ab2712', + '--theme-legacy-notification-learn-more-button-text-color': '#fafbfc', + '--theme-legacy-notification-learn-more-button-background-color': + '#f9f9f933', + '--theme-legacy-notification-learn-more-button-background-color-hover': + '#f9f9f94d', + '--theme-legacy-notification-learn-more-button-background-color-active': + '#f9f9f966', + '--theme-legacy-notification-move-button-text-color': '#ab2712', + '--theme-legacy-notification-move-button-background-color': '#fafbfc', + '--theme-legacy-notification-move-button-background-color-hover': + '#f9f9f9e6', + '--theme-legacy-notification-move-button-background-color-active': + '#f9f9f9cc', + '--theme-legacy-notification-title-color': '#fafbfc', + '--theme-legacy-notification-description-color': '#fafbfc', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', + }, + paperWallet: { + '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': + '#29b595', + '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': + 'rgba(94, 96, 102, 0.07)', + }, + progressBar: { + '--theme-progress-bar-background-color': 'rgba(45, 45, 45, 0.3)', + '--theme-progress-bar-foreground-color': 'rgba(45, 45, 45, 0.7)', + }, + receiveQRCode: { + '--theme-receive-qr-code-background-color': 'transparent', + '--theme-receive-qr-code-foreground-color': '#000', + }, + reportIssue: { + '--theme-report-issue-button-background-color': '#29b595', + '--theme-report-issue-button-background-color-hover': '#54c4aa', + '--theme-report-issue-button-background-color-active': '#25a386', + '--theme-report-issue-connecting-background-color': '#f9f9f9', + '--theme-report-issue-icon-color': '#f9f9f9', + '--theme-report-issue-connecting-text-color': '#2d2d2d', + '--theme-report-issue-syncing-background-color': 'rgba(45, 45, 45, 0.05)', + '--theme-report-issue-syncing-text-color': '#2d2d2d', + '--theme-report-issue-syncing-download-logs-text-color': '#2d2d2d', + '--theme-report-issue-syncing-download-logs-text-color-connecting': + '#2d2d2d', + }, + scrollbar: { + '--theme-scrollbar-thumb-background': '#c7c7c7', + }, + sendConfirmation: { + '--theme-send-confirmation-dialog-send-values-color': '#ea4c5b', + }, + settings: { + '--theme-settings-body-background-color': '#f9f9f9', + '--theme-settings-pane-background-color': '#fff', + '--theme-settings-pane-border': 'none', + '--theme-settings-menu-box-background-color': '#fff', + '--theme-settings-menu-box-border': 'none', + '--theme-settings-menu-item-text-color': '#2d2d2d', + '--theme-settings-menu-item-text-color-active': '#2d2d2d', + '--theme-settings-menu-item-text-color-disabled': '#2d2d2d80', + '--theme-settings-menu-item-background-color-active': + 'rgba(45, 45, 45, 0.07)', + '--theme-settings-menu-item-left-border-color-active': '#29b595', + '--theme-settings-theme-select-title-color': '#2d2d2d', + }, + sidebar: { + '--theme-sidebar-background-color': '#ffffff', + '--theme-sidebar-category-background-color-hover': '#f9f9f9', + '--theme-sidebar-category-background-color-active': '#f4f4f4', + '--theme-sidebar-category-text-color': '#2d2d2d', + '--theme-sidebar-menu-background-color': '#f4f4f4', + '--theme-sidebar-menu-item-background-color-hover': '#eeeeee', + '--theme-sidebar-menu-item-background-color-active': '#e9e9e9', + '--theme-sidebar-menu-item-wallet-name-color': '#2d2d2d', + '--theme-sidebar-menu-item-wallet-info-color': '#2d2d2d', + '--theme-sidebar-menu-add-button-background-color': '#f4f4f4', + '--theme-sidebar-menu-add-button-background-color-active': '#e9e9e9a8', + '--theme-sidebar-menu-add-button-background-color-hover': '#eeeeeea8', + '--theme-sidebar-menu-add-button-text-color': '#2d2d2d', + }, + stakePools: { + '--theme-staking-stake-pools-title-color': '#2d2d2d', + '--theme-staking-stake-pools-search-button-color': '#2d2d2d', + '--theme-staking-stake-pool-background-color': '#fff', + '--theme-staking-stake-pool-border-color': 'rgba(45, 45, 45, 0.1)', + '--theme-staking-stake-pool-glow-color': 'rgba(94, 96, 102, 0.07)', + '--theme-staking-stake-pools-search-icon-color': '#2d2d2d', + '--theme-staking-stake-pool-selected-background-color': '#5da377', + '--theme-staking-stake-pool-selected-checkmark-icon-color': '#fafbfc', + '--theme-staking-stake-pool-selected-slug-color': '#fafbfc', + '--theme-staking-stake-pool-slug-color': '#2d2d2d', + '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-background-color': '#fff', + '--theme-staking-stake-pool-tooltip-border-color': 'rgba(45, 45, 45, 0.1)', + '--theme-staking-stake-pool-tooltip-shadow-color': 'rgba(0, 0, 0, 0.25)', + '--theme-staking-stake-pool-tooltip-text-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-link-color': '#29b595', + '--theme-staking-stake-pool-tooltip-table-title-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-table-param-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-retirement-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-delegate-button-background-color': + '#29b595', + '--theme-staking-stake-pool-tooltip-delegate-button-hover-background-color': + '#54c4aa', + '--theme-staking-stake-pool-tooltip-delegate-button-active-background-color': + '#25a386', + '--theme-staking-stake-pool-tooltip-delegate-button-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-delegate-button-inverse-text-color': + '#fafbfc', + '--theme-staking-stake-pool-tooltip-delegate-button-border-color': + 'transparent', + '--theme-staking-progress-label-light': '#fafbfc', + }, + staking: { + '--theme-staking-content-background-color': '#fff', + '--theme-staking-content-border-color': 'none', + '--theme-staking-font-color-accent': '#2d2d2d', + '--theme-staking-font-color-regular': '#2d2d2d', + '--theme-staking-font-color-light': '#2d2d2db3', + '--theme-staking-font-color-lighter': '#2d2d2d80', + '--theme-staking-table-head-background-color': '#f9f9f9', + '--theme-staking-table-border-color': 'rgba(45, 45, 45, 0.1)', + '--theme-staking-link-color': '#29b595', + '--theme-staking-link-color-light': '#29b595', + '--theme-staking-progress-bar-background-color': 'rgba(94, 96, 102, 0.07)', + '--theme-staking-progress-stripe-dark-1-background-color': '#29b595', + '--theme-staking-progress-stripe-dark-2-background-color': '#53C3AA', + '--theme-staking-table-body-highlighted-text-color': '#29b595', + '--theme-staking-info-learn-more-button-text-color': '#fff', + '--theme-staking-info-learn-more-icon-color': '#fafbfc', + '--theme-staking-learn-more-button-color': '#fff', + '--theme-staking-learn-more-icon-color': '#fafbfc', + '--theme-staking-donut-ring-completed-color': '#ea4c5b', + '--theme-staking-donut-ring-remaining-color': '#fbdbde', + '--theme-staking-wallet-row-border-color': 'rgba(45, 45, 45, 0.1)', + '--theme-staking-dropdown-item-text-color-hover': '#2d2d2d', + '--theme-staking-dropdown-item-background-color': '#fff', + '--theme-staking-dropdown-item-background-color-hover': + 'rgba(94, 96, 102, 0.07)', + '--theme-staking-delegation-center-gear-icon-fill-color': '#2d2d2d80', + '--theme-staking-delegation-center-gear-icon-fill-color-active': '#2d2d2d', + '--theme-staking-delegation-center-no-wallets-instructions-color': + '#2d2d2d', + }, + support: { + '--theme-support-settings-item-color': '#2d2d2d', + '--theme-support-settings-link-color': '#ffffff', + '--theme-support-settings-text-color': '#2d2d2d', + }, + syncing: { + '--theme-syncing-background-color': '#f9f9f9', + '--theme-syncing-text-color': '#2d2d2d', + }, + systemError: { + '--theme-system-error-overlay-attention-icon-color': '#fafbfc', + '--theme-system-error-overlay-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-system-error-overlay-support-link-icon-color': '#fafbfc', + '--theme-system-error-overlay-text-color': '#fafbfc', + }, + tabs: { + '--theme-choice-tabs-text-color': '#2d2d2d', + '--theme-choice-tabs-text-color-active': '#2d2d2d', + '--theme-choice-tabs-bottom-border-color-active': '#2d2d2d', + }, + testEnvironment: { + '--theme-test-environment-label-background-color': '#ab1700', + '--theme-test-environment-label-text-color': '#fafbfc', + }, + topBar: { + '--theme-topbar-background-color': '#ffffff', + '--theme-topbar-layout-body-background-color': '#ffffff', + '--theme-topbar-wallet-name-color': '#2d2d2d', + '--theme-topbar-wallet-info-color': '#2d2d2d', + '--theme-topbar-logo-color': '#2d2d2d', + }, + transactions: { + '--theme-transactions-list-background-color': '#fff', + '--theme-transactions-list-border-color': 'transparent', + '--theme-transactions-list-group-date-color': '#2d2d2d', + '--theme-transactions-list-item-details-color': '#2d2d2d', + '--theme-transactions-state-failed-background-color': + 'rgba(189, 196, 206, 0.8)', + '--theme-transactions-state-pending-background-color': '#e0e0e0', + '--theme-transactions-state-pending-stripes-color': '#c7c7c7', + '--theme-transactions-priority-color': '#f9f9f9', + '--theme-transactions-priority-low-background-color': 'rgba(171, 23, 0, 1)', + '--theme-transactions-priority-medium-background-color': + 'rgba(230, 170, 0, 1)', + '--theme-transactions-priority-high-background-color': + 'rgba(0, 118, 0, 1);', + '--theme-transactions-search-background-color': '#f9f9f9', + '--theme-transactions-icon-type-expend-background-color': '#84a2d2', + '--theme-transactions-icon-type-income-background-color': '#2dc06c', + '--theme-transactions-icon-type-exchange-background-color': '#10aca4', + '--theme-transactions-icon-type-failed-background-color': '#ee707c', + '--theme-transactions-arrow-stroke-color': '#2d2d2d', + '--theme-transactions-state-failed-text-color': 'rgba(45, 45, 45, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': '#fafbfc', + }, + uploader: { + '--theme-uploader-text-color': '#2d2d2d', + '--theme-uploader-border-color': 'rgba(45, 45, 45, 0.1)', + }, + utxo: { + '--theme-utxo-background-color': 'rgba(45, 45, 45, 0.05)', + '--theme-utxo-title-text-color': '#2d2d2d', + '--theme-utxo-title-description-color': '#2d2d2db3', + '--theme-utxo-bar-color': 'rgba(41, 181, 149, 0.5)', + '--theme-utxo-label-text-color': '#2d2d2d73', + '--theme-utxo-tick-text-color': '#2d2d2d73', + '--theme-utxo-cursor-background-color': 'rgba(41, 181, 149, 0.1)', + '--theme-utxo-tooltip-background-color': 'rgba(41, 181, 149, 0.9)', + '--theme-utxo-tooltip-shadow-color': 'rgba(0, 0, 0, 0.18)', + '--theme-utxo-tooltip-text-color': '#fafbfc', + }, + rpTooltip: { + '--rp-tooltip-bg-color': '#2d2d2d', + '--rp-tooltip-text-color': '#fafbfc', + }, +}; + +const WHITE_THEME_PARAMS: CreateThemeParams = { + config: WHITE_THEME_CONFIG, +}; + +export default createTheme(WHITE_THEME_PARAMS); diff --git a/source/renderer/app/themes/daedalus/yellow.js b/source/renderer/app/themes/daedalus/yellow.js new file mode 100644 index 0000000000..81908407fa --- /dev/null +++ b/source/renderer/app/themes/daedalus/yellow.js @@ -0,0 +1,718 @@ +// @flow +import { createTheme } from '../utils/createTheme'; +import type { CreateThemeParams } from '../types'; + +// ==== yellow theme config for Daedalus and react-polymorph components === // +export const YELLOW_THEME_CONFIG = { + rpAutocomplete: { + '--rp-autocomplete-bg-color': '#fff', + '--rp-autocomplete-border': '1px solid #e1dac6', + '--rp-autocomplete-border-color-opened': '#2d2d2d', + '--rp-autocomplete-input-text-color': '#2d2d2d', + '--rp-autocomplete-placeholder-color': '#2d2d2d80', + '--rp-autocomplete-selected-word-box-bg-color': '#2d2d2d', + '--rp-autocomplete-selected-word-text-color': '#fafbfc', + '--rp-autocomplete-selected-words-font-family': + 'NotoSans-Regular, NotoSansCJKjp-Regular', + }, + rpBubble: { + '--rp-bubble-bg-color': '#fff', + '--rp-bubble-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-bubble-border-radius': '2px', + '--rp-bubble-arrow-bg-color': 'rgba(45, 45, 45, 0.07)', + }, + rpButton: { + '--rp-button-bg-color': '#2d2d2d', + '--rp-button-bg-color-active': '#222222', + '--rp-button-bg-color-disabled': 'rgba(45, 45, 45, 0.3)', + '--rp-button-bg-color-hover': '#424242', + '--rp-button-font-family': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-button-font-size': '14px', + '--rp-button-height': '50px', + '--rp-button-line-height': '20px', + '--rp-button-padding': '0', + '--rp-button-text-color': '#fafbfc', + '--rp-button-text-color-disabled': '#fafbfc', + '--rp-button-text-transform': 'none', + '--rp-button-width': '360px', + }, + rpCheckbox: { + '--rp-checkbox-border': '1px solid #2d2d2d', + '--rp-checkbox-border-color-disabled': '#2d2d2d66', + '--rp-checkbox-check-bg-color': '#2d2d2d', + '--rp-checkbox-label-text-color': '#2d2d2d', + '--rp-checkbox-label-text-color-disabled': '#2d2d2d4d', + }, + rpColors: { + '--rp-theme-color-error': '#ea4c5b', + }, + rpFonts: { + '--rp-theme-font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--rp-theme-font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--rp-theme-font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-theme-font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--rp-theme-font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + }, + rpFormfield: { + '--rp-formfield-bg-color-disabled': 'none', + '--rp-formfield-label-text-color': '#2d2d2d', + '--rp-formfield-label-text-color-disabled': '#2d2d2d', + '--rp-formfield-error-text-color': '#ea4c5b', + '--rp-formfield-error-text-opacity': '0.75', + }, + rpInput: { + '--rp-input-bg-color': '#ffffff', + '--rp-input-bg-color-disabled': 'rgba(94, 96, 102, 0.05)', + '--rp-input-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-input-border-color-disabled': '#e1dac680', + '--rp-input-border-color-errored': '#ea4c5b', + '--rp-input-border-color-focus': '#2d2d2d', + '--rp-input-line-height': '22px', + '--rp-input-padding': '12px 20px', + '--rp-input-placeholder-color': '#2d2d2d80', + '--rp-input-placeholder-color-disabled': '#2d2d2d80', + '--rp-input-text-color': '#2d2d2d', + '--rp-input-text-color-disabled': '#2d2d2d80', + }, + rpModal: { + '--rp-modal-bg-color': '#ffffff', + '--rp-modal-max-height': '90%', + '--rp-modal-overlay-bg-color': 'rgba(0, 0, 0, 0.4)', + }, + rpOptions: { + '--rp-option-bg-color': '#fff', + '--rp-option-bg-color-highlighted': '#edeeef', + '--rp-option-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-option-checkmark-color': '#2d2d2d', + '--rp-option-line-height': '22px', + '--rp-option-text-color': '#2d2d2d', + '--rp-options-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-options-shadow': 'none', + }, + rpSelect: { + '--rp-select-arrow-bg-color': 'rgba(45, 45, 45, 0.2)', + '--rp-select-arrow-bg-color-open': '#2d2d2d', + '--rp-select-input-bg-color': '#fff', + '--rp-select-input-border-color': 'rgba(45, 45, 45, 0.2)', + '--rp-select-input-border-color-focus': '#2d2d2d', + '--rp-select-input-text-color': '#2d2d2d', + '--rp-select-input-placeholder-color': '#2d2d2d80', + }, + rpStepper: { + '--rp-stepper-bullet-background-color-disabled': '#ffffff', + '--rp-stepper-bullet-border-color': '#2d2d2d1a', + '--rpstepper-bullet-height': '12px', + '--rpstepper-bullet-width': '12px', + '--rp-stepper-label-color': '#2d2d2d', + '--rp-stepper-label-color-light': '#2d2d2d4d', + '--rp-stepper-main-color': '#2d2d2d', + '--rp-stepper-main-color-light': '#2d2d2d1a', + '--rpstepper-stepper-step-label-bottom-margin': '6px', + '--rpstepper-steps-bar-color-disabled': '#2d2d2d1a', + '--rpstepper-steps-bar-top-position': '6px', + }, + rpSwitch: { + '--rp-switch-bg-color-off': '#2d2d2d', + '--rp-switch-bg-color-on': '#2d2d2d', + '--rp-switch-label-margin': '0 30px 0 0', + '--rp-switch-label-opacity': '0.5', + '--rp-switch-label-text-color': '#2d2d2d', + '--rp-switch-label-width': '100%', + '--rp-switch-opacity-off': '0.3', + '--rp-switch-root-margin': '0 0 30px 0', + '--rp-switch-thumb-bg-color': '#fff', + }, + rpTextArea: { + '--rp-textarea-bg-color': '#f8f3ed', + '--rp-textarea-bg-color-disabled': '#f8f3ed80', + '--rp-textarea-border': '1px solid #e1dac6', + '--rp-textarea-border-color-disabled': '#e1dac680', + '--rp-textarea-border-color-errored': '#ea4c5b', + '--rp-textarea-border-color-focus': '#2d2d2d', + '--rp-textarea-border-radius': '2px', + '--rp-textarea-line-height': '20px', + '--rp-textarea-placeholder-color': '#2d2d2d80', + '--rp-textarea-resize': 'none', + '--rp-textarea-text-color': '#2d2d2d', + }, + rpTooltip: { + '--rp-tooltip-bg-color': '#2d2d2d', + '--rp-tooltip-text-color': '#ffffff', + }, + aboutWindow: { + '--theme-about-window-background-color': 'rgba(255, 185, 35, 0.96)', + '--theme-about-window-header-bottom-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-about-window-daedalus-icon-color': '#2d2d2d', + '--theme-about-window-cardano-icon-color': '#2d2d2d', + '--theme-about-window-title-varsion-color': '#2d2d2d', + '--theme-about-window-title-stroke-color': '#2d2d2d', + '--theme-about-window-content-color': '#2d2d2d', + '--theme-about-window-content-text-color': '#2d2d2d', + '--theme-about-window-content-bottom-border-color': '#2d2d2d4d', + '--theme-about-window-icon-close-button-color': '#2d2d2d', + '--theme-about-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.1)', + }, + adaRedemption: { + '--theme-ada-redemption-headline-color': '#2d2d2d', + '--theme-ada-redemption-instructions-color': '#2d2d2d', + '--theme-ada-redemption-success-overlay-background-color': '#fdcd68', + '--theme-ada-redemption-success-overlay-border-color': '#424242', + '--theme-ada-redemption-success-overlay-message-color': '#424242', + '--theme-ada-redemption-success-overlay-button-text-color': '#424242', + '--theme-ada-redemption-success-overlay-button-text-color-hover': '#fdcd68', + '--theme-ada-redemption-success-overlay-button-background-color-hover': + '#424242', + '--theme-ada-redemption-disclaimer-background-color': + 'rgba(171, 23, 0, 0.94)', + '--theme-ada-redemption-disclaimer-text-color': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-check': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-checked': '#fafbfc', + '--theme-ada-redemption-disclaimer-checkbox-color-after': '#ab1700', + '--theme-ada-redemption-disclaimer-checkbox-label-color': '#fafbfc', + '--theme-ada-redemption-no-wallets-instructions-color': '#2d2d2d', + '--theme-ada-redemption-disclaimer-button-border-color': '#f8f7f3', + '--theme-ada-redemption-success-overlay-close-button-color': '#2d2d2d', + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': + 'rgba(45, 45, 45, 0.07)', + }, + blockConsolidation: { + '--theme-block-consolidation-background-color': 'rgba(255, 185, 35, 0.96)', + '--theme-block-consolidation-title-text-color': 'rgba(45, 45, 45, 1)', + '--theme-block-consolidation-text-color': 'rgba(45, 45, 45, 0.7)', + '--theme-block-consolidation-text-highlight-color': 'rgba(45, 45, 45, 1)', + '--theme-block-consolidation-epochs-text-color': '#ffffff', + '--theme-block-consolidation-indicator-text-color': 'rgba(45, 45, 45, 1)', + '--theme-block-consolidation-indicator-container-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-indicator-epochs-behind-background-color-1': + '#2d2d2d', + '--theme-block-consolidation-indicator-epochs-behind-background-color-2': + 'rgba(45, 45, 45, 0)', + '--theme-block-consolidation-stripe-dark-1-background-color': + 'rgba(63, 62, 62, 0.3)', + '--theme-block-consolidation-stripe-dark-2-background-color': + 'rgba(45, 45, 45, 0.3)', + '--theme-block-consolidation-stripe-light-1-background-color': + 'rgba(63, 62, 62, 1)', + '--theme-block-consolidation-stripe-light-2-background-color': + 'rgba(45, 45, 45, 1)', + '--theme-block-consolidation-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-block-consolidation-button-background-color-active': + 'rgba(28, 28, 28, 0.96)', + '--theme-block-consolidation-button-background-color-hover': '#2d2d2d', + '--theme-block-consolidation-button-icon-color': '#2d2d2d', + '--theme-block-consolidation-button-icon-color-hover': '#ffffff', + '--theme-block-consolidation-button-text-color': '#2d2d2d', + '--theme-block-consolidation-button-text-color-hover': '#ffffff', + '--theme-block-consolidation-button-border-color': '#2d2d2d', + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': 'rgba(45, 45, 45, 0.9)', + }, + body: { + '--theme-main-body-background-color': '#f8f3ed', + '--theme-main-body-messages-color': '#2d2d2d', + }, + borderedBox: { + '--theme-bordered-box-background-color': '#ffffff', + '--theme-bordered-box-border': '1px solid #e1dac6', + '--theme-bordered-box-text-color': '#2d2d2d', + }, + button: { + '--theme-button-spinner-color': '#f8f7f3', + '--theme-label-button-color': '#2d2d2d', + }, + buttonAttention: { + '--theme-button-attention-background-color': '#ea4c5b', + '--theme-button-attention-background-color-hover': '#ee707c', + '--theme-button-attention-background-color-active': '#a43540', + '--theme-button-attention-background-color-disabled': '#fbdbde', + '--theme-button-attention-text-color': '#fafbfc', + '--theme-button-attention-text-color-disabled': '#fafbfc', + '--theme-button-attention-outline-color': '#f2949d', + }, + buttonDisclaimer: { + '--theme-button-disclaimer-background-color': '#ab1700', + '--theme-button-disclaimer-background-color-hover': '#fafbfc', + '--theme-button-disclaimer-background-color-active': '#fafbfc', + '--theme-button-disclaimer-background-color-disabled': + 'rgba(171, 23, 0, .3)', + '--theme-button-disclaimer-text-color-disabled': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-text-color': '#fafbfc', + '--theme-button-disclaimer-outline-color': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-border-color': '#fafbfc', + '--theme-button-disclaimer-border-color-disabled': + 'rgba(250, 251, 252, .3)', + }, + buttonFlat: { + '--theme-button-flat-background-color': 'rgba(45, 45, 45, 0.1)', + '--theme-button-flat-background-color-hover': 'rgba(45, 45, 45, 0.05)', + '--theme-button-flat-background-color-active': 'rgba(45, 45, 45, 0.12)', + '--theme-button-flat-background-color-disabled': 'rgba(45, 45, 45, 0.02)', + '--theme-button-flat-text-color-disabled': '#2d2d2d', + '--theme-button-flat-text-color': '#2d2d2d', + '--theme-button-flat-outline-color': '#d6d3ca', + }, + buttonPrimary: { + '--theme-button-primary-background-color': '#2d2d2d', + '--theme-button-primary-background-color-hover': '#424242', + '--theme-button-primary-background-color-active': '#222222', + '--theme-button-primary-background-color-disabled': 'rgba(45, 45, 45, 0.3)', + '--theme-button-primary-text-color-disabled': '#fafbfc', + '--theme-button-primary-text-color': '#fafbfc', + '--theme-button-primary-outline-color': '#4C4C4C', + }, + connecting: { + '--theme-connecting-background-color': 'rgba(255, 185, 35, 0.96)', + '--theme-connecting-text-color': '#2d2d2d', + }, + dataMigration: { + '--theme-data-migration-layer-background-color': '#fdcd68', + '--theme-data-migration-layer-box-shadow-color': '#fdcd68', + '--theme-data-migration-layer-button-background-color-hover': '#2d2d2d', + '--theme-data-migration-layer-text-color': '#2d2d2d', + '--theme-data-migration-layer-text-opacity-color': '#fafbfc', + '--theme-data-migration-button-border-color': '#2d2d2d', + '--theme-data-migration-button-label-color': '#2d2d2d', + }, + delegationSetupWizard: { + '--theme-delegation-steps-activation-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-activation-description-color': '#2d2d2dcc', + '--theme-delegation-steps-activation-fees-label-color': '#2d2d2d', + '--theme-delegation-steps-activation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-activation-address-value-color': '#2d2d2d', + '--theme-delegation-steps-choose-stake-pool-checkmark-icon-color': + '#e1dac6', + '--theme-delegation-steps-choose-stake-pool-delegated-pools-label-color': + '#2d2d2d', + '--theme-delegation-steps-choose-stake-pool-slug-color': '#e1dac6', + '--theme-delegation-steps-choose-stake-pool-select-box-placeholder-color': + '#e1dac6', + '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-selected-slug-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': '#fff', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': '#e1dac6', + '--theme-delegation-steps-choose-stake-pool-title-color': '#2d2d2dcc', + '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': + '#2d2d2de6', + '--theme-delegation-steps-choose-stake-pool-tooltip-background-color': + '#2d2d2de6', + '--theme-delegation-steps-choose-stake-pool-tooltip-box-shadow': + '0 5px 20px 0 rgba(0, 0, 0, 0.25)', + '--theme-delegation-steps-choose-stake-pool-tooltip-description-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-slug-color': + '#2d2d2d99', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-label-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-value-color': + '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-title-color': '#fafbfc', + '--theme-delegation-steps-choose-stake-pool-tooltip-url-color': '#d6902f', + '--theme-delegation-steps-choose-wallet-custom-value-color': '#2d2d2d', + '--theme-delegation-steps-choose-wallet-description-color': '#2d2d2dcc', + '--theme-delegation-steps-choose-wallet-description-highlighted-color': + '#2d2d2d', + '--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b', + '--theme-delegation-steps-choose-wallet-error-message-light-color': + '#ea4c5bb3', + '--theme-delegation-steps-choose-wallet-error-select-options-color': + '#2d2d2d', + '--theme-delegation-steps-choose-wallet-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-steps-indicator-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-description-color': '#2d2d2dcc', + '--theme-delegation-steps-confirmation-fees-label-color': '#2d2d2d', + '--theme-delegation-steps-confirmation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-intro-content-text-color': '#2d2d2dcc', + '--theme-delegation-steps-intro-divider-border-color': '#e1dac6', + '--theme-delegation-steps-intro-link-color': '#d6902f', + '--theme-delegation-steps-intro-list-label-color': '#2d2d2d', + '--theme-delegation-steps-intro-list-numbers-color': '#2d2d2d', + '--theme-delegation-steps-intro-list-optional-label-color': '#2d2d2d80', + '--theme-delegation-steps-not-available-description-text-color': + '#2d2d2dcc', + '--theme-delegation-steps-not-available-description-highlight-text-color': + '#2d2d2d', + '--theme-delegation-steps-not-available-icon-color': '#2d2d2d', + '--theme-delegation-steps-not-available-subtitle-text-color': '#2d2d2d', + }, + dialog: { + '--theme-dialog-choice-tabs-text-color': '#2d2d2d', + '--theme-dialog-choice-tabs-text-color-active': '#2d2d2d', + '--theme-dialog-choice-tabs-bottom-border-color-active': '#2d2d2d', + '--theme-dialog-big-button-background-color': '#ffffff', + '--theme-dialog-big-button-border-color': '#e1dac6', + '--theme-dialog-big-button-label-color': '#2d2d2d', + '--theme-dialog-big-button-description-color': '#2d2d2d', + '--theme-dialog-title-color': '#2d2d2d', + '--theme-dialog-text-color': '#2d2d2d', + '--theme-dialog-border-color': 'rgba(45, 45, 45, 0.2)', + }, + errors: { + '--theme-color-error': '#ea4c5b', + }, + fonts: { + '--font-ultralight': 'NotoSans-ExtraLight, NotoSansCJKjp-Thin', + '--font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--font-semibold': 'NotoSans-SemiBold, NotoSansCJKjp-Medium', + '--font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + '--font-heavy': 'NotoSans-ExtraBold, NotoSansCJKjp-Black', + '--font-black': 'NotoSans-Black, NotoSansCJKjp-Black', + '--font-mono': 'SFMono-Light', + }, + icon: { + '--theme-icon-nav-color': 'rgba(45, 45, 45, 0.6)', + '--theme-icon-nav-color-active': '#ffffff', + '--theme-icon-sidebar-color': '#2d2d2d', + '--theme-icon-toggle-menu-color': '#2d2d2d', + '--theme-icon-node-update-notification-arrow-color': '#2d2d2d', + '--theme-icon-add-wallet-from-sidebar-color': '#2d2d2d', + '--theme-icon-ada-redemption-attention-color': '#fafbfc', + '--theme-icon-ada-redemption-success-color': '#2d2d2d', + '--theme-icon-ada-redemption-certificate-color': '#2d2d2d', + '--theme-icon-ada-redemption-no-wallets': '#2d2d2d', + '--theme-icon-ada-summary-wallet-amount-symbol-color': '#2d2d2d', + '--theme-icon-ada-summary-wallet-pending-confirmation-symbol-color': + '#2d2d2d', + '--theme-icon-add-wallet-dialog-big-button-color': '#2d2d2d', + '--theme-icon-back-button-color': '#2d2d2d', + '--theme-icon-close-button-color': '#2d2d2d', + '--theme-icon-connecting-logo-color': '#2d2d2d', + '--theme-icon-copy-address-color': '#2d2d2d', + '--theme-icon-delegation-center-no-wallets': '#2d2d2d', + '--theme-icon-file-upload-color': '#2d2d2d', + '--theme-icon-syncing-logo-color': '#2d2d2d', + '--theme-icon-transactions-ada-symbol-color': '#2d2d2d', + '--theme-icon-transaction-type-color': '#fafbfc', + }, + input: { + '--theme-input-background-color': '#fff', + '--theme-input-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-input-focus-border-color': '#2d2d2d', + '--theme-input-hint-font': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--theme-input-label-color': '#2d2d2d', + '--theme-input-placeholder-color': '#2d2d2d80', + '--theme-input-remove-color-light': '#ea4c5b', + '--theme-input-right-floating-text-color': '#2d2d2d80', + '--theme-input-text-color': '#2d2d2d', + }, + link: { + '--theme-link-main-color': '#d6902f', + }, + loading: { + '--theme-loading-background-color': '#ffffff', + '--theme-loading-no-disk-space-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-loading-no-disk-space-text-color': '#ffffff', + '--theme-loading-no-disk-space-attention-icon-color': '#ffffff', + '--theme-loading-status-icons-on-color': '#2dc06c', + '--theme-loading-status-icons-off-color': '#ea4c5b', + '--theme-loading-status-icons-unloaded-loading-color': '#2d2d2d', + '--theme-loading-status-icons-unloaded-syncing-color': '#2d2d2d', + '--theme-loading-status-icons-tooltip-color': '#2d2d2d', + '--theme-loading-spinner-color': '#2d2d2d', + }, + manualUpdate: { + '--theme-manual-update-overlay-background-color': + 'rgba(255, 185, 35, 0.96)', + '--theme-manual-update-overlay-button-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-manual-update-overlay-button-background-color-hover': '#2d2d2d', + '--theme-manual-update-overlay-button-icon-color': '#2d2d2d', + '--theme-manual-update-overlay-button-icon-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-text-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-border-color': '#2d2d2d', + '--theme-manual-update-overlay-text-color': 'rgba(45, 45, 45, 0.7)', + '--theme-manual-update-overlay-text-highlight-color': + '#rgba(45, 45, 45, 1)', + '--theme-manual-update-overlay-title-text-color': 'rgba(45, 45, 45, 1)', + '--theme-manual-update-overlay-button-label-color': 'rgba(45, 45, 45, 1)', + '--theme-manual-update-overlay-button-label-color-hover': '#ffffff', + }, + mnemonic: { + '--theme-mnemonic-background-color': 'rgba(45, 45, 45, 0.07)', + '--theme-mnemonic-background-color-hover': '#d6d3ca', + '--theme-backup-mnemonic-background-color': '#f1eee6', + }, + modal: { + '--theme-modal-overlay-background-color': 'rgba(0, 0, 0, 0.4)', + }, + navDropdown: { + '--theme-nav-dropdown-item-text-color': '#2d2d2d', + '--theme-nav-dropdown-item-background-color': '#fff', + '--theme-nav-dropdown-item-background-color-hover': + 'rgba(248, 243, 237, 0.5)', + '--theme-nav-dropdown-item-color-hover': '#2d2d2d', + }, + navItem: { + '--theme-nav-item-background-color': '#eea70e', + '--theme-nav-item-background-color-active': '#2d2d2d', + '--theme-nav-item-background-color-hover': '#ffb923', + '--theme-nav-item-text-color': 'rgba(45, 45, 45, 0.6)', + '--theme-nav-item-text-color-active': '#fafbfc', + }, + network: { + '--theme-network-window-background-color': 'rgba(255, 185, 35, 0.96)', + '--theme-network-window-text-color': '#2d2d2d', + '--theme-network-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.1)', + '--theme-network-window-red-color': '#be0b0b', + '--theme-network-window-green-color': '#008114', + '--theme-network-window-white-color': '#2d2d2d', + '--theme-network-window-transparent-color': 'transparent', + '--theme-network-window-border-color': 'rgba(45, 45, 45, 0.2)', + '--theme-network-window-button-text-color': '#ffffff', + '--theme-network-window-button-background-color': 'rgba(45, 45, 45, 0.4)', + '--theme-network-window-button-background-color-hover': + 'rgba(45, 45, 45, 0.6)', + '--theme-network-window-button-background-color-active': + 'rgba(45, 45, 45, 0.8)', + }, + nodeUpdate: { + '--theme-node-update-background-color': '#f8f3ed', + '--theme-node-update-title-color': '#2d2d2d', + '--theme-node-update-message-color': '#2d2d2d', + '--theme-node-sync-info-message-background-color': '#f8f3ed', + '--theme-node-sync-info-message-text-color': '#2d2d2d', + '--theme-node-sync-icon-color': '#2d2d2d', + '--theme-node-update-accept-button-background-color': '#424242', + '--theme-node-update-accept-button-background-color-hover': '#2d2d2d', + '--theme-node-update-accept-button-background-color-active': '#222222', + '--theme-node-update-deny-button-background-color': 'rgba(45, 45, 45, 0.4)', + '--theme-node-update-deny-button-background-color-hover': + 'rgba(45, 45, 45, 0.6)', + '--theme-node-update-deny-button-background-color-active': + 'rgba(45, 45, 45, 0.8)', + '--theme-node-update-button-text-color': '#fafbfc', + }, + notification: { + '--theme-notification-message-background-color': '#fdcd68f2', + '--theme-notification-message-text-color': '#2d2d2d', + '--theme-notification-message-checkmark-icon-color': '#2d2d2d', + '--theme-notification-message-close-icon-color': '#2d2d2d', + '--theme-legacy-badge-background-color': '#d34452', + '--theme-legacy-notification-background-color': '#ab2712', + '--theme-legacy-notification-learn-more-button-text-color': '#fafbfc', + '--theme-legacy-notification-learn-more-button-background-color': + '#f8f3ed33', + '--theme-legacy-notification-learn-more-button-background-color-hover': + '#f8f3ed4d', + '--theme-legacy-notification-learn-more-button-background-color-active': + '#f8f3ed66', + '--theme-legacy-notification-move-button-text-color': '#ab2712', + '--theme-legacy-notification-move-button-background-color': '#fafbfc', + '--theme-legacy-notification-move-button-background-color-hover': + '#f8f3ede6', + '--theme-legacy-notification-move-button-background-color-active': + '#f8f3edcc', + '--theme-legacy-notification-title-color': '#fafbfc', + '--theme-legacy-notification-description-color': '#fafbfc', + }, + paperWallet: { + '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': + '#d6902f', + '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': + 'rgba(45, 45, 45, 0.07)', + }, + progressBar: { + '--theme-progress-bar-background-color': 'rgba(45, 45, 45, 0.3)', + '--theme-progress-bar-foreground-color': 'rgba(45, 45, 45, 0.7)', + }, + receiveQRCode: { + '--theme-receive-qr-code-background-color': 'transparent', + '--theme-receive-qr-code-foreground-color': '#000', + }, + reportIssue: { + '--theme-report-issue-button-background-color': '#2d2d2d', + '--theme-report-issue-button-background-color-hover': '#424242', + '--theme-report-issue-button-background-color-active': '#222222', + '--theme-report-issue-connecting-background-color': '#fdcd68', + '--theme-report-issue-icon-color': '#f8f3ed', + '--theme-report-issue-connecting-text-color': '#2d2d2d', + '--theme-report-issue-syncing-background-color': 'rgba(94, 96, 102, 0.05)', + '--theme-report-issue-syncing-text-color': '#2d2d2d', + '--theme-report-issue-syncing-download-logs-text-color': '#d6902f', + '--theme-report-issue-syncing-download-logs-text-color-connecting': + '#2d2d2d', + }, + scrollbar: { + '--theme-scrollbar-thumb-background': '#bebbb3', + }, + sendConfirmation: { + '--theme-send-confirmation-dialog-send-values-color': '#ea4c5b', + }, + settings: { + '--theme-settings-body-background-color': '#f8f3ed', + '--theme-settings-pane-background-color': '#fff', + '--theme-settings-pane-border': '1px solid #e1dac6', + '--theme-settings-menu-box-background-color': '#fff', + '--theme-settings-menu-box-border': '1px solid #e1dac6', + '--theme-settings-menu-item-text-color': '#2d2d2d', + '--theme-settings-menu-item-text-color-active': '#2d2d2d', + '--theme-settings-menu-item-text-color-disabled': '#2d2d2d80', + '--theme-settings-menu-item-background-color-active': + 'rgba(45, 45, 45, 0.07)', + '--theme-settings-menu-item-left-border-color-active': + 'rgba(45, 45, 45, 1)', + '--theme-settings-theme-select-title-color': '#2d2d2d', + }, + sidebar: { + '--theme-sidebar-background-color': '#fdcd68', + '--theme-sidebar-category-background-color-hover': + 'rgba(255, 185, 35, 0.5)', + '--theme-sidebar-category-background-color-active': '#ffb923', + '--theme-sidebar-category-text-color': '#2d2d2d', + '--theme-sidebar-menu-background-color': '#ffb923', + '--theme-sidebar-menu-item-background-color-hover': + 'rgba(237, 167, 14, 0.5)', + '--theme-sidebar-menu-item-background-color-active': '#eea70e', + '--theme-sidebar-menu-item-wallet-name-color': '#2d2d2d', + '--theme-sidebar-menu-item-wallet-info-color': '#2d2d2d', + '--theme-sidebar-menu-add-button-background-color': '#eea70e', + '--theme-sidebar-menu-add-button-background-color-active': '#eea70ea8', + '--theme-sidebar-menu-add-button-background-color-hover': '#eea70ea8', + '--theme-sidebar-menu-add-button-text-color': '#2d2d2d', + }, + stakePools: { + '--theme-staking-stake-pools-title-color': '#2d2d2d', + '--theme-staking-stake-pools-search-button-color': '#2d2d2d', + '--theme-staking-stake-pool-background-color': '#ffffff', + '--theme-staking-stake-pool-border-color': '#e1dac6', + '--theme-staking-stake-pool-glow-color': 'rgba(45, 45, 45, 0.14)', + '--theme-staking-stake-pools-search-icon-color': '#2d2d2d', + '--theme-staking-stake-pool-selected-background-color': '#5da377', + '--theme-staking-stake-pool-selected-checkmark-icon-color': '#fafbfc', + '--theme-staking-stake-pool-selected-slug-color': '#fafbfc', + '--theme-staking-stake-pool-slug-color': '#2d2d2d', + '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-background-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-border-color': '#e1dac6', + '--theme-staking-stake-pool-tooltip-shadow-color': 'rgba(0, 0, 0, 0.25)', + '--theme-staking-stake-pool-tooltip-text-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-link-color': '#d6902f', + '--theme-staking-stake-pool-tooltip-table-title-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-table-param-color': '#2d2d2d', + '--theme-staking-stake-pool-tooltip-retirement-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-retirement-background-color': + '#ea4c5b4d', + '--theme-staking-stake-pool-tooltip-delegate-button-background-color': + '#2d2d2d', + '--theme-staking-stake-pool-tooltip-delegate-button-hover-background-color': + '#fdd786', + '--theme-staking-stake-pool-tooltip-delegate-button-active-background-color': + '#eea70e', + '--theme-staking-stake-pool-tooltip-delegate-button-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-delegate-button-inverse-text-color': + '#fafbfc', + '--theme-staking-stake-pool-tooltip-delegate-button-border-color': + 'transparent', + '--theme-staking-progress-label-light': '#2d2d2d', + }, + staking: { + '--theme-staking-content-background-color': '#ffffff', + '--theme-staking-content-border-color': '#e1dac6', + '--theme-staking-font-color-accent': '#2d2d2d', + '--theme-staking-font-color-regular': '#2d2d2d', + '--theme-staking-font-color-light': '#2d2d2db3', + '--theme-staking-font-color-lighter': '#2d2d2d80', + '--theme-staking-table-head-background-color': 'rgba(45, 45, 45, 0.07)', + '--theme-staking-table-border-color': '#e1dac6', + '--theme-staking-link-color': '#d6902f', + '--theme-staking-link-color-light': '#fdcd68', + '--theme-staking-progress-bar-background-color': 'rgba(45, 45, 45, 0.07)', + '--theme-staking-progress-stripe-dark-1-background-color': '#e4b95e', + '--theme-staking-progress-stripe-dark-2-background-color': '#fdcd68', + '--theme-staking-table-body-highlighted-text-color': '#d6902f', + '--theme-staking-info-learn-more-button-text-color': '#f8f7f3', + '--theme-staking-info-learn-more-icon-color': '#fafbfc', + '--theme-staking-learn-more-button-color': '#f8f7f3', + '--theme-staking-learn-more-icon-color': '#fafbfc', + '--theme-staking-donut-ring-completed-color': '#ea4c5b', + '--theme-staking-donut-ring-remaining-color': '#fbdbde', + '--theme-staking-wallet-row-border-color': '#e1dac6', + '--theme-staking-dropdown-item-text-color-hover': '#2d2d2d', + '--theme-staking-dropdown-item-background-color': '#ffffff', + '--theme-staking-dropdown-item-background-color-hover': + 'rgba(45, 45, 45, 0.07)', + '--theme-staking-delegation-center-gear-icon-fill-color': '#2d2d2d80', + '--theme-staking-delegation-center-gear-icon-fill-color-active': '#2d2d2d', + '--theme-staking-delegation-center-no-wallets-instructions-color': + '#2d2d2d', + }, + support: { + '--theme-support-settings-item-color': '#2d2d2d', + '--theme-support-settings-link-color': '#d6902f', + '--theme-support-settings-text-color': '#2d2d2d', + }, + syncing: { + '--theme-syncing-background-color': '#ffffff', + '--theme-syncing-text-color': '#2d2d2d', + }, + systemError: { + '--theme-system-error-overlay-attention-icon-color': '#fafbfc', + '--theme-system-error-overlay-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-system-error-overlay-support-link-icon-color': '#fafbfc', + '--theme-system-error-overlay-text-color': '#fafbfc', + }, + tabs: { + '--theme-choice-tabs-text-color': '#2d2d2d', + '--theme-choice-tabs-text-color-active': '#2d2d2d', + '--theme-choice-tabs-bottom-border-color-active': '#2d2d2d', + }, + testEnvironment: { + '--theme-test-environment-label-background-color': '#ab1700', + '--theme-test-environment-label-text-color': '#fafbfc', + }, + topBar: { + '--theme-topbar-background-color': '#eea70e', + '--theme-topbar-layout-body-background-color': '#fdcd68', + '--theme-topbar-wallet-name-color': '#2d2d2d', + '--theme-topbar-wallet-info-color': '#2d2d2d', + '--theme-topbar-logo-color': '#2d2d2d', + }, + transactions: { + '--theme-transactions-list-background-color': '#fff', + '--theme-transactions-list-border-color': '#e1dac6', + '--theme-transactions-list-group-date-color': '#2d2d2d', + '--theme-transactions-list-item-details-color': '#2d2d2d', + '--theme-transactions-state-failed-background-color': + 'rgba(189, 196, 206, 0.8)', + '--theme-transactions-state-pending-background-color': '#d6d3ca', + '--theme-transactions-state-pending-stripes-color': '#bebbb3', + '--theme-transactions-priority-color': '#f8f3ed', + '--theme-transactions-priority-low-background-color': '#d34452', + '--theme-transactions-priority-medium-background-color': '#e6aa00', + '--theme-transactions-priority-high-background-color': '#007600', + '--theme-transactions-search-background-color': '#f8f3ed', + '--theme-transactions-icon-type-expend-background-color': '#84a2d2', + '--theme-transactions-icon-type-income-background-color': '#2dc06c', + '--theme-transactions-icon-type-exchange-background-color': '#10aca4', + '--theme-transactions-icon-type-failed-background-color': '#ee707c', + '--theme-transactions-arrow-stroke-color': '#2d2d2d', + '--theme-transactions-state-failed-text-color': 'rgba(45, 45, 45, 0.4)', + '--theme-transactions-state-failed-text-secondary-color': '#fafbfc', + }, + uploader: { + '--theme-uploader-text-color': '#2d2d2d', + '--theme-uploader-border-color': 'rgba(45, 45, 45, 0.2)', + }, + utxo: { + '--theme-utxo-background-color': 'rgba(45, 45, 45, 0.05)', + '--theme-utxo-title-text-color': '#2d2d2d', + '--theme-utxo-title-description-color': '#2d2d2db3', + '--theme-utxo-bar-color': '#2d2d2d', + '--theme-utxo-label-text-color': '#2d2d2d73', + '--theme-utxo-tick-text-color': '#2d2d2d73', + '--theme-utxo-cursor-background-color': 'rgba(45, 45, 45, 0.1)', + '--theme-utxo-tooltip-background-color': '#2d2d2d', + '--theme-utxo-tooltip-shadow-color': 'rgba(45, 45, 45, 0.18)', + '--theme-utxo-tooltip-text-color': '#fff', + }, +}; + +const YELLOW_THEME_PARAMS: CreateThemeParams = { + config: YELLOW_THEME_CONFIG, +}; + +export default createTheme(YELLOW_THEME_PARAMS); diff --git a/source/renderer/app/themes/index.js b/source/renderer/app/themes/index.js index ddf089b1e1..dfc1799385 100644 --- a/source/renderer/app/themes/index.js +++ b/source/renderer/app/themes/index.js @@ -2,5 +2,8 @@ export const THEMES = { CARDANO: 'cardano', DARK_BLUE: 'dark-blue', + DARK_CARDANO: 'dark-cardano', LIGHT_BLUE: 'light-blue', + YELLOW: 'yellow', + WHITE: 'white', }; diff --git a/source/renderer/app/themes/mixins/animations.scss b/source/renderer/app/themes/mixins/animations.scss index 1098a95036..eb1ed0ae99 100644 --- a/source/renderer/app/themes/mixins/animations.scss +++ b/source/renderer/app/themes/mixins/animations.scss @@ -1,6 +1,6 @@ @mixin animated-ellipsis($duration: 900, $width: 20px) { &:after { - :global { + :local { animation: ellipsis steps(4, end) #{$duration}ms infinite; } content: '\2026'; /* ascii code for the ellipsis character */ @@ -12,7 +12,7 @@ width: 0; } - @keyframes :global(ellipsis) { + @keyframes :local(ellipsis) { to { margin-right: -$width; width: $width; diff --git a/source/renderer/app/themes/scripts/update.js b/source/renderer/app/themes/scripts/update.js index 2444919bf7..fff4e1ddef 100644 --- a/source/renderer/app/themes/scripts/update.js +++ b/source/renderer/app/themes/scripts/update.js @@ -6,12 +6,18 @@ import { CREATE_CARDANO_THEME_PARAMS, CREATE_DARK_BLUE_THEME_PARAMS, CREATE_LIGHT_BLUE_THEME_PARAMS, + CREATE_YELLOW_THEME_PARAMS, + CREATE_DARK_CARDANO_THEME_PARAMS, + CREATE_WHITE_THEME_PARAMS, } from '../utils/constants'; const findUpdatesParams = { cardano: createTheme(CREATE_CARDANO_THEME_PARAMS), darkBlue: createTheme(CREATE_DARK_BLUE_THEME_PARAMS), + darkCardano: createTheme(CREATE_DARK_CARDANO_THEME_PARAMS), lightBlue: createTheme(CREATE_LIGHT_BLUE_THEME_PARAMS), + yellow: createTheme(CREATE_YELLOW_THEME_PARAMS), + white: createTheme(CREATE_WHITE_THEME_PARAMS), }; const pendingUpdates = findUpdates(findUpdatesParams); diff --git a/source/renderer/app/themes/types.js b/source/renderer/app/themes/types.js index 4c19fed662..577b349e17 100644 --- a/source/renderer/app/themes/types.js +++ b/source/renderer/app/themes/types.js @@ -5,7 +5,10 @@ export type ErrorShades = Object; export type PendingThemesUpdates = { cardanoUpdates?: Object, darkBlueUpdates?: Object, + darkCardanoUpdates?: Object, lightBlueUpdates?: Object, + yellowUpdates?: Object, + whiteUpdates?: Object, }; export type CreateThemeParams = { @@ -31,7 +34,10 @@ export type ColorParams = { export type FindUpdatesParams = { cardano: Object, darkBlue: Object, + darkCardano: Object, lightBlue: Object, + yellow: Object, + white: Object, }; export type FormattedConstNames = { @@ -73,6 +79,13 @@ export type ThemeFonts = { }; export type WriteThemeUpdateParams = { - fileName: string | 'cardano.js' | 'dark-blue.js' | 'light-blue.js', + fileName: + | string + | 'cardano.js' + | 'dark-blue.js' + | 'dark-cardano.js' + | 'light-blue.js' + | 'yellow.js' + | 'white.js', updatedThemeObj: Object, }; diff --git a/source/renderer/app/themes/utils/checkCreateTheme.js b/source/renderer/app/themes/utils/checkCreateTheme.js index 20a1522945..5090c510cd 100644 --- a/source/renderer/app/themes/utils/checkCreateTheme.js +++ b/source/renderer/app/themes/utils/checkCreateTheme.js @@ -5,7 +5,10 @@ import { has, isEmpty } from 'lodash'; import chalk from 'chalk'; import { CARDANO_THEME_CONFIG } from '../daedalus/cardano'; import { DARK_BLUE_THEME_CONFIG } from '../daedalus/dark-blue'; +import { DARK_CARDANO_THEME_CONFIG } from '../daedalus/dark-cardano'; import { LIGHT_BLUE_THEME_CONFIG } from '../daedalus/light-blue'; +import { YELLOW_THEME_CONFIG } from '../daedalus/yellow'; +import { WHITE_THEME_CONFIG } from '../daedalus/white'; import type { LogDifferencesParams } from '../types'; const logDifferences = ({ @@ -37,6 +40,21 @@ export const checkCreateTheme = (createThemeObj: Object) => { ...findMissingCSSVars(LIGHT_BLUE_THEME_CONFIG, createThemeObj), }; + const missingDarkCardanoDefs = { + ...findMissingDefinitions(DARK_CARDANO_THEME_CONFIG, createThemeObj), + ...findMissingCSSVars(DARK_CARDANO_THEME_CONFIG, createThemeObj), + }; + + const missingYelloweDefs = { + ...findMissingDefinitions(YELLOW_THEME_CONFIG, createThemeObj), + ...findMissingCSSVars(YELLOW_THEME_CONFIG, createThemeObj), + }; + + const missingWhiteDefs = { + ...findMissingDefinitions(WHITE_THEME_CONFIG, createThemeObj), + ...findMissingCSSVars(WHITE_THEME_CONFIG, createThemeObj), + }; + if (!isEmpty(missingCardanoDefs)) { logDifferences({ color: '#2cbb69', @@ -61,10 +79,37 @@ export const checkCreateTheme = (createThemeObj: Object) => { }); } + if (!isEmpty(missingWhiteDefs)) { + logDifferences({ + color: '#33C4FF', + missingDefs: missingWhiteDefs, + themeName: 'white.js', + }); + } + + if (!isEmpty(missingYelloweDefs)) { + logDifferences({ + color: '#33C4FF', + missingDefs: missingYelloweDefs, + themeName: 'yellow.js', + }); + } + + if (!isEmpty(missingDarkCardanoDefs)) { + logDifferences({ + color: '#33C4FF', + missingDefs: missingDarkCardanoDefs, + themeName: 'dark-cardano.js', + }); + } + if ( isEmpty(missingCardanoDefs) && isEmpty(missingDarkBlueDefs) && - isEmpty(missingLightBlueDefs) + isEmpty(missingLightBlueDefs) && + isEmpty(missingWhiteDefs) && + isEmpty(missingYelloweDefs) && + isEmpty(missingDarkCardanoDefs) ) { console.log( chalk.hex('#2cbb69')( diff --git a/source/renderer/app/themes/utils/constants.js b/source/renderer/app/themes/utils/constants.js index 0b739264f3..537a4474d3 100644 --- a/source/renderer/app/themes/utils/constants.js +++ b/source/renderer/app/themes/utils/constants.js @@ -92,3 +92,54 @@ export const CREATE_DARK_BLUE_THEME_PARAMS: CreateThemeParams = { }, fonts: DEFAULT_FONTS, }; + +export const CREATE_DARK_CARDANO_THEME_PARAMS: CreateThemeParams = { + colors: { + background: { + primary: '#121326', + secondary: '#36374d', + }, + border: 'rgba(255, 255, 255, 0.2)', + error: '#ea4c5b', + focus: 'rgba(255, 255, 255, 0.4)', + text: { + primary: '#ffffff', + secondary: '#000000', + }, + }, + fonts: DEFAULT_FONTS, +}; + +export const CREATE_YELLOW_THEME_PARAMS: CreateThemeParams = { + colors: { + background: { + primary: '#f8f3ed', + secondary: '#fdcd68', + }, + border: '#e1dac6', + error: '#ea4c5b', + focus: '#2d2d2d', + text: { + primary: '#2d2d2d', + secondary: '#fafbfc', + }, + }, + fonts: DEFAULT_FONTS, +}; + +export const CREATE_WHITE_THEME_PARAMS: CreateThemeParams = { + colors: { + background: { + primary: '#f9f9f9', + secondary: '#ffffff', + }, + border: 'rgba(45, 45, 45, 0.1)', + error: '#ea4c5b', + focus: '#2d2d2d', + text: { + primary: '#2d2d2d', + secondary: '#fafbfc', + }, + }, + fonts: DEFAULT_FONTS, +}; diff --git a/source/renderer/app/themes/utils/createTheme.js b/source/renderer/app/themes/utils/createTheme.js index 0d7a53f22c..043984abb9 100644 --- a/source/renderer/app/themes/utils/createTheme.js +++ b/source/renderer/app/themes/utils/createTheme.js @@ -196,6 +196,10 @@ export const createReactPolymorphTheme = ( '--rp-textarea-resize': 'none', '--rp-textarea-text-color': `${text.primary}`, }, + rpTooltip: { + '--rp-tooltip-bg-color': `${text.primary}`, + '--rp-tooltip-text-color': `${text.secondary}`, + }, }; }; @@ -269,6 +273,12 @@ export const createDaedalusComponentsTheme = ( '--theme-ada-redemption-disclaimer-button-border-color': `${ background.primary.lightest }`, + '--theme-ada-redemption-success-overlay-close-button-color': `${ + background.primary.lightest + }`, + '--theme-ada-redemption-success-overlay-close-button-background-color-hover': `${ + background.secondary.dark + }`, }, blockConsolidation: { '--theme-block-consolidation-background-color': `${ @@ -311,12 +321,17 @@ export const createDaedalusComponentsTheme = ( '--theme-block-consolidation-button-icon-color-hover': `${ background.secondary.regular }`, + '--theme-block-consolidation-button-text-color': `${text.secondary}`, '--theme-block-consolidation-button-text-color-hover': `${ background.secondary.regular }`, '--theme-block-consolidation-button-border-color': `${ background.primary.lightest }`, + '--theme-block-consolidation-button-border-color-hover': 'transparent', + '--theme-block-consolidation-epochs-image-color': `${chroma( + text.secondary + ).alpha(0.6)}`, }, body: { '--theme-main-body-background-color': `${background.primary.regular}`, @@ -404,7 +419,8 @@ export const createDaedalusComponentsTheme = ( background.primary.regular }`, '--theme-data-migration-layer-text-color': `${text.secondary}`, - '--theme-data-migration-layer-text-opacity-color': `${text.secondary}`, + '--theme-data-migration-button-border-color': `${text.secondary}`, + '--theme-data-migration-button-label-color': `${text.secondary}`, }, delegationSetupWizard: { '--theme-delegation-steps-activation-steps-indicator-color': `${ @@ -432,6 +448,12 @@ export const createDaedalusComponentsTheme = ( '--theme-delegation-steps-choose-stake-pool-selected-slug-color': `${ text.secondary }`, + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': `${ + background.primary.lightest + }`, + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': `${chroma( + border + ).alpha(0.2)}`, '--theme-delegation-steps-choose-stake-pool-title-color': `${chroma( text.primary ).alpha(0.8)}`, @@ -624,6 +646,10 @@ export const createDaedalusComponentsTheme = ( ).alpha(0.7)}`, '--theme-manual-update-overlay-text-highlight-color': `${text.secondary}`, '--theme-manual-update-overlay-title-text-color': `${text.secondary}`, + '--theme-manual-update-overlay-button-label-color': `${text.secondary}`, + '--theme-manual-update-overlay-button-label-color-hover': `${ + text.secondary + }`, }, mnemonic: { '--theme-mnemonic-background-color': `${background.primary.regular}`, @@ -688,6 +714,7 @@ export const createDaedalusComponentsTheme = ( background.primary.regular }`, '--theme-node-sync-info-message-text-color': `${text.primary}`, + '--theme-node-sync-icon-color': `${text.primary}`, '--theme-node-update-accept-button-background-color': `${ background.secondary.regular }`, @@ -713,6 +740,8 @@ export const createDaedalusComponentsTheme = ( background.secondary.regular ).alpha(0.95)}`, '--theme-notification-message-text-color': `${text.secondary}`, + '--theme-notification-message-checkmark-icon-color': `${text.secondary}`, + '--theme-notification-message-close-icon-color': `${text.secondary}`, '--theme-legacy-badge-background-color': `${error.dark}`, '--theme-legacy-notification-background-color': '#ab2712', @@ -897,6 +926,7 @@ export const createDaedalusComponentsTheme = ( }`, '--theme-staking-stake-pool-tooltip-delegate-button-border-color': 'transparent', + '--theme-staking-progress-label-light': `${text.secondary}`, }, staking: { '--theme-staking-content-background-color': `${ @@ -927,7 +957,7 @@ export const createDaedalusComponentsTheme = ( '--theme-staking-table-body-highlighted-text-color': `${ background.secondary.dark }`, - '--theme-staking-info-learn-more-button-color': `${ + '--theme-staking-info-learn-more-button-text-color': `${ background.primary.lightest }`, '--theme-staking-info-learn-more-icon-color': `${text.secondary}`, @@ -988,6 +1018,7 @@ export const createDaedalusComponentsTheme = ( }`, '--theme-topbar-wallet-name-color': `${text.secondary}`, '--theme-topbar-wallet-info-color': `${text.secondary}`, + '--theme-topbar-logo-color': `${text.primary}`, }, transactions: { '--theme-transactions-list-background-color': `${ @@ -1020,6 +1051,9 @@ export const createDaedalusComponentsTheme = ( error.light }`, '--theme-transactions-arrow-stroke-color': `${text.primary}`, + '--theme-transactions-state-failed-text-secondary-color': `${chroma( + text.secondary + ).alpha(0.8)}`, }, uploader: { '--theme-uploader-text-color': `${text.primary}`, diff --git a/source/renderer/app/themes/utils/findUpdates.js b/source/renderer/app/themes/utils/findUpdates.js index a6ffea9702..9d35234dbf 100644 --- a/source/renderer/app/themes/utils/findUpdates.js +++ b/source/renderer/app/themes/utils/findUpdates.js @@ -5,7 +5,10 @@ import chalk from 'chalk'; import { findMissingDefinitions, findMissingCSSVars } from './checkCreateTheme'; import { CARDANO_THEME_CONFIG } from '../daedalus/cardano'; import { DARK_BLUE_THEME_CONFIG } from '../daedalus/dark-blue'; +import { DARK_CARDANO_THEME_CONFIG } from '../daedalus/dark-cardano'; import { LIGHT_BLUE_THEME_CONFIG } from '../daedalus/light-blue'; +import { YELLOW_THEME_CONFIG } from '../daedalus/yellow'; +import { WHITE_THEME_CONFIG } from '../daedalus/white'; import type { PendingThemesUpdates, FindUpdatesParams, @@ -30,7 +33,14 @@ const logDifferences = ({ export const findUpdates = ( createThemeOutputs: FindUpdatesParams ): null | PendingThemesUpdates => { - const { cardano, darkBlue, lightBlue } = createThemeOutputs; + const { + cardano, + darkBlue, + darkCardano, + lightBlue, + yellow, + white, + } = createThemeOutputs; const pendingThemesUpdates = {}; const cardanoDefsToAdd = { @@ -41,10 +51,22 @@ export const findUpdates = ( ...findMissingDefinitions(darkBlue, DARK_BLUE_THEME_CONFIG), ...findMissingCSSVars(darkBlue, DARK_BLUE_THEME_CONFIG), }; + const darkCardanoDefsToAdd = { + ...findMissingDefinitions(darkCardano, DARK_CARDANO_THEME_CONFIG), + ...findMissingCSSVars(darkCardano, DARK_CARDANO_THEME_CONFIG), + }; const lightBlueDefsToAdd = { ...findMissingDefinitions(lightBlue, LIGHT_BLUE_THEME_CONFIG), ...findMissingCSSVars(lightBlue, LIGHT_BLUE_THEME_CONFIG), }; + const yellowDefsToAdd = { + ...findMissingDefinitions(yellow, YELLOW_THEME_CONFIG), + ...findMissingCSSVars(yellow, YELLOW_THEME_CONFIG), + }; + const whiteDefsToAdd = { + ...findMissingDefinitions(white, WHITE_THEME_CONFIG), + ...findMissingCSSVars(white, WHITE_THEME_CONFIG), + }; if (!isEmpty(cardanoDefsToAdd)) { logDifferences({ @@ -64,6 +86,15 @@ export const findUpdates = ( pendingThemesUpdates.darkBlueUpdates = darkBlueDefsToAdd; } + if (!isEmpty(darkCardanoDefsToAdd)) { + logDifferences({ + color: '#33C4FF', + missingDefs: darkCardanoDefsToAdd, + themeName: 'dark-cardano.js', + }); + pendingThemesUpdates.darkCardanoUpdates = darkCardanoDefsToAdd; + } + if (!isEmpty(lightBlueDefsToAdd)) { logDifferences({ color: '#33C4FF', @@ -73,10 +104,31 @@ export const findUpdates = ( pendingThemesUpdates.lightBlueUpdates = lightBlueDefsToAdd; } + if (!isEmpty(yellowDefsToAdd)) { + logDifferences({ + color: '#33C4FF', + missingDefs: yellowDefsToAdd, + themeName: 'yellow.js', + }); + pendingThemesUpdates.yellowUpdates = yellowDefsToAdd; + } + + if (!isEmpty(whiteDefsToAdd)) { + logDifferences({ + color: '#33C4FF', + missingDefs: whiteDefsToAdd, + themeName: 'white.js', + }); + pendingThemesUpdates.whiteUpdates = whiteDefsToAdd; + } + if ( isEmpty(cardanoDefsToAdd) && isEmpty(darkBlueDefsToAdd) && - isEmpty(lightBlueDefsToAdd) + isEmpty(darkCardanoDefsToAdd) && + isEmpty(lightBlueDefsToAdd) && + isEmpty(yellowDefsToAdd) && + isEmpty(whiteDefsToAdd) ) { console.log( chalk.hex('#2cbb69')( diff --git a/source/renderer/app/themes/utils/updateThemes.js b/source/renderer/app/themes/utils/updateThemes.js index c0f3f3beb7..ab8daeb62e 100644 --- a/source/renderer/app/themes/utils/updateThemes.js +++ b/source/renderer/app/themes/utils/updateThemes.js @@ -3,11 +3,21 @@ import { isEmpty } from 'lodash'; import { updateTheme } from './createTheme'; import { CARDANO_THEME_CONFIG } from '../daedalus/cardano'; import { DARK_BLUE_THEME_CONFIG } from '../daedalus/dark-blue'; +import { DARK_CARDANO_THEME_CONFIG } from '../daedalus/dark-cardano'; import { LIGHT_BLUE_THEME_CONFIG } from '../daedalus/light-blue'; +import { YELLOW_THEME_CONFIG } from '../daedalus/yellow'; +import { WHITE_THEME_CONFIG } from '../daedalus/white'; import type { PendingThemesUpdates } from '../types'; export const updateThemes = (pendingUpdates: PendingThemesUpdates) => { - const { cardanoUpdates, darkBlueUpdates, lightBlueUpdates } = pendingUpdates; + const { + cardanoUpdates, + darkBlueUpdates, + darkCardanoUpdates, + lightBlueUpdates, + yellowUpdates, + whiteUpdates, + } = pendingUpdates; const updatedThemes = {}; if (cardanoUpdates && !isEmpty(cardanoUpdates)) { @@ -33,5 +43,23 @@ export const updateThemes = (pendingUpdates: PendingThemesUpdates) => { ); updatedThemes['light-blue'] = updatedLightBlueTheme; } + + if (yellowUpdates && !isEmpty(yellowUpdates)) { + const updatedYellowTheme = updateTheme(YELLOW_THEME_CONFIG, yellowUpdates); + updatedThemes.yellow = updatedYellowTheme; + } + + if (whiteUpdates && !isEmpty(whiteUpdates)) { + const updatedWhiteTheme = updateTheme(WHITE_THEME_CONFIG, whiteUpdates); + updatedThemes.white = updatedWhiteTheme; + } + + if (darkCardanoUpdates && !isEmpty(darkCardanoUpdates)) { + const updatedDarkCardanoTheme = updateTheme( + DARK_CARDANO_THEME_CONFIG, + darkCardanoUpdates + ); + updatedThemes['dark-cardano'] = updatedDarkCardanoTheme; + } return updatedThemes; }; diff --git a/storybook/stories/AdaRedemptionDialog.stories.js b/storybook/stories/AdaRedemptionDialog.stories.js index 70e313b44c..8dd84588f2 100644 --- a/storybook/stories/AdaRedemptionDialog.stories.js +++ b/storybook/stories/AdaRedemptionDialog.stories.js @@ -6,6 +6,8 @@ import wordlist from 'bip39/wordlists/english'; import StoryDecorator from './support/StoryDecorator'; import AdaRedemptionForm from '../../source/renderer/app/components/wallet/ada-redemption/AdaRedemptionForm'; import AdaRedemptionChoices from '../../source/renderer/app/components/wallet/ada-redemption/AdaRedemptionChoices'; +import AdaRedemptionSuccessOverlay from '../../source/renderer/app/components/wallet/ada-redemption/AdaRedemptionSuccessOverlay'; +import AdaRedemptionDisclaimer from '../../source/renderer/app/components/wallet/ada-redemption/AdaRedemptionDisclaimer'; import { ADA_REDEMPTION_TYPES } from '../../source/renderer/app/types/redemptionTypes'; storiesOf('AdaRedemptionForm', module) @@ -137,4 +139,16 @@ storiesOf('AdaRedemptionForm', module) error={null} />
+ )) + + .add('Ada redemption success overlay', () => ( +
+ +
+ )) + + .add('Ada redemption disclaimer', () => ( +
+ +
)); diff --git a/storybook/stories/Loading-DataLayerMigration.stories.js b/storybook/stories/Loading-DataLayerMigration.stories.js new file mode 100644 index 0000000000..1a1f9cce2e --- /dev/null +++ b/storybook/stories/Loading-DataLayerMigration.stories.js @@ -0,0 +1,9 @@ +// @flow +import React from 'react'; +import { action } from '@storybook/addon-actions'; + +import DataLayerMigrationForm from '../../source/renderer/app/components/profile/data-layer-migration/DataLayerMigrationForm'; + +export const DataLayerMigrationStory = () => ( + +); diff --git a/storybook/stories/Loading.stories.js b/storybook/stories/Loading.stories.js index 62600bff7e..411f23ec6a 100644 --- a/storybook/stories/Loading.stories.js +++ b/storybook/stories/Loading.stories.js @@ -15,6 +15,7 @@ import { import { NoDiskSpaceErrorStory } from './Loading-NoDiskSpaceError.stories'; import { SystemTimeErrorStory } from './Loading-SystemTimeError.stories'; import { ManualUpdateStory } from './Loading-ManualUpdate.stories'; +import { DataLayerMigrationStory } from './Loading-DataLayerMigration.stories'; storiesOf('Loading', module) .addDecorator((story, context) => ( @@ -31,4 +32,5 @@ storiesOf('Loading', module) .add('SyncingConnecting - Sync Issues', SyncIssuesSyncingConnectingStory) .add('NoDiskSpaceError', NoDiskSpaceErrorStory) .add('SystemTimeError', SystemTimeErrorStory) - .add('ManualUpdate', ManualUpdateStory); + .add('ManualUpdate', ManualUpdateStory) + .add('DataLayerMigrationStory', DataLayerMigrationStory); diff --git a/storybook/stories/Sidebar.stories.js b/storybook/stories/Sidebar.stories.js index 9ec9a779aa..03c945ef59 100644 --- a/storybook/stories/Sidebar.stories.js +++ b/storybook/stories/Sidebar.stories.js @@ -49,6 +49,9 @@ const sidebarMenus = observable({ let emptyMenus; +let currentTheme = localStorage.getItem('currentTheme') || 'light-blue'; +currentTheme = currentTheme.toLowerCase(); + storiesOf('Sidebar', module) .addDecorator(story => {story()}) // ====== Stories ====== @@ -64,6 +67,7 @@ storiesOf('Sidebar', module) openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> )) .add('wallets category', () => ( @@ -77,6 +81,7 @@ storiesOf('Sidebar', module) openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> )) .add('wallets / sub', () => ( @@ -91,6 +96,7 @@ storiesOf('Sidebar', module) openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> )) .add('delegation category', () => ( @@ -104,6 +110,7 @@ storiesOf('Sidebar', module) openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> )) .add('decentralization-progress', () => ( @@ -117,5 +124,6 @@ storiesOf('Sidebar', module) openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> )); diff --git a/storybook/stories/Staking.stories.js b/storybook/stories/Staking.stories.js index ff2be1d02c..f01b1391b9 100644 --- a/storybook/stories/Staking.stories.js +++ b/storybook/stories/Staking.stories.js @@ -1,7 +1,7 @@ // @flow import React from 'react'; import { storiesOf } from '@storybook/react'; -import { withKnobs, date, number, radios } from '@storybook/addon-knobs'; +import { withKnobs, date, number } from '@storybook/addon-knobs'; import { linkTo } from '@storybook/addon-links'; import { action } from '@storybook/addon-actions'; import StoryLayout from './support/StoryLayout'; @@ -71,12 +71,6 @@ const WALLETS = [ }, ]; -const themes = { - 'Light Blue': 'light-blue', - Cardano: 'cardano', - 'Dark Blue': 'dark-blue', -}; - const locales = { English: 'en-US', Japanese: 'ja-JP', @@ -84,6 +78,7 @@ const locales = { // Delegation steps labels are translated outside components and we need to determine correct translations const locale = localStorage.getItem('currentLocale') || 'English'; +const currentTheme = localStorage.getItem('currentTheme') || 'light-blue'; const translationIndex = locales[locale]; // @TODO - improve locales GET once [DDW-711](https://github.com/input-output-hk/daedalus/pull/1426) is merged @@ -244,7 +239,7 @@ storiesOf('Staking', module) STAKE_POOLS[36], ]} onOpenExternalLink={() => {}} - currentTheme={radios('Theme (Only for tooltip colors)', themes)} + currentTheme={currentTheme} onClose={action('onClose')} onBack={action('onBack')} onSelectPool={action('onSelectPool')} diff --git a/storybook/stories/TopBar.stories.js b/storybook/stories/TopBar.stories.js index 7ed738a671..c300457cc2 100644 --- a/storybook/stories/TopBar.stories.js +++ b/storybook/stories/TopBar.stories.js @@ -7,12 +7,14 @@ import TopBar from '../../source/renderer/app/components/layout/TopBar'; import NodeSyncStatusIcon from '../../source/renderer/app/components/widgets/NodeSyncStatusIcon'; import WalletTestEnvironmentLabel from '../../source/renderer/app/components/widgets/WalletTestEnvironmentLabel'; import { formattedWalletAmount } from '../../source/renderer/app/utils/formatters'; +import menuIconClosed from '../../source/renderer/app/assets/images/menu-ic.inline.svg'; const topBarTestEnv = ( - {context.story !== 'Empty' ? ( + {context.story !== 'Empty' && context.story !== 'Wallet Add' ? ( item === getItemFromContext()} onWalletNavItemClick={linkTo('WalletScreens', item => @@ -73,6 +74,21 @@ storiesOf('WalletScreens', module) .add('Wallet Navigation', () =>
 
) + .add('Wallet Add', () => ( + {}} + onRestore={() => {}} + onImportFile={() => {}} + isRestoreActive={boolean('isRestoreActive', false)} + isMainnet={boolean('isMainnet', false)} + isTestnet={boolean('isTestnet', false)} + isMaxNumberOfWalletsReached={boolean( + 'isMaxNumberOfWalletsReached', + false + )} + /> + )) + .add('Summary', () => ( diff --git a/storybook/stories/Widgets.stories.js b/storybook/stories/Widgets.stories.js index 8429c0b6b4..d3f7cbd7d2 100644 --- a/storybook/stories/Widgets.stories.js +++ b/storybook/stories/Widgets.stories.js @@ -7,6 +7,7 @@ import StoryDecorator from './support/StoryDecorator'; import BigButtonForDialogs from '../../source/renderer/app/components/widgets/BigButtonForDialogs'; import MnemonicInputWidget from '../../source/renderer/app/components/widgets/forms/MnemonicInputWidget'; import NotificationMessage from '../../source/renderer/app/components/widgets/NotificationMessage'; +import NodeUpdateNotification from '../../source/renderer/app/components/notifications/NodeUpdateNotification'; import createIcon from '../../source/renderer/app/assets/images/create-ic.inline.svg'; import importIcon from '../../source/renderer/app/assets/images/import-ic.inline.svg'; import joinSharedIcon from '../../source/renderer/app/assets/images/join-shared-ic.inline.svg'; @@ -82,6 +83,18 @@ storiesOf('Widgets', module)
)) + .add('NodeUpdateNotification', () => ( +
+ +
+ )) + .add('TinySwitch', () => ) .add('TinySwitch - short label', () => ); diff --git a/storybook/stories/support/StoryLayout.js b/storybook/stories/support/StoryLayout.js index cf7af54334..af264818d7 100644 --- a/storybook/stories/support/StoryLayout.js +++ b/storybook/stories/support/StoryLayout.js @@ -3,6 +3,7 @@ import React, { Component, Children } from 'react'; import type { Node } from 'react'; import { observable, runInAction } from 'mobx'; import { observer, inject } from 'mobx-react'; +import { get } from 'lodash'; import { action } from '@storybook/addon-actions'; // Assets and helpers @@ -18,6 +19,8 @@ import type { SidebarWalletType } from '../../../source/renderer/app/types/sideb import TopBar from '../../../source/renderer/app/components/layout/TopBar'; import Sidebar from '../../../source/renderer/app/components/sidebar/Sidebar'; import SidebarLayout from '../../../source/renderer/app/components/layout/SidebarLayout'; +import menuIconOpened from '../../../source/renderer/app/assets/images/menu-opened-ic.inline.svg'; +import menuIconClosed from '../../../source/renderer/app/assets/images/menu-ic.inline.svg'; export type StoriesProps = { wallets: Array, @@ -45,6 +48,9 @@ const CATEGORIES = [ CATEGORIES_BY_NAME.SETTINGS, ]; +let currentTheme = localStorage.getItem('currentTheme') || 'light-blue'; +currentTheme = currentTheme.toLowerCase(); + @inject('stores', 'storiesProps') @observer export default class StoryLayout extends Component { @@ -104,8 +110,8 @@ export default class StoryLayout extends Component { title: wallet.name, info: `${wallet.amount} ADA`, isConnected: true, - isRestoreActive: false, - restoreProgress: 0, + isRestoreActive: get(wallet, 'syncState.tag', 'synced') === 'restoring', + restoreProgress: get(wallet, 'syncState.data.percentage.quantity', 0), isLegacy: wallet.isLegacy, })); @@ -146,6 +152,7 @@ export default class StoryLayout extends Component { openDialogAction={action('openDialog')} onSubmitSupportRequest={() => {}} pathname="/" + currentTheme={currentTheme} /> ); }; @@ -170,6 +177,7 @@ export default class StoryLayout extends Component { } showSubMenuToggle showSubMenus={this.isShowingSubMenus} + leftIcon={this.isShowingSubMenus ? menuIconOpened : menuIconClosed} >