projects
/
oweals
/
peertube.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0826c92
)
Fix nav in manage follows
author
Chocobozzz
<me@florianbigard.com>
Wed, 20 Dec 2017 09:04:37 +0000
(10:04 +0100)
committer
Chocobozzz
<me@florianbigard.com>
Wed, 20 Dec 2017 09:04:37 +0000
(10:04 +0100)
client/src/app/+admin/follows/follows.component.scss
patch
|
blob
|
history
client/src/app/videos/+video-watch/video-watch.component.ts
patch
|
blob
|
history
client/src/sass/include/_mixins.scss
patch
|
blob
|
history
diff --git
a/client/src/app/+admin/follows/follows.component.scss
b/client/src/app/+admin/follows/follows.component.scss
index 835fa3b7830d312fff53d71ee27bda5cbfc5f389..385dfbb7d212dd002c7f4e5b068bfc2a26ec0e9a 100644
(file)
--- a/
client/src/app/+admin/follows/follows.component.scss
+++ b/
client/src/app/+admin/follows/follows.component.scss
@@
-2,3
+2,9
@@
flex-grow: 0;
margin-right: 30px;
}
+
+/deep/ .tab-content {
+ height: 0;
+ min-height: 0;
+ padding: 0;
+}
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 5e2683334f7f6a7a40d70f2d560d55d88879f68d..adb698e99ac9149710356298c5920fda8e23a9e7 100644
(file)
--- 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 {
// If autoplay is true, we don't really need a poster
if (this.isAutoplay() === false) {
- console.log('coucou')
this.playerElement.poster = this.video.previewUrl
}
diff --git
a/client/src/sass/include/_mixins.scss
b/client/src/sass/include/_mixins.scss
index f6f17846e89eb526065f6fbaaa0a0bd11b45cca4..fdf5e3f67995bc62c8b39700727415b99dec7cac 100644
(file)
--- a/
client/src/sass/include/_mixins.scss
+++ b/
client/src/sass/include/_mixins.scss
@@
-15,6
+15,7
@@
border: 1px solid #C6C6C6;
border-radius: 3px;
padding-left: 15px;
+ padding-right: 15px;
&::placeholder {
color: #585858;
@@
-94,4
+95,5
@@
width: $width;
border-radius: 3px;
padding-left: 15px;
+ padding-right: 15px;
}