aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-29 15:17:01 +0200
committerChocobozzz <me@florianbigard.com>2021-06-29 15:17:01 +0200
commit24893b524c47b8f89090192aa38126352a952808 (patch)
tree25fffe8b49fe0b6d481abd7e0f92f7af11bebcd4
parentd4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb (diff)
downloadPeerTube-24893b524c47b8f89090192aa38126352a952808.tar.gz
PeerTube-24893b524c47b8f89090192aa38126352a952808.tar.zst
PeerTube-24893b524c47b8f89090192aa38126352a952808.zip
Fix peertube container in markdown preview
-rw-r--r--client/src/app/shared/shared-custom-markup/custom-markup-container.component.scss24
-rw-r--r--client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts3
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--client/src/sass/custom-markup.scss20
4 files changed, 23 insertions, 26 deletions
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.scss b/client/src/app/shared/shared-custom-markup/custom-markup-container.component.scss
deleted file mode 100644
index 704d908c3..000000000
--- a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.scss
+++ /dev/null
@@ -1,24 +0,0 @@
1.custom-markup-container {
2
3 ::ng-deep .peertube-container {
4
5 &.layout-row {
6 display: flex;
7 flex-direction: row;
8 flex-wrap: wrap;
9 }
10
11 &.layout-column {
12 display: flex;
13 flex-direction: column;
14 }
15
16 .header {
17 margin: 30px 0 15px;
18 }
19
20 h4 {
21 margin-bottom: 0;
22 }
23 }
24}
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts b/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
index 2ecdc0243..3d49c6768 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
@@ -3,8 +3,7 @@ import { CustomMarkupService } from './custom-markup.service'
3 3
4@Component({ 4@Component({
5 selector: 'my-custom-markup-container', 5 selector: 'my-custom-markup-container',
6 templateUrl: './custom-markup-container.component.html', 6 templateUrl: './custom-markup-container.component.html'
7 styleUrls: [ './custom-markup-container.component.scss' ]
8}) 7})
9export class CustomMarkupContainerComponent implements OnChanges { 8export class CustomMarkupContainerComponent implements OnChanges {
10 @ViewChild('contentWrapper') contentWrapper: ElementRef<HTMLInputElement> 9 @ViewChild('contentWrapper') contentWrapper: ElementRef<HTMLInputElement>
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 6b32d4cd6..15ca09ec4 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -11,6 +11,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
11 11
12@use './classes'; 12@use './classes';
13 13
14@use './custom-markup';
15
14[hidden] { 16[hidden] {
15 display: none !important; 17 display: none !important;
16} 18}
diff --git a/client/src/sass/custom-markup.scss b/client/src/sass/custom-markup.scss
new file mode 100644
index 000000000..d1729dbda
--- /dev/null
+++ b/client/src/sass/custom-markup.scss
@@ -0,0 +1,20 @@
1peertube-container {
2 > .layout-row {
3 display: flex;
4 flex-direction: row;
5 flex-wrap: wrap;
6 }
7
8 > .layout-column {
9 display: flex;
10 flex-direction: column;
11 }
12
13 > .header {
14 margin: 30px 0 15px;
15
16 > h4 {
17 margin-bottom: 0;
18 }
19 }
20}