diff --git a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html index bb6b25571..f72ae99af 100644 --- a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html +++ b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html @@ -5,7 +5,7 @@

Format

- + PDF CSV @@ -13,7 +13,7 @@

Line numbering

- + None Inline Outside @@ -22,7 +22,7 @@

Change recommendations

- + Original version @@ -36,7 +36,7 @@

Content

- + Text Reason @@ -44,14 +44,16 @@

Meta information

- + Submitters - State - Recommendation + State + Recommendation Category Origin Motion block - Voting result + + Voting result +
diff --git a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.scss b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.scss index 537803a76..1c1d77582 100644 --- a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.scss +++ b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.scss @@ -1,3 +1,16 @@ .toggle-group-head { margin-bottom: 0; } + +h1 { + margin: 0; +} + +.smaller-buttons { + ::ng-deep { + .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + line-height: 2.5 !important; + padding: 0 10px !important; + } + } +} diff --git a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts index 413fb455b..0cb99cb57 100644 --- a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts +++ b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts @@ -74,18 +74,6 @@ export class MotionExportDialogComponent implements OnInit { @ViewChild('votingResultButton') public votingResultButton: MatButtonToggle; - /** - * To deactivate the state button - */ - @ViewChild('stateButton') - public stateButton: MatButtonToggle; - - /** - * To deactivate the state button - */ - @ViewChild('recommendationButton') - public recommendationButton: MatButtonToggle; - /** * Constructor * Sets the default values for the lineNumberingMode and changeRecoMode and creates the form. @@ -133,17 +121,15 @@ export class MotionExportDialogComponent implements OnInit { // } // } - // remove the selection of "votingResult", "state" and "recommendation" + // remove the selection of "votingResult" let metaInfoVal: string[] = this.exportForm.get('metaInfo').value; metaInfoVal = metaInfoVal.filter(info => { - return info !== 'votingResult' && info !== 'state' && info !== 'recommendation'; + return info !== 'votingResult'; }); this.exportForm.get('metaInfo').setValue(metaInfoVal); - // disable "Diff Version", "Voting Result", "State" and "Recommendation" + // disable "Diff Version" and "Voting Result" this.votingResultButton.disabled = true; - this.stateButton.disabled = true; - this.recommendationButton.disabled = true; // TODO: CSV Issues // this.diffVersionButton.disabled = true; } else if (value === 'pdf') { @@ -154,10 +140,8 @@ export class MotionExportDialogComponent implements OnInit { this.exportForm.get('crMode').enable(); this.exportForm.get('crMode').setValue(this.defaultCrMode); - // enable "Diff Version", "Voting Result", "State" and "Recommendation" + // enable "Diff Version" and "Voting Result" this.votingResultButton.disabled = false; - this.stateButton.disabled = false; - this.recommendationButton.disabled = false; // TODO: Temporarily disabled. Will be required after CSV fixes // this.diffVersionButton.disabled = false; } diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/components/motion-list/motion-list.component.ts index d7b846941..72ffa9867 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.ts @@ -201,7 +201,9 @@ export class MotionListComponent extends ListViewBaseComponent imple */ public openExportDialog(): void { const exportDialogRef = this.dialog.open(MotionExportDialogComponent, { - width: '750px', + width: '950px', + maxWidth: '90vw', + maxHeight: '90vh', data: this.dataSource }); diff --git a/client/src/styles.scss b/client/src/styles.scss index 94b93ec06..4825158b0 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -24,7 +24,7 @@ @import '~angular-tree-component/dist/angular-tree-component.css'; /** date-time-picker */ -@import "~ng-pick-datetime/assets/style/picker.min.css"; +@import '~ng-pick-datetime/assets/style/picker.min.css'; /** Define the classes to switch between themes */ .openslides-theme { @@ -139,7 +139,6 @@ b { } } - .green-text { // TODO better name/theming color: #5a5; @@ -181,7 +180,8 @@ mat-card { } .os-form-card-mobile { - .mat-form-field, .mat-select { + .mat-form-field, + .mat-select { width: 100%; } } @@ -268,7 +268,6 @@ mat-card { @extend %os-table; } - /* TODO: find a better way to get more vertical space in (empty/small) tables for maximize filter dialog */ mat-paginator { min-height: 800px; @@ -598,14 +597,12 @@ button.mat-menu-item.selected { font-size: 16px; } - /*** Projector slides ***/ #slide { - h3 { color: #222; - margin-bottom: 10px + margin-bottom: 10px; } .slidetitle { @@ -628,7 +625,8 @@ button.mat-menu-item.selected { } } - ul, ol { + ul, + ol { margin: 0 0 10px 0; }