diff --git a/client/src/app/shared/animations.ts b/client/src/app/shared/animations.ts index c41f83bd6..4c11aa4e9 100644 --- a/client/src/app/shared/animations.ts +++ b/client/src/app/shared/animations.ts @@ -3,7 +3,7 @@ import { trigger, animate, transition, style, query, stagger, group } from '@ang const fadeVanish = [ style({ transform: 'translateY(0%)', opacity: 1 }), animate( - '200ms ease-in-out', + '150ms ease-in-out', style({ transform: 'translateY(0%)', opacity: 0 @@ -11,16 +11,17 @@ const fadeVanish = [ ) ]; -const fadeAppear = [ - style({ transform: 'translateY(0%)', opacity: 0 }), - animate('200ms ease-in-out', style({ transform: 'translateY(0%)', opacity: 1 })) -]; +// Requires more generic way to trigger parallel animations +// const fadeAppear = [ +// style({ transform: 'translateY(0%)', opacity: 0 }), +// animate('200ms ease-in-out', style({ transform: 'translateY(0%)', opacity: 1 })) +// ]; const justEnterDom = [style({ opacity: 0 })]; const fadeMoveIn = [ style({ transform: 'translateY(30px)' }), - animate('250ms ease-in-out', style({ transform: 'translateY(0px)', opacity: 1 })) + animate('150ms ease-in-out', style({ transform: 'translateY(0px)', opacity: 1 })) ]; export const pageTransition = trigger('pageTransition', [ @@ -30,28 +31,19 @@ export const pageTransition = trigger('pageTransition', [ /** keep the dom clean - let all items "just" enter */ query(':enter mat-card', justEnterDom, { optional: true }), - query(':enter .on-transition-fade', justEnterDom, { optional: true }), query(':enter mat-row', justEnterDom, { optional: true }), - query(':enter mat-expansion-panel', justEnterDom, { optional: true }), /** parallel vanishing */ group([ - query(':leave .on-transition-fade', fadeVanish, { optional: true }), query(':leave mat-card', fadeVanish, { optional: true }), - query(':leave mat-row', fadeVanish, { optional: true }), - query(':leave mat-expansion-panel', fadeVanish, { optional: true }) + query(':leave mat-row', fadeVanish, { optional: true }) ]), /** parallel appearing */ group([ - /** animate fade in for the selected components */ - query(':enter .on-transition-fade', fadeAppear, { optional: true }), - /** Staggered appearing = "one after another" */ query(':enter mat-card', stagger(50, fadeMoveIn), { optional: true }), query(':enter mat-row', stagger(30, fadeMoveIn), { optional: true }) - // disabled for now. They somehow appear expanded which looks strange - // query(':enter mat-expansion-panel', stagger(30, fadeMoveIn), { optional: true }) ]) ]) ]); diff --git a/client/src/app/shared/components/head-bar/head-bar.component.html b/client/src/app/shared/components/head-bar/head-bar.component.html index 1b18b62aa..239f9dbdb 100644 --- a/client/src/app/shared/components/head-bar/head-bar.component.html +++ b/client/src/app/shared/components/head-bar/head-bar.component.html @@ -1,37 +1,27 @@ - + menu - + menu - + arrow_back - + close - + @@ -39,21 +29,20 @@ - + - + @@ -61,7 +50,6 @@ @@ -72,7 +60,7 @@ Save - + @@ -80,7 +68,7 @@ diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.html b/client/src/app/shared/components/list-view-table/list-view-table.component.html index a4c7dfa1b..214da947b 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.html +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.html @@ -1,4 +1,4 @@ - + + {{ displayedCount }} of diff --git a/client/src/app/shared/components/sorting-list/sorting-list.component.html b/client/src/app/shared/components/sorting-list/sorting-list.component.html index 0b13c25c0..d041e8978 100644 --- a/client/src/app/shared/components/sorting-list/sorting-list.component.html +++ b/client/src/app/shared/components/sorting-list/sorting-list.component.html @@ -9,7 +9,7 @@ (click)="onItemClick($event, i)" (cdkDragStarted)="dragStarted(i)" > - + drag_indicator diff --git a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.html b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.html index 4d57ecfd6..f59e95a72 100644 --- a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.html +++ b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.html @@ -79,7 +79,7 @@ Text separator - + {{ option.label | translate }} @@ -139,7 +139,7 @@ - + diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html index 48389fc39..334aa5eed 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html @@ -13,7 +13,7 @@ - {{ viewListOfSpeakers.getTitle() }} + {{ viewListOfSpeakers.getTitle() }} 0" class="finished-list"> @@ -89,12 +89,20 @@ - + play_arrow - + {{ speaker.marked ? 'star' : 'star_border' }} diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html index fcff271b9..4ae48f3e4 100644 --- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html +++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html @@ -56,12 +56,15 @@ - + {{ assignment.getTitle() }} - + @@ -111,8 +114,7 @@ - + Election result @@ -205,7 +207,10 @@ - + diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html index 3767fd65c..299753b62 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html @@ -40,7 +40,7 @@ - + @@ -105,7 +105,7 @@ - + {{ pollService.getLabel(vote.value) | translate }}: @@ -184,7 +184,7 @@ Hint for ballot paper - + check diff --git a/client/src/app/site/common/components/error/error.component.html b/client/src/app/site/common/components/error/error.component.html index 7ca616a4a..53dcb5157 100644 --- a/client/src/app/site/common/components/error/error.component.html +++ b/client/src/app/site/common/components/error/error.component.html @@ -4,6 +4,6 @@ - + You do not have the required permission to see that page! diff --git a/client/src/app/site/history/components/history-list/history-list.component.html b/client/src/app/site/history/components/history-list/history-list.component.html index 27d82705b..53c2c2d43 100644 --- a/client/src/app/site/history/components/history-list/history-list.component.html +++ b/client/src/app/site/history/components/history-list/history-list.component.html @@ -39,7 +39,7 @@ - + Timestamp @@ -77,7 +77,7 @@ - + diff --git a/client/src/app/site/motions/modules/call-list/call-list.component.html b/client/src/app/site/motions/modules/call-list/call-list.component.html index 479c41743..17e965eda 100644 --- a/client/src/app/site/motions/modules/call-list/call-list.component.html +++ b/client/src/app/site/motions/modules/call-list/call-list.component.html @@ -12,7 +12,7 @@ - + {{ seenNodes[0] }} of {{ seenNodes[1] }} diff --git a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html index f62b9d52b..fd3bc8dee 100644 --- a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html +++ b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html @@ -22,7 +22,7 @@ {{ getLevelDashes(category) }} {{ category.prefixedName }} - + Motion @@ -93,25 +93,19 @@ - + - + - - Save - - - Cancel - - + + Save + + + Cancel + + diff --git a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html index 848042a96..34048f3f8 100644 --- a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html +++ b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html @@ -49,7 +49,7 @@ - + diff --git a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-list.component.html b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-list.component.html index 32ba6bf31..8c76b5531 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-list.component.html +++ b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-list.component.html @@ -126,34 +126,16 @@ No groups selected - + edit - + cancel - + save - + delete diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html index 3044e8108..d801bbe76 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html @@ -15,7 +15,7 @@ - + 0"> {{ 'Select paragraphs' | translate }} @@ -37,7 +37,7 @@ *ngIf="!multipleParagraphsAllowed" class="paragraph-select" [checked]="isParagraphSelected(paragraph)" - > + > @@ -52,10 +52,11 @@ = paragraph.lineTo - 1" class="line-number"> - {{ 'Line' | translate }} {{ paragraph.lineFrom }}: + {{ 'Line' | translate }} {{ paragraph.lineFrom }}: - {{ 'Line' | translate }} {{ paragraph.lineFrom }} - - {{ paragraph.lineTo - 1 }}: + {{ 'Line' | translate }} {{ paragraph.lineFrom }} - {{ paragraph.lineTo - 1 }}: diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html index fc81a13dd..42dcffb4a 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html @@ -20,7 +20,7 @@ - + - + {{ motion.title }} @@ -133,9 +133,8 @@ - - + @@ -152,7 +151,7 @@ - + @@ -439,9 +438,11 @@ - - + @@ -472,23 +473,20 @@ cancel - + format_list_numbered Line numbering - - (none) - + (none) 0 + motion && + !motion.isParagraphBasedAmendment() && + allChangingObjects && + allChangingObjects.length > 0 " > rate_review @@ -546,7 +544,7 @@ (click)="deleteModifiedFinalVersion()" > delete - + @@ -649,11 +647,17 @@ > - + - + redo Go to line diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.html index 359bfe616..2db9562b6 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.html @@ -4,9 +4,9 @@ ({{ pollIndex + 1 }}) - + - + {{ getIcon(key) }} @@ -55,18 +55,10 @@ edit - + local_printshop - + delete diff --git a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html index ee3459a28..5dccc4a97 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html +++ b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html @@ -107,7 +107,7 @@ - + @@ -238,7 +238,7 @@ *ngIf="hasError(entry, 'Tags')" matTooltip="{{ getVerboseError('Tags') | translate }}" > - warning + warning {{ tag.name }} diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html index a5eead1d6..36bb5d94b 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html @@ -7,7 +7,7 @@ - + edit @@ -24,7 +24,7 @@ - + Permissions @@ -112,13 +112,9 @@ - - - {{ getRestrictionLabel(restriction) | translate }}, + + {{ getRestrictionLabel(restriction) | translate + }}, @@ -193,7 +189,11 @@ - + check {{ restriction.label | translate }} diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html index 6b2076aea..29fc83015 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html @@ -97,7 +97,7 @@ - + diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html index c273b4bbe..a59f0d197 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html @@ -83,36 +83,23 @@ edit - + close save - + delete diff --git a/client/src/app/site/tags/components/tag-list/tag-list.component.html b/client/src/app/site/tags/components/tag-list/tag-list.component.html index 404dd35fa..ecda87eac 100644 --- a/client/src/app/site/tags/components/tag-list/tag-list.component.html +++ b/client/src/app/site/tags/components/tag-list/tag-list.component.html @@ -25,7 +25,7 @@ - + delete Delete diff --git a/client/src/app/site/users/components/group-list/group-list.component.html b/client/src/app/site/users/components/group-list/group-list.component.html index 555d0e71e..c8006d9ce 100644 --- a/client/src/app/site/users/components/group-list/group-list.component.html +++ b/client/src/app/site/users/components/group-list/group-list.component.html @@ -1,17 +1,16 @@ - + Groups - + All your changes are saved immediately. - + {{ app.name | translate }} @@ -19,7 +18,7 @@ - + Permissions @@ -36,8 +35,11 @@ - + @@ -58,8 +60,14 @@ - + Required diff --git a/client/src/app/site/users/components/user-import/user-import-list.component.html b/client/src/app/site/users/components/user-import/user-import-list.component.html index 24625ff8d..fc13649cc 100644 --- a/client/src/app/site/users/components/user-import/user-import-list.component.html +++ b/client/src/app/site/users/components/user-import/user-import-list.component.html @@ -81,7 +81,7 @@ Text separator - + {{ option.label | translate }} @@ -143,7 +143,7 @@ Show correct entries only - + diff --git a/client/src/styles.scss b/client/src/styles.scss index dd6e2fdfc..59a680e62 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -461,11 +461,6 @@ mat-paginator { flex: 1 1 auto; } -/** helper classes for animation */ -.on-transition-fade { - z-index: 100; -} - mat-expansion-panel { border-radius: 0 !important; }