diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-09 09:33:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-09 09:33:28 +0200 |
commit | e66883b37ae0796256b3aba550670a2d76cfc98a (patch) | |
tree | 3cce3c78e9f9f327470f0370a1b4065fe7e0009e /client/src/sass/player | |
parent | 6ad971d5f5e9ea2adfc58bd83ba1790efa4a8d12 (diff) | |
download | PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.tar.gz PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.tar.zst PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.zip |
`fitWidth` for `video-miniature`, fluid grid (#2830)
* Fluid abstract video list
* normalize timestamp display on miniatures
* use grid for abstract-video-list
- refactor scss function var to pvar to avoid overriding css variables
- move fluid-grid margins to adapt-margin-content-width mixin for maintainability
- fix video-miniature-name margin-top on small screen
* move sceenratio function in a mixin
* display no miniature avatar in channel videos view
Diffstat (limited to 'client/src/sass/player')
-rw-r--r-- | client/src/sass/player/context-menu.scss | 2 | ||||
-rw-r--r-- | client/src/sass/player/peertube-skin.scss | 10 | ||||
-rw-r--r-- | client/src/sass/player/settings-menu.scss | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/client/src/sass/player/context-menu.scss b/client/src/sass/player/context-menu.scss index eeab0ccdf..f3a28ead0 100644 --- a/client/src/sass/player/context-menu.scss +++ b/client/src/sass/player/context-menu.scss | |||
@@ -14,7 +14,7 @@ $context-menu-width: 350px; | |||
14 | 14 | ||
15 | .vjs-menu-content { | 15 | .vjs-menu-content { |
16 | opacity: $primary-foreground-opacity; | 16 | opacity: $primary-foreground-opacity; |
17 | color: var(--embedForegroundCsolor); | 17 | color: pvar(--embedForegroundCsolor); |
18 | font-size: $font-size !important; | 18 | font-size: $font-size !important; |
19 | font-weight: $font-semibold; | 19 | font-weight: $font-semibold; |
20 | } | 20 | } |
diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss index 836be23cc..92923a129 100644 --- a/client/src/sass/player/peertube-skin.scss +++ b/client/src/sass/player/peertube-skin.scss | |||
@@ -17,7 +17,7 @@ body { | |||
17 | 17 | ||
18 | .video-js.vjs-peertube-skin { | 18 | .video-js.vjs-peertube-skin { |
19 | font-size: $font-size; | 19 | font-size: $font-size; |
20 | color: var(--embedForegroundColor); | 20 | color: pvar(--embedForegroundColor); |
21 | 21 | ||
22 | .vjs-dock-text { | 22 | .vjs-dock-text { |
23 | padding-right: 10px; | 23 | padding-right: 10px; |
@@ -132,7 +132,7 @@ body { | |||
132 | .vjs-control-bar, | 132 | .vjs-control-bar, |
133 | .vjs-big-play-button, | 133 | .vjs-big-play-button, |
134 | .vjs-settings-dialog { | 134 | .vjs-settings-dialog { |
135 | background-color: var(--embedBigPlayBackgroundColor); | 135 | background-color: pvar(--embedBigPlayBackgroundColor); |
136 | } | 136 | } |
137 | 137 | ||
138 | .vjs-poster { | 138 | .vjs-poster { |
@@ -157,7 +157,7 @@ body { | |||
157 | .vjs-theater-control, | 157 | .vjs-theater-control, |
158 | .vjs-settings | 158 | .vjs-settings |
159 | { | 159 | { |
160 | color: var(--embedForegroundColor) !important; | 160 | color: pvar(--embedForegroundColor) !important; |
161 | 161 | ||
162 | opacity: $primary-foreground-opacity; | 162 | opacity: $primary-foreground-opacity; |
163 | transition: opacity .1s; | 163 | transition: opacity .1s; |
@@ -170,7 +170,7 @@ body { | |||
170 | .vjs-current-time, | 170 | .vjs-current-time, |
171 | .vjs-duration, | 171 | .vjs-duration, |
172 | .vjs-peertube { | 172 | .vjs-peertube { |
173 | color: var(--embedForegroundColor); | 173 | color: pvar(--embedForegroundColor); |
174 | opacity: $primary-foreground-opacity; | 174 | opacity: $primary-foreground-opacity; |
175 | } | 175 | } |
176 | 176 | ||
@@ -190,7 +190,7 @@ body { | |||
190 | transition: none; | 190 | transition: none; |
191 | 191 | ||
192 | .vjs-play-progress { | 192 | .vjs-play-progress { |
193 | background: var(--embedForegroundColor); | 193 | background: pvar(--embedForegroundColor); |
194 | 194 | ||
195 | // Not display the circle if the progress is not hovered | 195 | // Not display the circle if the progress is not hovered |
196 | &::before { | 196 | &::before { |
diff --git a/client/src/sass/player/settings-menu.scss b/client/src/sass/player/settings-menu.scss index 83407b445..09c872ef7 100644 --- a/client/src/sass/player/settings-menu.scss +++ b/client/src/sass/player/settings-menu.scss | |||
@@ -38,7 +38,7 @@ $setting-transition-easing: ease-out; | |||
38 | position: absolute; | 38 | position: absolute; |
39 | right: .5em; | 39 | right: .5em; |
40 | bottom: 3.5em; | 40 | bottom: 3.5em; |
41 | color: var(--embedForegroundColor); | 41 | color: pvar(--embedForegroundColor); |
42 | opacity: $primary-foreground-opacity; | 42 | opacity: $primary-foreground-opacity; |
43 | margin: 0 auto; | 43 | margin: 0 auto; |
44 | font-size: $font-size !important; | 44 | font-size: $font-size !important; |