aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-07-01 17:47:21 +0200
committerChocobozzz <me@florianbigard.com>2021-07-01 18:05:08 +0200
commitf6c1251def2701cad12cbe0b029dc705b3f9665e (patch)
tree5ba4e0ed384edf527f5e41e91ad2c19b50b27c60
parent674d903b0e993b3a67836f3dabba80282d9900ab (diff)
downloadPeerTube-f6c1251def2701cad12cbe0b029dc705b3f9665e.tar.gz
PeerTube-f6c1251def2701cad12cbe0b029dc705b3f9665e.tar.zst
PeerTube-f6c1251def2701cad12cbe0b029dc705b3f9665e.zip
Use consistent margins
-rw-r--r--client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss2
-rw-r--r--client/src/sass/custom-markup.scss6
-rw-r--r--shared/extra-utils/miscs/miscs.ts2
3 files changed, 8 insertions, 2 deletions
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
index fd84780fe..39e8d2091 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
@@ -4,7 +4,7 @@
4.channel { 4.channel {
5 padding: 20px; 5 padding: 20px;
6 background-color: pvar(--channelBackgroundColor); 6 background-color: pvar(--channelBackgroundColor);
7 margin: 0 30px 30px 0; 7 margin-bottom: 30px;
8 width: fit-content; 8 width: fit-content;
9} 9}
10 10
diff --git a/client/src/sass/custom-markup.scss b/client/src/sass/custom-markup.scss
index d1729dbda..cecc946a1 100644
--- a/client/src/sass/custom-markup.scss
+++ b/client/src/sass/custom-markup.scss
@@ -18,3 +18,9 @@ peertube-container {
18 } 18 }
19 } 19 }
20} 20}
21
22peertube-video-miniature,
23peertube-playlist-miniature,
24peertube-channel-miniature {
25 margin-right: 30px;
26}
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
index f20be8585..462b914d4 100644
--- a/shared/extra-utils/miscs/miscs.ts
+++ b/shared/extra-utils/miscs/miscs.ts
@@ -2,7 +2,7 @@
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import * as ffmpeg from 'fluent-ffmpeg' 4import * as ffmpeg from 'fluent-ffmpeg'
5import { ensureDir, exists, pathExists, readFile, stat } from 'fs-extra' 5import { ensureDir, pathExists, readFile, stat } from 'fs-extra'
6import { basename, dirname, isAbsolute, join, resolve } from 'path' 6import { basename, dirname, isAbsolute, join, resolve } from 'path'
7import * as request from 'supertest' 7import * as request from 'supertest'
8import * as WebTorrent from 'webtorrent' 8import * as WebTorrent from 'webtorrent'