diff --git a/CHANGELOG.md b/CHANGELOG.md index e429f79fb..00a665cdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] -### Fixed - -- Channel name overlap on homepage when screen size is small - -## [0.27.0] - 2018-01-15 +### Added - More language options on publish page ([#2201](https://github.com/lbryio/lbry-desktop/pull/2201)) diff --git a/package.json b/package.json index 57c127f47..337d15bf9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.27.1", + "version": "0.27.0", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" diff --git a/src/renderer/modal/modal.jsx b/src/renderer/modal/modal.jsx index 7cb749d3f..7a572b953 100644 --- a/src/renderer/modal/modal.jsx +++ b/src/renderer/modal/modal.jsx @@ -57,7 +57,7 @@ export class Modal extends React.PureComponent { { getTitle() { - // const { user } = this.props; - // - // if (user && user.email && !user.has_verified_email) { - // return __('Awaiting Confirmation'); - // } + const { user } = this.props; + if (user && !user.has_verified_email) { + return __('Awaiting Confirmation'); + } return __('Can We Stay In Touch?'); } diff --git a/src/renderer/scss/component/_content.scss b/src/renderer/scss/component/_content.scss index 82e564907..8b52686af 100644 --- a/src/renderer/scss/component/_content.scss +++ b/src/renderer/scss/component/_content.scss @@ -18,7 +18,7 @@ position: absolute; background-position: 50% 50%; background-repeat: no-repeat; - background-size: cover; + background-size: 100%; margin: auto; &:not(.card__media--nsfw) { diff --git a/src/renderer/scss/component/_main.scss b/src/renderer/scss/component/_main.scss index afa84e461..577fa6f39 100644 --- a/src/renderer/scss/component/_main.scss +++ b/src/renderer/scss/component/_main.scss @@ -14,28 +14,23 @@ } .main--file-page { - max-width: 1787px; + max-width: var(--file-page-max-width); display: grid; - grid-template-areas: - 'content related' - 'info related'; grid-gap: var(--spacing-vertical-large); grid-template-rows: auto 1fr; grid-template-columns: 1fr auto; + grid-template-areas: + 'content content' + 'info related'; - // TODO: Get responsive grid working, to many issues with different thumbnails messing stuff up on small screens with the file taking up the full width - // I will conquer this one day - // grid-template-areas: - // 'content content' - // 'info related'; - // - // @media (min-width: 1470px) { - // - // } + @media (min-width: 1470px) { + grid-template-areas: + 'content related' + 'info related'; + } .grid-area--content { grid-area: content; - max-width: var(--file-max-width); } .grid-area--info { grid-area: info; diff --git a/src/renderer/scss/component/_markdown-preview.scss b/src/renderer/scss/component/_markdown-preview.scss index 48c967b81..5de66b942 100644 --- a/src/renderer/scss/component/_markdown-preview.scss +++ b/src/renderer/scss/component/_markdown-preview.scss @@ -17,6 +17,7 @@ font-size: 1.15rem; margin-bottom: var(--spacing-vertical-medium); white-space: pre-line; + word-break: break-all; svg { width: 1rem; diff --git a/src/renderer/scss/component/_media.scss b/src/renderer/scss/component/_media.scss index 3e831ad0c..4a65d6ef9 100644 --- a/src/renderer/scss/component/_media.scss +++ b/src/renderer/scss/component/_media.scss @@ -232,15 +232,6 @@ .media__subtitle { font-size: 1rem; position: relative; - - // Quick fix to fix channel overlapping on the home page. This style shouldn't exist here. - .btn--uri-indicator { - width: 100%; - text-align: left; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } } .media__subtitle--large { diff --git a/src/renderer/scss/init/_vars.scss b/src/renderer/scss/init/_vars.scss index 00cf41f6a..2edb526e3 100644 --- a/src/renderer/scss/init/_vars.scss +++ b/src/renderer/scss/init/_vars.scss @@ -18,9 +18,9 @@ $large-breakpoint: 1921px; --spacing-vertical-medium: calc(2rem / 2); --spacing-vertical-large: 2rem; - --file-max-width: 1400px; - // --file-max-height: calc(var(--file-max-height) * 9 / 16); + --file-page-max-width: 1787px; --file-max-height: 788px; + --file-max-width: 1400px; --video-aspect-ratio: 56.25%; // 9 x 16