enhancing watched videos appearnce (#806)

This commit is contained in:
Sai Deepesh 2020-12-18 09:51:17 +05:30 committed by GitHub
parent 49512dbe9b
commit 46124b6b89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 15 deletions

4
package-lock.json generated
View File

@ -8982,7 +8982,7 @@
}, },
"humanize-plus": { "humanize-plus": {
"version": "1.8.2", "version": "1.8.2",
"resolved": "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz", "resolved": "http://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz",
"integrity": "sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=", "integrity": "sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=",
"dev": true "dev": true
}, },
@ -14309,7 +14309,7 @@
}, },
"safe-regex": { "safe-regex": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true, "dev": true,
"requires": { "requires": {

View File

@ -1,10 +1,9 @@
.ft-auto-grid .ft-auto-grid
&.grid &.grid
display: grid display: grid
grid-template-columns: repeat(auto-fill, 240px) grid-template-columns: repeat(auto-fill, 262px)
justify-content: space-evenly justify-content: space-evenly
grid-gap: 5px
&.list &.list
display: grid display: grid
grid-gap: 16px grid-gap: 4px

View File

@ -25,6 +25,13 @@
&:active &:active
background-color: var(--side-nav-active-color) background-color: var(--side-nav-active-color)
&.base-no-default
&:hover
background-color: var(--side-nav-hover-color)
&:active
background-color: var(--side-nav-active-color)
&.primary &.primary
background-color: var(--primary-color) background-color: var(--primary-color)
color: var(--text-with-main-color) color: var(--text-with-main-color)

View File

@ -5,9 +5,7 @@
:title="title" :title="title"
:icon="icon" :icon="icon"
:class="{ :class="{
base: theme === 'base', [theme]: true,
primary: theme === 'primary',
secondary: theme === 'secondary',
shadow: useShadow shadow: useShadow
}" }"
:style="{ :style="{

View File

@ -4,7 +4,8 @@
:class="{ :class="{
list: (listType === 'list' || forceListType === 'list') && forceListType !== 'grid', list: (listType === 'list' || forceListType === 'list') && forceListType !== 'grid',
grid: (listType === 'grid' || forceListType === 'list') && forceListType !== 'list', grid: (listType === 'grid' || forceListType === 'list') && forceListType !== 'list',
[appearance]: true [appearance]: true,
watched: watched
}" }"
> >
<div <div
@ -33,6 +34,7 @@
v-if="!isLive" v-if="!isLive"
icon="star" icon="star"
class="favoritesIcon" class="favoritesIcon"
theme="base"
:padding="appearance === `watchPlaylistItem` ? 5 : 6" :padding="appearance === `watchPlaylistItem` ? 5 : 6"
:size="appearance === `watchPlaylistItem` ? 14 : 18" :size="appearance === `watchPlaylistItem` ? 14 : 18"
:class="{ favorited: isFavorited }" :class="{ favorited: isFavorited }"
@ -54,7 +56,7 @@
<ft-icon-button <ft-icon-button
class="optionsButton" class="optionsButton"
title="More Options" title="More Options"
theme="base" theme="base-no-default"
:size="16" :size="16"
:use-shadow="false" :use-shadow="false"
dropdown-position-x="left" dropdown-position-x="left"

View File

@ -20,7 +20,29 @@ $thumbnail-overlay-opacity: 0.85
.watchPlaylistItem#{&}, .recommendation#{&} .watchPlaylistItem#{&}, .recommendation#{&}
@content @content
@mixin low-contrast-when-watched($col)
color: $col
@at-root
.watched &, .watched#{&}
color: var(--tertiary-text-color)
.watched:hover &, .watched:hover#{&}
color: $col
.ft-list-item .ft-list-item
padding: 6px
&.watched
background-color: var(--bg-color)
@include low-contrast-when-watched(var(--primary-text-color))
.thumbnailImage
opacity: 0.3
&:hover .thumbnailImage
opacity: 1
.videoThumbnail .videoThumbnail
display: flex display: flex
position: relative position: relative
@ -43,7 +65,7 @@ $thumbnail-overlay-opacity: 0.85
padding: 2px padding: 2px
opacity: $thumbnail-overlay-opacity opacity: $thumbnail-overlay-opacity
color: var(--primary-text-color) color: var(--primary-text-color)
background-color: var(--card-bg-color) background-color: var(--bg-color)
pointer-events: none pointer-events: none
.videoDuration .videoDuration
@ -124,7 +146,7 @@ $thumbnail-overlay-opacity: 0.85
.title .title
font-size: 20px font-size: 20px
color: var(--primary-text-color) @include low-contrast-when-watched(var(--primary-text-color))
text-decoration: none text-decoration: none
word-wrap: break-word word-wrap: break-word
word-break: break-word word-break: break-word
@ -139,12 +161,15 @@ $thumbnail-overlay-opacity: 0.85
@include is-sidebar-item @include is-sidebar-item
font-size: 12px font-size: 12px
&, .channelName &
color: var(--secondary-text-color) @include low-contrast-when-watched(var(--secondary-text-color))
.channelName
@include low-contrast-when-watched(var(--secondary-text-color))
.description .description
font-size: 14px font-size: 14px
color: var(--secondary-text-color) @include low-contrast-when-watched(var(--secondary-text-color))
&.list &.list
display: flex display: flex