From a42205e47f5ace740cdb420f7794ab933a8696ee Mon Sep 17 00:00:00 2001 From: Sean Date: Thu, 17 Sep 2020 15:40:43 +0200 Subject: [PATCH] Hide diff-box in projector --- .../motion-detail-diff.component.scss-theme.scss | 16 +++++++++------- .../motion-detail-diff.component.ts | 5 +++-- .../motions/motion/motion-slide.component.scss | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss index 38b85c698..9ce9a2ab8 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss @@ -3,13 +3,15 @@ @mixin os-motion-detail-diff-style($theme) { $background: map-get($theme, background); - .change-recommendation-overview, - .diff-box { - background-color: mat-color($background, background); - border: 1px solid mat-color($background, selected-button); - } + .motion-text-with-diffs { + .change-recommendation-overview, + .diff-box { + background-color: mat-color($background, background); + border: 1px solid mat-color($background, selected-button); + } - .diff-box:hover { - background-color: mat-color($background, selected-button); + .diff-box:hover { + background-color: mat-color($background, selected-button); + } } } diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts index cfac1619b..846c0b1a2 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Output } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; @@ -54,7 +54,8 @@ import { ViewMotionAmendedParagraph } from '../../../../models/view-motion-amend @Component({ selector: 'os-motion-detail-diff', templateUrl: './motion-detail-diff.component.html', - styleUrls: ['./motion-detail-diff.component.scss'] + styleUrls: ['./motion-detail-diff.component.scss'], + encapsulation: ViewEncapsulation.None }) export class MotionDetailDiffComponent extends BaseViewComponent implements AfterViewInit { /** diff --git a/client/src/app/slides/motions/motion/motion-slide.component.scss b/client/src/app/slides/motions/motion/motion-slide.component.scss index e2e7a640b..3be8894a4 100644 --- a/client/src/app/slides/motions/motion/motion-slide.component.scss +++ b/client/src/app/slides/motions/motion/motion-slide.component.scss @@ -67,8 +67,8 @@ &.line-numbers-outside { .os-line-number { &:after { - top: 17px; - font-size: 16px; + top: 17px !important; + font-size: 16px !important; } } }