Merge branch 'master' into user-history
This commit is contained in:
commit
151d78f1c0
7 changed files with 35 additions and 19 deletions
|
@ -55,13 +55,24 @@ class SelectThumbnail extends React.PureComponent<Props, State> {
|
|||
const thumbnailSrc =
|
||||
!thumbnail || thumbnailError ? Native.imagePath(thumbnailErrorImage) : thumbnail;
|
||||
|
||||
/*
|
||||
Note:
|
||||
We are using backgroundImage instead of an <img /> to zoom if the selected thumbnail isn't
|
||||
the proper aspect ratio. This is to avoid blackbars on the side of images and inconsistent thumbnails
|
||||
We still need to render the image to see if there is an error loading the url
|
||||
*/
|
||||
|
||||
return (
|
||||
<div className="card__content">
|
||||
{status === THUMBNAIL_STATUSES.API_DOWN || status === THUMBNAIL_STATUSES.MANUAL ? (
|
||||
<div className="column">
|
||||
<div
|
||||
className="column__item thumbnail-preview card__media"
|
||||
style={{ backgroundImage: `url(${thumbnailSrc})` }}
|
||||
>
|
||||
<img
|
||||
style={{ display: 'none' }}
|
||||
src={thumbnailSrc}
|
||||
className="column__item thumbnail-preview"
|
||||
alt={__('Thumbnail Preview')}
|
||||
onError={() => {
|
||||
this.setState({
|
||||
|
@ -71,6 +82,7 @@ class SelectThumbnail extends React.PureComponent<Props, State> {
|
|||
});
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div className="column__item">
|
||||
<FormField
|
||||
className="input--thumbnail"
|
||||
|
|
|
@ -217,7 +217,14 @@ class HelpPage extends React.PureComponent<Props, State> {
|
|||
<td>{__('Connected Email')}</td>
|
||||
<td>
|
||||
{user && user.primary_email ? (
|
||||
user.primary_email
|
||||
<React.Fragment>
|
||||
{user.primary_email}{' '}
|
||||
<Button
|
||||
button="link"
|
||||
href={`http://lbry.io/list/edit/${accessToken}`}
|
||||
label={__('Update mailing preferences')}
|
||||
/>
|
||||
</React.Fragment>
|
||||
) : (
|
||||
<React.Fragment>
|
||||
<span className="empty">{__('none')} </span>
|
||||
|
|
|
@ -389,5 +389,4 @@ p {
|
|||
.thumbnail-preview {
|
||||
height: var(--thumbnail-preview-height);
|
||||
width: var(--thumbnail-preview-width);
|
||||
border: var(--thumbnail-preview-border);
|
||||
}
|
||||
|
|
|
@ -195,6 +195,4 @@ $large-breakpoint: 1921px;
|
|||
/* Image */
|
||||
--thumbnail-preview-height: 100px;
|
||||
--thumbnail-preview-width: 177px;
|
||||
// This will awlways white, it looks fine on light mode
|
||||
--thumbnail-preview-border: 1px solid var(--color-white);
|
||||
}
|
||||
|
|
|
@ -163,7 +163,7 @@ button:disabled {
|
|||
transition: color var(--animation-duration) var(--animation-style);
|
||||
|
||||
&:hover {
|
||||
color: var(--color-light-blue);
|
||||
color: var(--btn-color-inverse);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-size: cover;
|
||||
background-size: contain;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 50% 50%;
|
||||
display: flex;
|
||||
|
|
|
@ -3,7 +3,7 @@ table.table,
|
|||
word-wrap: break-word;
|
||||
max-width: 100%;
|
||||
text-align: left;
|
||||
margin-top: $spacing-width;
|
||||
margin-top: $spacing-vertical * 2/3;
|
||||
|
||||
tr td:first-of-type,
|
||||
tr th:first-of-type {
|
||||
|
|
Loading…
Reference in a new issue