diff --git a/client/src/app/shared/components/icon-container/icon-container.component.scss b/client/src/app/shared/components/icon-container/icon-container.component.scss index c8f2b1c16..341d973f5 100644 --- a/client/src/app/shared/components/icon-container/icon-container.component.scss +++ b/client/src/app/shared/components/icon-container/icon-container.component.scss @@ -31,7 +31,11 @@ os-icon-container { } &.large-container { - @include icon-container(24px, 16px, 500); + @include icon-container(24px, 16px, 400); + } + + &.gigantic-container { + @include icon-container(34px, 22px, 400); } .content-node { diff --git a/client/src/app/shared/components/icon-container/icon-container.component.ts b/client/src/app/shared/components/icon-container/icon-container.component.ts index c089d2de8..555d17265 100644 --- a/client/src/app/shared/components/icon-container/icon-container.component.ts +++ b/client/src/app/shared/components/icon-container/icon-container.component.ts @@ -24,7 +24,7 @@ export class IconContainerComponent { * Optional size property. Can be large, if needed. */ @Input() - public size: 'small' | 'medium' | 'large' = 'medium'; + public size: 'small' | 'medium' | 'large' | 'gigantic' = 'medium'; /** * Reverse text and icon. diff --git a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html index a5eb066b4..80698a620 100644 --- a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html +++ b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html @@ -9,7 +9,7 @@ - + {{ row.votingOption | pollKeyVerbose | translate }} diff --git a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.ts b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.ts index 76d2882ab..6689877a4 100644 --- a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.ts +++ b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.ts @@ -19,6 +19,9 @@ export class MotionPollDetailContentComponent implements OnInit { @Input() public chartData: BehaviorSubject; + @Input() + public iconSize: 'large' | 'gigantic' = 'large'; + public get hasVotes(): boolean { return this.poll && !!this.poll.options; } diff --git a/client/src/app/shared/pipes/parse-poll-number.pipe.ts b/client/src/app/shared/pipes/parse-poll-number.pipe.ts index c14763755..9f016aa18 100644 --- a/client/src/app/shared/pipes/parse-poll-number.pipe.ts +++ b/client/src/app/shared/pipes/parse-poll-number.pipe.ts @@ -8,6 +8,13 @@ import { VOTE_MAJORITY, VOTE_UNDOCUMENTED } from '../models/poll/base-poll'; name: 'parsePollNumber' }) export class ParsePollNumberPipe implements PipeTransform { + private formatter = new Intl.NumberFormat('us-us', { + style: 'decimal', + useGrouping: false, + minimumFractionDigits: 0, + maximumFractionDigits: 6 + }); + public constructor(private translate: TranslateService) {} public transform(value: number): number | string { @@ -17,7 +24,7 @@ export class ParsePollNumberPipe implements PipeTransform { case VOTE_UNDOCUMENTED: return this.translate.instant('undocumented'); default: - return value; + return this.formatter.format(value); } } } diff --git a/client/src/app/slides/motions/motion-poll/motion-poll-slide.component.html b/client/src/app/slides/motions/motion-poll/motion-poll-slide.component.html index f0f692b1c..9ce89f6bc 100644 --- a/client/src/app/slides/motions/motion-poll/motion-poll-slide.component.html +++ b/client/src/app/slides/motions/motion-poll/motion-poll-slide.component.html @@ -7,6 +7,6 @@

{{ data.data.poll.title }}

- +