diff --git a/src/ui/component/cardMedia/view.jsx b/src/ui/component/cardMedia/view.jsx index 6c9f41994..54e692eee 100644 --- a/src/ui/component/cardMedia/view.jsx +++ b/src/ui/component/cardMedia/view.jsx @@ -15,7 +15,7 @@ class CardMedia extends React.PureComponent { style={ thumbnail ? { backgroundImage: `url('${thumbnail}')` } - : { backgroundImage: `url(/${Placeholder})` } + : { backgroundImage: `url(${Placeholder})` } } className="media__thumb" /> diff --git a/src/ui/component/fileDetails/view.jsx b/src/ui/component/fileDetails/view.jsx index fc55a98a3..72bdee683 100644 --- a/src/ui/component/fileDetails/view.jsx +++ b/src/ui/component/fileDetails/view.jsx @@ -104,6 +104,7 @@ class FileDetails extends PureComponent { {__('Downloaded to')} {': '} {isChannel ? ( ) : ( diff --git a/src/ui/redux/actions/file.js b/src/ui/redux/actions/file.js index fee8cb114..4fba2425d 100644 --- a/src/ui/redux/actions/file.js +++ b/src/ui/redux/actions/file.js @@ -10,6 +10,7 @@ import { selectFileInfosByOutpoint, } from 'lbry-redux'; import { doHideModal } from 'redux/actions/app'; +import { goBack } from 'connected-react-router'; export function doOpenFileInFolder(path) { return () => { @@ -58,11 +59,14 @@ export function doDeleteFile(outpoint, deleteFromComputer, abandonClaim) { }; } -export function doDeleteFileAndGoBack(fileInfo, deleteFromComputer, abandonClaim) { +export function doDeleteFileAndMaybeGoBack(fileInfo, deleteFromComputer, abandonClaim) { return dispatch => { const actions = []; actions.push(doHideModal()); actions.push(doDeleteFile(fileInfo, deleteFromComputer, abandonClaim)); dispatch(batchActions(...actions)); + if (abandonClaim) { + dispatch(goBack()); + } }; } diff --git a/src/ui/redux/selectors/app.js b/src/ui/redux/selectors/app.js index 69c4fdee3..85e23eac2 100644 --- a/src/ui/redux/selectors/app.js +++ b/src/ui/redux/selectors/app.js @@ -138,3 +138,11 @@ export const selectSearchOptionsExpanded = createSelector( selectState, state => state.searchOptionsExpanded ); + +export const selectShouldShowInviteGuide = createSelector( + makeSelectClientSetting(SETTINGS.FIRST_RUN_COMPLETED), + makeSelectClientSetting(SETTINGS.INVITE_ACKNOWLEDGED), + (firstRunCompleted, inviteAcknowledged) => { + return firstRunCompleted ? !inviteAcknowledged : false; + } +); diff --git a/src/ui/scss/all.scss b/src/ui/scss/all.scss index db0ad0fee..b117a2b2c 100644 --- a/src/ui/scss/all.scss +++ b/src/ui/scss/all.scss @@ -28,7 +28,6 @@ @import 'component/markdown-editor'; @import 'component/markdown-preview'; @import 'component/media'; -@import 'component/menu'; @import 'component/modal'; @import 'component/navigation'; @import 'component/notice'; diff --git a/src/ui/scss/component/_banner.scss b/src/ui/scss/component/_banner.scss index 1cb809241..7b71ce173 100644 --- a/src/ui/scss/component/_banner.scss +++ b/src/ui/scss/component/_banner.scss @@ -7,6 +7,7 @@ .banner--first-run { height: 310px; + padding-right: var(--spacing-vertical-medium); // Adjust this class inside other `.banner--xxx` styles for control over animation .banner__item--static-for-animation { diff --git a/src/ui/scss/component/_file-render.scss b/src/ui/scss/component/_file-render.scss index abd4fff00..093db5e93 100644 --- a/src/ui/scss/component/_file-render.scss +++ b/src/ui/scss/component/_file-render.scss @@ -6,7 +6,6 @@ overflow: hidden; position: absolute; - z-index: 1; html[data-mode='dark'] & { border: 1px solid rgba($lbry-gray-1, 0.3); diff --git a/src/ui/scss/component/_media.scss b/src/ui/scss/component/_media.scss index 5363166dc..37072a30d 100644 --- a/src/ui/scss/component/_media.scss +++ b/src/ui/scss/component/_media.scss @@ -35,13 +35,12 @@ } .media__thumb { + flex-shrink: 0; width: 20rem; } .media__info { margin-left: var(--spacing-vertical-medium); - width: calc(80% - 20rem); - min-width: 40rem; } } @@ -49,12 +48,11 @@ font-size: 2rem; .media__thumb { - width: 30rem; + width: 25rem; } .media__info { margin-left: var(--spacing-vertical-large); - flex: 1; } .media__subtext { @@ -73,12 +71,6 @@ width: 11em; } - .media__info { - width: calc(100% - 10em); - min-width: auto; - position: relative; - } - .media__title { margin-bottom: var(--spacing-vertical-small); } @@ -153,6 +145,7 @@ font-size: 1.1rem; padding-bottom: 5px; opacity: 0.6; + user-select: all; } .media__insufficient-credits { diff --git a/src/ui/scss/component/_menu.scss b/src/ui/scss/component/_menu.scss deleted file mode 100644 index c2bd27a94..000000000 --- a/src/ui/scss/component/_menu.scss +++ /dev/null @@ -1,10 +0,0 @@ -.menu-container { - display: inline-block; - - .menu { - padding-top: var(--spacing-vertical-medium); - position: absolute; - white-space: nowrap; - z-index: 1; - } -} diff --git a/src/ui/scss/component/_navigation.scss b/src/ui/scss/component/_navigation.scss index 805785e64..5ef13c6af 100644 --- a/src/ui/scss/component/_navigation.scss +++ b/src/ui/scss/component/_navigation.scss @@ -4,12 +4,13 @@ height: calc(100vh - var(--header-height)); display: flex; flex-direction: column; - overflow-y: overlay; + overflow: visible; background-color: $lbry-white; border-right: 1px solid rgba($lbry-gray-1, 0.9); padding-top: var(--spacing-vertical-large); padding-right: var(--spacing-vertical-small); font-size: 1.2rem; + z-index: 2; html[data-mode='dark'] & { background-color: $lbry-black; @@ -41,7 +42,6 @@ ); content: ''; position: absolute; - z-index: 0; html[data-mode='dark'] & { background-image: linear-gradient( diff --git a/src/ui/scss/component/_scrollbar.scss b/src/ui/scss/component/_scrollbar.scss index 10a4a8856..a554ae4b1 100644 --- a/src/ui/scss/component/_scrollbar.scss +++ b/src/ui/scss/component/_scrollbar.scss @@ -20,4 +20,8 @@ ::-webkit-scrollbar-track { background-color: transparent; + + html[data-mode='dark'] & { + background-color: $lbry-black; + } } diff --git a/src/ui/scss/component/_search.scss b/src/ui/scss/component/_search.scss index 1ce718c0b..160ecf35c 100644 --- a/src/ui/scss/component/_search.scss +++ b/src/ui/scss/component/_search.scss @@ -1,7 +1,6 @@ .search__header { background-color: $lbry-black; color: $lbry-white; - min-height: 300px; padding: var(--spacing-vertical-large); .placeholder { @@ -14,6 +13,7 @@ .media__subtitle { color: rgba($lbry-white, 0.9); + font-size: 0.7em; } html[data-mode='dark'] & { diff --git a/src/ui/scss/component/_tooltip.scss b/src/ui/scss/component/_tooltip.scss index dfd460622..35e24abb1 100644 --- a/src/ui/scss/component/_tooltip.scss +++ b/src/ui/scss/component/_tooltip.scss @@ -3,8 +3,6 @@ position: relative; .tooltip__body { - z-index: 2; - visibility: hidden; }