From 1f74ff3c6325ecb7ffe1f3ce50f3fa4ddb2287c0 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 23 Jan 2019 00:51:35 -0500 Subject: [PATCH] Merge 'release' into master (#2222) * v0.27.0-rc.1 * v0.27.0-rc.2 * v0.27.0-rc.3 * v0.27.0-rc.4 * v0.27.0-rc.5 * chore: bump rc * v0.27.0-rc.7 * fix: style for large 0 balance * v0.27.0-rc.8 * v0.27.0 * update changelog * fix: channel name overlap on homepage when screen size is small * update changelog * v0.27.1-rc.1 * fix: first run email collection typo/spacing * v0.27.1-rc.2 * v0.27.1 --- CHANGELOG.md | 6 +++++- package.json | 2 +- src/renderer/modal/modal.jsx | 2 +- src/renderer/modal/modalEmailCollection/view.jsx | 9 +++++---- src/renderer/scss/component/_media.scss | 9 +++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a665cdb..e429f79fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] -### Added +### Fixed + +- Channel name overlap on homepage when screen size is small + +## [0.27.0] - 2018-01-15 - More language options on publish page ([#2201](https://github.com/lbryio/lbry-desktop/pull/2201)) diff --git a/package.json b/package.json index 337d15bf9..57c127f47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.27.0", + "version": "0.27.1", "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 7a572b953..7cb749d3f 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.has_verified_email) { - return __('Awaiting Confirmation'); - } + // const { user } = this.props; + // + // if (user && user.email && !user.has_verified_email) { + // return __('Awaiting Confirmation'); + // } return __('Can We Stay In Touch?'); } diff --git a/src/renderer/scss/component/_media.scss b/src/renderer/scss/component/_media.scss index 4a65d6ef9..3e831ad0c 100644 --- a/src/renderer/scss/component/_media.scss +++ b/src/renderer/scss/component/_media.scss @@ -232,6 +232,15 @@ .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 {