From 24893b524c47b8f89090192aa38126352a952808 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 29 Jun 2021 15:17:01 +0200 Subject: [PATCH] Fix peertube container in markdown preview --- .../custom-markup-container.component.scss | 24 ------------------- .../custom-markup-container.component.ts | 3 +-- client/src/sass/application.scss | 2 ++ client/src/sass/custom-markup.scss | 20 ++++++++++++++++ 4 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 client/src/app/shared/shared-custom-markup/custom-markup-container.component.scss create mode 100644 client/src/sass/custom-markup.scss 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 @@ -.custom-markup-container { - - ::ng-deep .peertube-container { - - &.layout-row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - } - - &.layout-column { - display: flex; - flex-direction: column; - } - - .header { - margin: 30px 0 15px; - } - - h4 { - margin-bottom: 0; - } - } -} 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' @Component({ selector: 'my-custom-markup-container', - templateUrl: './custom-markup-container.component.html', - styleUrls: [ './custom-markup-container.component.scss' ] + templateUrl: './custom-markup-container.component.html' }) export class CustomMarkupContainerComponent implements OnChanges { @ViewChild('contentWrapper') contentWrapper: ElementRef 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/'; @use './classes'; +@use './custom-markup'; + [hidden] { display: none !important; } 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 @@ +peertube-container { + > .layout-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + } + + > .layout-column { + display: flex; + flex-direction: column; + } + + > .header { + margin: 30px 0 15px; + + > h4 { + margin-bottom: 0; + } + } +}