diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d4d54585..3e7d1e236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed +- Updated lbry-sdk to [0.60.0](https://github.com/lbryio/lbry-sdk/releases/tag/v0.60.0) - Drops support for publishing anonymous comments ([#3705](https://github.com/lbryio/lbry-desktop/pull/3705)) - Don't remember past repost bid amount ([bbd263c](https://github.com/lbryio/lbry-desktop/commit/bbd263c4413935ee4fac7b7b79b7f73b42d9c1f6)) diff --git a/package.json b/package.json index abfb97b02..09960ed9e 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@babel/register": "^7.0.0", "@exponent/electron-cookies": "^2.0.0", "@hot-loader/react-dom": "^16.8", - "@lbry/components": "^3.0.10", + "@lbry/components": "^3.0.11", "@reach/menu-button": "^0.1.18", "@reach/rect": "^0.2.1", "@reach/tabs": "^0.1.5", diff --git a/ui/component/common/form-components/form-field.jsx b/ui/component/common/form-components/form-field.jsx index 8c2c5537b..c8b5da7c1 100644 --- a/ui/component/common/form-components/form-field.jsx +++ b/ui/component/common/form-components/form-field.jsx @@ -1,5 +1,5 @@ // @flow -import type { ElementRef } from 'react'; +import type { ElementRef, Node } from 'react'; import React from 'react'; import ReactDOMServer from 'react-dom/server'; import SimpleMDE from 'react-simplemde-editor'; @@ -10,7 +10,7 @@ import 'easymde/dist/easymde.min.css'; type Props = { name: string, - label?: string, + label?: string | Node, render?: () => React$Node, prefix?: string, postfix?: string, diff --git a/ui/component/privacyAgreement/view.jsx b/ui/component/privacyAgreement/view.jsx index dd03a655b..98953a02a 100644 --- a/ui/component/privacyAgreement/view.jsx +++ b/ui/component/privacyAgreement/view.jsx @@ -51,9 +51,10 @@ function PrivacyAgreement(props: Props) {
- +
+

{__('Can this app send information about your usage to inform publishers and improve the software?')} @@ -64,7 +65,7 @@ function PrivacyAgreement(props: Props) { type="radio" label={ <> - 😄 {__('Yes, including with third-party analytics platforms')} + {__('Yes, including with third-party analytics platforms')} 😄 } helper={__(`Sending information to third parties (e.g. Google Analytics or Mixpanel) allows us to use detailed @@ -78,7 +79,7 @@ function PrivacyAgreement(props: Props) { checked={share === LIMITED} label={ <> - 🙂 {__('Yes, but only with LBRY, Inc.')} + {__('Yes, but only with LBRY, Inc.')} 🙂 } helper={__( @@ -93,7 +94,7 @@ function PrivacyAgreement(props: Props) { checked={share === NONE} label={ <> - 😢 {__('No')} + {__('No')} 😢 } helper={__(`No information will be sent directly to LBRY, Inc. or third-parties about your usage. Note that as diff --git a/ui/scss/component/_main.scss b/ui/scss/component/_main.scss index 8643b52b9..16fe96d5e 100644 --- a/ui/scss/component/_main.scss +++ b/ui/scss/component/_main.scss @@ -85,7 +85,7 @@ .main--contained { margin: auto; - margin-top: 5rem; + margin-top: 2rem; display: flex; flex-direction: column; align-items: flex-start; @@ -118,7 +118,7 @@ width: 40em; max-width: unset; min-width: unset; - + @media (max-width: $breakpoint-small) { width: 100%; } diff --git a/ui/scss/init/_gui.scss b/ui/scss/init/_gui.scss index a65345bbc..d7850b011 100644 --- a/ui/scss/init/_gui.scss +++ b/ui/scss/init/_gui.scss @@ -263,3 +263,7 @@ a { padding: var(--spacing-large); background-color: var(--color-primary-alt); } + +.privacy-img { + height: 10rem; +} diff --git a/ui/scss/themes/dark.scss b/ui/scss/themes/dark.scss index a2d708310..04a2de0c0 100644 --- a/ui/scss/themes/dark.scss +++ b/ui/scss/themes/dark.scss @@ -59,6 +59,7 @@ --color-input-border: var(--color-border); --color-input-border-active: var(--color-secondary); --color-input-toggle: var(--color-primary); + --color-input-toggle-bg: var(--color-input-bg); --color-input-toggle-bg-hover: var(--color-secondary); // Menu diff --git a/yarn.lock b/yarn.lock index b0b41358a..890f0d581 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1033,10 +1033,10 @@ prop-types "^15.6.2" scheduler "^0.15.0" -"@lbry/components@^3.0.10": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@lbry/components/-/components-3.0.10.tgz#16e03c42f95274743c6ddcec1d541ea73d54e745" - integrity sha512-4bfINx7cN03IYRag5NxVkP04SuxsO1cQtey8J+z7ykF+MFbkhEgnZZt4kQmaaL3oK1GuNEpjbXZdntc2Eikyfg== +"@lbry/components@^3.0.11": + version "3.0.11" + resolved "https://registry.yarnpkg.com/@lbry/components/-/components-3.0.11.tgz#e3c1363d26059fa2a5fa47a4e9b1cd4a61e7cf1d" + integrity sha512-dGSv5A3uQkHmmMkZfJ3bG6blEARLFn3lBU9dnTiXXABVR2QQXiDn+Wu3rUjraHvC/0JBzoeiCv1mniRFiGBOGw== "@mapbox/hast-util-table-cell-style@^0.1.3": version "0.1.3" @@ -7174,9 +7174,9 @@ lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#f22bdbfe2f403d13fa8ce99e8849dca0e3d19bef: +lbry-redux@lbryio/lbry-redux#b4fbc212ca6008ec05c31116182bf6dfa7a1cbcb: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f22bdbfe2f403d13fa8ce99e8849dca0e3d19bef" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/b4fbc212ca6008ec05c31116182bf6dfa7a1cbcb" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0"