mirror of
https://github.com/LBRYFoundation/lbry-desktop.git
synced 2025-08-30 17:01:25 +00:00
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
This commit is contained in:
parent
1571fc9bce
commit
1f74ff3c63
5 changed files with 21 additions and 7 deletions
|
@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
|
|
||||||
## [Unreleased]
|
## [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))
|
- More language options on publish page ([#2201](https://github.com/lbryio/lbry-desktop/pull/2201))
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "LBRY",
|
"name": "LBRY",
|
||||||
"version": "0.27.0",
|
"version": "0.27.1",
|
||||||
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
|
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"lbry"
|
"lbry"
|
||||||
|
|
|
@ -57,7 +57,7 @@ export class Modal extends React.PureComponent<ModalProps> {
|
||||||
<ReactModal
|
<ReactModal
|
||||||
{...modalProps}
|
{...modalProps}
|
||||||
onRequestClose={onAborted || onConfirmed}
|
onRequestClose={onAborted || onConfirmed}
|
||||||
className={classnames(className, {
|
className={classnames('card', className, {
|
||||||
modal: !fullScreen,
|
modal: !fullScreen,
|
||||||
'modal--fullscreen': fullScreen,
|
'modal--fullscreen': fullScreen,
|
||||||
})}
|
})}
|
||||||
|
|
|
@ -13,10 +13,11 @@ type Props = {
|
||||||
|
|
||||||
class ModalEmailCollection extends React.PureComponent<Props> {
|
class ModalEmailCollection extends React.PureComponent<Props> {
|
||||||
getTitle() {
|
getTitle() {
|
||||||
const { user } = this.props;
|
// const { user } = this.props;
|
||||||
if (user && !user.has_verified_email) {
|
//
|
||||||
return __('Awaiting Confirmation');
|
// if (user && user.email && !user.has_verified_email) {
|
||||||
}
|
// return __('Awaiting Confirmation');
|
||||||
|
// }
|
||||||
|
|
||||||
return __('Can We Stay In Touch?');
|
return __('Can We Stay In Touch?');
|
||||||
}
|
}
|
||||||
|
|
|
@ -232,6 +232,15 @@
|
||||||
.media__subtitle {
|
.media__subtitle {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
position: relative;
|
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 {
|
.media__subtitle--large {
|
||||||
|
|
Loading…
Add table
Reference in a new issue