Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-291] Fix PopOver Themes #2223

Merged
merged 5 commits into from
Oct 29, 2020
Merged

[DDW-291] Fix PopOver Themes #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb010a8
[DDW-291] Update to react-polymorph 0.9.6-rc.3
DominikGuzei Oct 29, 2020
54bec44
[DDW-291] Fix PopOver bg colors
DominikGuzei Oct 29, 2020
4167523
[DDW-291] Fixes yarn.lock, Adds CHANGELOG entry
nikolaglumac Oct 29, 2020
034a848
[DDW-291] Merges develop
nikolaglumac Oct 29, 2020
4e5308e
[DDW-291] Updates CHANGELOG
nikolaglumac Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Changelog

## vNext

### Features

- Replaced several tooltips with new react-polymorph `PopOver` component ([PR 2210](https://github.com/input-output-hk/daedalus/pull/2210), [PR 2223](https://github.com/input-output-hk/daedalus/pull/2223))

### Fixes

- Fixed Address validation on Shelley QA network ([PR 2218](https://github.com/input-output-hk/daedalus/pull/2218))
Expand All @@ -13,7 +17,6 @@ Changelog

### Features

- Replaced several tooltips with new react-polymorph PopOver component [PR 2210](https://github.com/input-output-hk/daedalus/pull/2210)
- Added tooltips to stake pools table view headers ([PR 2214](https://github.com/input-output-hk/daedalus/pull/2214))
- Added stake pools list view ([PR 2186](https://github.com/input-output-hk/daedalus/pull/2186), [PR 2215](https://github.com/input-output-hk/daedalus/pull/2215))
- Implemented stake pool details explanation tooltips ([PR 2211](https://github.com/input-output-hk/daedalus/pull/2211))
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
"react-intl": "2.7.2",
"react-lottie": "1.2.3",
"react-markdown": "4.3.1",
"react-polymorph": "0.9.6-rc.2",
"react-polymorph": "0.9.6-rc.3",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-svg-inline": "2.1.1",
Expand Down
2 changes: 2 additions & 0 deletions source/renderer/app/components/loading/syncing-connecting/StatusIcons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ export default class StatusIcons extends Component<Props> {
getIconWithPopover = (icon: string, paramName: string) => (
<PopOver
themeVariables={{
'--rp-pop-over-bg-color':
'var(--theme-loading-status-icons-tooltip-color)',
'--rp-pop-over-border-radius': '5px',
'--rp-bubble-padding': '6px 12px 7px',
}}
Expand Down
4 changes: 2 additions & 2 deletions source/renderer/app/themes/daedalus/cardano.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export const CARDANO_THEME_OUTPUT = {
'--theme-loading-status-icons-off-color': '#ea4c5b',
'--theme-loading-status-icons-unloaded-loading-color': '#ffffff',
'--theme-loading-status-icons-unloaded-syncing-color': '#5e6066',
'--theme-loading-status-icons-tooltip-color': '#5e6066',
'--theme-loading-status-icons-tooltip-color': 'rgba(0, 0, 0, 0.9)',
'--theme-loading-spinner-color': '#5e6066',
'--theme-loading-spinner-medium-color': '#fff',
},
Expand Down Expand Up @@ -1072,7 +1072,7 @@ export const CARDANO_THEME_OUTPUT = {
'--theme-news-overlay-update-button-border-color': '#ffffff',
},
rpPopOver: {
'--rp-pop-over-bg-color': 'rgba(0,0,0,0.9)',
'--rp-pop-over-bg-color': 'rgba(32, 34, 37, 0.9)',
'--rp-pop-over-text-color': '#ffffff',
},
};
Expand Down
6 changes: 3 additions & 3 deletions source/renderer/app/themes/daedalus/dark-blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export const DARK_BLUE_THEME_OUTPUT = {
'--theme-loading-status-icons-off-color': '#ea4c5b',
'--theme-loading-status-icons-unloaded-loading-color': '#fafbfc',
'--theme-loading-status-icons-unloaded-syncing-color': '#fafbfc',
'--theme-loading-status-icons-tooltip-color': '#4b5a68',
'--theme-loading-status-icons-tooltip-color': 'rgba(75, 90, 104, 0.9)',
'--theme-loading-spinner-color': '#e9f4fe',
'--theme-loading-spinner-medium-color': '#e9f4fe',
},
Expand Down Expand Up @@ -1077,8 +1077,8 @@ export const DARK_BLUE_THEME_OUTPUT = {
'--theme-news-overlay-update-button-border-color': '#ffffff',
},
rpPopOver: {
'--rp-pop-over-bg-color': '',
'--rp-pop-over-text-color': '',
'--rp-pop-over-bg-color': 'rgba(75, 90, 104, 0.9)',
'--rp-pop-over-text-color': '#fafbfc',
},
};

Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/dark-cardano.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export const DARK_CARDANO_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#ffffff',
'--theme-loading-spinner-medium-color': '#ffffff',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/flight-candidate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export const FLIGHT_CANDIDATE_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#ffffff',
'--theme-loading-spinner-medium-color': '#ffffff',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/incentivized-testnet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export const INCENTIVIZED_TESTNET_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#ffffff',
'--theme-loading-spinner-medium-color': '#ffffff',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/light-blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
'--theme-loading-status-icons-off-color': '#ea4c5b',
'--theme-loading-status-icons-unloaded-loading-color': '#fafbfc',
'--theme-loading-status-icons-unloaded-syncing-color': '#5e6066',
'--theme-loading-status-icons-tooltip-color': '#062148',
'--theme-loading-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#5e6066',
'--theme-loading-spinner-medium-color': '#fafbfc',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/shelley-testnet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export const SHELLEY_TESTNET_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#ffffff',
'--theme-loading-spinner-medium-color': '#ffffff',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/white.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export const WHITE_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#2d2d2d',
'--theme-loading-spinner-medium-color': '#2d2d2d',
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/yellow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ export const YELLOW_THEME_OUTPUT = {
'--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-status-icons-tooltip-color': 'var(--rp-pop-over-bg-color)',
'--theme-loading-spinner-color': '#2d2d2d',
'--theme-loading-spinner-medium-color': '#2d2d2d',
},
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11949,9 +11949,9 @@ react-modal@3.1.12:
prop-types "^15.5.10"
warning "^3.0.0"

react-polymorph@0.9.6-rc.2:
version "0.9.6-rc.2"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.6-rc.2.tgz#57705b3465fda2a7fb3ccc5a505fbbe92dc885c9"
react-polymorph@0.9.6-rc.3:
version "0.9.6-rc.3"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.6-rc.3.tgz#dceb56aa8e7d83dc8251d7459257d0934c45b104"
dependencies:
"@tippyjs/react" "4.2.0"
create-react-context "0.2.2"
Expand Down