diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
| commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
| tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/src/standalone | |
| parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
| parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
| download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip | |
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/src/standalone')
| -rw-r--r-- | client/src/standalone/videos/embed.html | 2 | ||||
| -rw-r--r-- | client/src/standalone/videos/embed.scss | 32 |
2 files changed, 23 insertions, 11 deletions
diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index 0a35bc362..fa4d0bdba 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | <body> | 12 | <body> |
| 13 | 13 | ||
| 14 | <video id="video-container" class="video-js vjs-sublime-skin vjs-big-play-centered"> | 14 | <video id="video-container" class="video-js vjs-peertube-skin"> |
| 15 | </video> | 15 | </video> |
| 16 | 16 | ||
| 17 | </body> | 17 | </body> |
diff --git a/client/src/standalone/videos/embed.scss b/client/src/standalone/videos/embed.scss index b76f09677..9140cd37c 100644 --- a/client/src/standalone/videos/embed.scss +++ b/client/src/standalone/videos/embed.scss | |||
| @@ -23,17 +23,13 @@ html, body { | |||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | .vjs-peertube-link { | 25 | .vjs-peertube-link { |
| 26 | color: white; | 26 | color: #fff; |
| 27 | text-decoration: none; | 27 | text-decoration: none; |
| 28 | font-size: 1.3em; | 28 | font-size: $font-size; |
| 29 | line-height: 2.20; | 29 | line-height: $control-bar-height; |
| 30 | transition: all .4s; | 30 | transition: all .4s; |
| 31 | position: relative; | 31 | font-weight: $font-semibold; |
| 32 | right: 8px; | 32 | margin-right: 3px; |
| 33 | } | ||
| 34 | |||
| 35 | .vjs-resolution-button-label { | ||
| 36 | left: -7px; | ||
| 37 | } | 33 | } |
| 38 | 34 | ||
| 39 | .vjs-peertube-link:hover { | 35 | .vjs-peertube-link:hover { |
| @@ -42,5 +38,21 @@ html, body { | |||
| 42 | 38 | ||
| 43 | // Fix volume panel because we added a new component (PeerTube link) | 39 | // Fix volume panel because we added a new component (PeerTube link) |
| 44 | .vjs-volume-panel { | 40 | .vjs-volume-panel { |
| 45 | margin-right: 130px !important; | 41 | margin-right: 121px !important; |
| 42 | } | ||
| 43 | |||
| 44 | @media screen and (max-width: 350px) { | ||
| 45 | .vjs-play-control { | ||
| 46 | padding: 0 5px !important; | ||
| 47 | width: 25px !important; | ||
| 48 | } | ||
| 49 | |||
| 50 | .vjs-volume-control { | ||
| 51 | display: none !important; | ||
| 52 | } | ||
| 53 | |||
| 54 | .vjs-volume-panel { | ||
| 55 | width: 26px !important; | ||
| 56 | margin-right: 140px !important; | ||
| 57 | } | ||
| 46 | } | 58 | } |