diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-20 10:04:37 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-20 10:04:37 +0100 |
commit | 15ca2e871aa069e596baf9da22b3d2a1ab1a0b1a (patch) | |
tree | d4c893ae94bba8b824dccdabf31bd87cca87c316 /client/src | |
parent | 0826c92d6fd327f9abcdda1054808a6b2587848d (diff) | |
download | PeerTube-15ca2e871aa069e596baf9da22b3d2a1ab1a0b1a.tar.gz PeerTube-15ca2e871aa069e596baf9da22b3d2a1ab1a0b1a.tar.zst PeerTube-15ca2e871aa069e596baf9da22b3d2a1ab1a0b1a.zip |
Fix nav in manage follows
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/+admin/follows/follows.component.scss | 6 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 1 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss index 835fa3b78..385dfbb7d 100644 --- a/client/src/app/+admin/follows/follows.component.scss +++ b/client/src/app/+admin/follows/follows.component.scss | |||
@@ -2,3 +2,9 @@ | |||
2 | flex-grow: 0; | 2 | flex-grow: 0; |
3 | margin-right: 30px; | 3 | margin-right: 30px; |
4 | } | 4 | } |
5 | |||
6 | /deep/ .tab-content { | ||
7 | height: 0; | ||
8 | min-height: 0; | ||
9 | padding: 0; | ||
10 | } | ||
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 5e2683334..adb698e99 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -290,7 +290,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
290 | 290 | ||
291 | // If autoplay is true, we don't really need a poster | 291 | // If autoplay is true, we don't really need a poster |
292 | if (this.isAutoplay() === false) { | 292 | if (this.isAutoplay() === false) { |
293 | console.log('coucou') | ||
294 | this.playerElement.poster = this.video.previewUrl | 293 | this.playerElement.poster = this.video.previewUrl |
295 | } | 294 | } |
296 | 295 | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index f6f17846e..fdf5e3f67 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -15,6 +15,7 @@ | |||
15 | border: 1px solid #C6C6C6; | 15 | border: 1px solid #C6C6C6; |
16 | border-radius: 3px; | 16 | border-radius: 3px; |
17 | padding-left: 15px; | 17 | padding-left: 15px; |
18 | padding-right: 15px; | ||
18 | 19 | ||
19 | &::placeholder { | 20 | &::placeholder { |
20 | color: #585858; | 21 | color: #585858; |
@@ -94,4 +95,5 @@ | |||
94 | width: $width; | 95 | width: $width; |
95 | border-radius: 3px; | 96 | border-radius: 3px; |
96 | padding-left: 15px; | 97 | padding-left: 15px; |
98 | padding-right: 15px; | ||
97 | } | 99 | } |