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 4af34c745..1df325bb2 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,70 +1,72 @@ - - - + +
+ + - - - - - - + + + + - -
- - -
- - videocam - + +
+ + +
+ + videocam + +
-
- -
- {{ 'No data' | translate }} -
+ +
+ {{ 'No data' | translate }} +
- -
- -
+ +
+ +
- -
- -
- + +
+ +
+ +
diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.scss b/client/src/app/shared/components/list-view-table/list-view-table.component.scss index ef31713db..0d1bed762 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.scss +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.scss @@ -2,26 +2,45 @@ $pbl-height: var(--pbl-height); -.projector-button { - margin: auto; +.list-view-frame { + // remove the height of the top-bar + height: calc(100vh - 64px); +} + +.list-view-table-wrapper { display: flex; -} + flex-flow: column; + height: 100%; -.pbl-ngrid-row { - height: $pbl-height; -} + .sort-filter-bar { + flex: 0 1 auto; + display: block; + } -// additional space if the jitsi integration is active -.pbl-ngrid-row:last-of-type { - margin-bottom: 30px !important; -} + .vscroll-list-view { + flex: 1 1 auto; -.pbl-ngrid-cell { - height: inherit; -} + .projector-button { + margin: auto; + display: flex; + } -.multiselect { - .pbl-ngrid-cell { - cursor: pointer; + .pbl-ngrid-row { + height: $pbl-height; + } + + .pbl-ngrid-row:last-of-type { + margin-bottom: 60px !important; + } + + .pbl-ngrid-cell { + height: inherit; + } + + .multiselect { + .pbl-ngrid-cell { + cursor: pointer; + } + } } } diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.ts index bbe376d74..8bb07975a 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.ts +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.ts @@ -214,31 +214,6 @@ export class ListViewTableComponent +
diff --git a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.scss b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.scss index 7caed3739..e69de29bb 100644 --- a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.scss +++ b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.scss @@ -1,3 +0,0 @@ -mat-card { - height: 100%; -} diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html index 483d891b2..af6030cb3 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html @@ -10,7 +10,7 @@
- + @@ -46,6 +46,7 @@

{{ 'Single votes' | translate }}

diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss index edc458269..de55c583a 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss @@ -13,6 +13,10 @@ display: block; height: 500px; + .list-view-frame { + height: 100%; + } + .single-vote-result + .single-vote-result { margin-top: 1em; } diff --git a/client/src/app/site/common/components/legal-notice/legal-notice.component.html b/client/src/app/site/common/components/legal-notice/legal-notice.component.html index 56136f488..988b3b1e1 100644 --- a/client/src/app/site/common/components/legal-notice/legal-notice.component.html +++ b/client/src/app/site/common/components/legal-notice/legal-notice.component.html @@ -54,7 +54,7 @@ - +

{{ 'Statistics' | translate }}

{{ 'Active users' | translate }}

diff --git a/client/src/app/site/common/components/start/start.component.html b/client/src/app/site/common/components/start/start.component.html index 87ac8e75b..ce3b12ee1 100644 --- a/client/src/app/site/common/components/start/start.component.html +++ b/client/src/app/site/common/components/start/start.component.html @@ -12,7 +12,7 @@
- +

{{ startContent.general_event_welcome_title | translate }}

diff --git a/client/src/app/site/common/components/user-statistics/user-statistics.component.html b/client/src/app/site/common/components/user-statistics/user-statistics.component.html index 8e1bb9888..05407f4ea 100644 --- a/client/src/app/site/common/components/user-statistics/user-statistics.component.html +++ b/client/src/app/site/common/components/user-statistics/user-statistics.component.html @@ -20,6 +20,7 @@
diff --git a/client/src/app/site/common/components/user-statistics/user-statistics.component.scss b/client/src/app/site/common/components/user-statistics/user-statistics.component.scss index 66eb4f9f5..3acc3c07a 100644 --- a/client/src/app/site/common/components/user-statistics/user-statistics.component.scss +++ b/client/src/app/site/common/components/user-statistics/user-statistics.component.scss @@ -17,9 +17,10 @@ } .user-statistics-table--virtual-scroll { + display: block; height: 500px; - .pbl-ngrid-header-cell:not(:first-child):before { - display: none; + .list-view-frame { + height: 100%; } } diff --git a/client/src/app/site/config/components/config-list/config-list.component.html b/client/src/app/site/config/components/config-list/config-list.component.html index ae68e53a1..970b7ac3b 100644 --- a/client/src/app/site/config/components/config-list/config-list.component.html +++ b/client/src/app/site/config/components/config-list/config-list.component.html @@ -22,7 +22,7 @@
- +

{{ subgroup.name | translate }}

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 ee93d1385..11ea0fa52 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 @@ -11,73 +11,75 @@
-
-
- + +
+
+ + + + + + + + +
+
- + + search - - - - +
-
- - - search - -
-
- - - - {{ 'Timestamp' | translate }} - {{ getTimestamp(history) }} - + + + + {{ 'Timestamp' | translate }} + {{ getTimestamp(history) }} + - - - {{ 'Element' | translate }} - -
{{ getElementInfo(history) | translate }}
-
- {{ 'No information available' | translate }} ({{ history.element_id }}) -
-
-
+ + + {{ 'Element' | translate }} + +
{{ getElementInfo(history) | translate }}
+
+ {{ 'No information available' | translate }} ({{ history.element_id }}) +
+
+
- - - {{ 'Comment' | translate }} - {{ parseInformation(history) }} - + + + {{ 'Comment' | translate }} + {{ parseInformation(history) }} + - - - {{ 'Changed by' | translate }} - {{ getUserName(history) }} - + + + {{ 'Changed by' | translate }} + {{ getUserName(history) }} + - - -
+ + +
- + + - - - - + + + + + + + {{ statuteParagraph.title }} + + + + {{ statuteParagraph.title }} + +
+
+
+ + + + +
+
+
diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.scss b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.scss index 542c10c78..fc96549ec 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.scss +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.scss @@ -1,16 +1,11 @@ -.head-spacer { - width: 100%; - height: 60px; - line-height: 60px; - text-align: right; - background: white; /* TODO: remove this and replace with theme */ - border-bottom: 1px solid rgba(0, 0, 0, 0.12); -} +.statute-vscroll-wrapper { + height: calc(100vh - 64px); -mat-card { - margin-bottom: 20px; + .mat-card { + margin-bottom: 20px; - mat-form-field { - width: 100%; + .mat-form-field { + width: 100%; + } } } diff --git a/client/src/app/site/polls/components/poll-progress/poll-progress.component.html b/client/src/app/site/polls/components/poll-progress/poll-progress.component.html index f8cffffd3..38d997f37 100644 --- a/client/src/app/site/polls/components/poll-progress/poll-progress.component.html +++ b/client/src/app/site/polls/components/poll-progress/poll-progress.component.html @@ -1,4 +1,6 @@ -
+out of poll +
+ in the poll
{{ votescast }} / {{ max }}
diff --git a/client/src/app/site/site.component.html b/client/src/app/site/site.component.html index 0fbd729b8..a44da9e74 100644 --- a/client/src/app/site/site.component.html +++ b/client/src/app/site/site.component.html @@ -95,9 +95,7 @@
- -
diff --git a/client/src/app/site/site.component.scss b/client/src/app/site/site.component.scss index 884823065..ee2df519d 100644 --- a/client/src/app/site/site.component.scss +++ b/client/src/app/site/site.component.scss @@ -122,12 +122,11 @@ mat-sidenav-container { position: relative; main { + position: absolute; display: flex; flex-direction: column; width: 100%; - position: relative; z-index: 50; - flex: 1; > *:not(router-outlet) { flex: 1; display: block; 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 66629bb1a..457527838 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 @@ -5,53 +5,54 @@
-
- {{ 'All your changes are saved immediately.' | translate }} -
+ +
+ {{ 'All your changes are saved immediately.' | translate }} +
+ + + + + {{ app.name | translate }} + + - - - - - {{ app.name | translate }} - - - -
- - - {{ 'Permissions' | translate }} - - {{ perm.display_name | translate }} - - - -
- - -
- {{ group.name | translate }} -
-
+
+
+ + {{ 'Permissions' | translate }} -
- - -
+ {{ perm.display_name | translate }}
- - - -
-
-
-
+
+ + +
+ {{ group.name | translate }} +
+
+ +
+ + +
+
+
+
+ + + + +
+ + +

diff --git a/client/src/app/site/users/components/group-list/group-list.component.scss b/client/src/app/site/users/components/group-list/group-list.component.scss index 0dcaee684..02ddd30ab 100644 --- a/client/src/app/site/users/components/group-list/group-list.component.scss +++ b/client/src/app/site/users/components/group-list/group-list.component.scss @@ -20,7 +20,7 @@ table { } .hint-text { - padding-top: 30px; + padding-top: 1em; padding-left: 25px; } diff --git a/client/src/styles.scss b/client/src/styles.scss index 887bbf083..476638e45 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -309,11 +309,6 @@ b, @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; -} - /* hide scrollbars caused by hidden filter dialog outside of the viewport */ .mat-drawer-content { overflow-x: hidden !important; @@ -447,6 +442,10 @@ button.mat-menu-item.selected { margin-bottom: 40px !important; } +.spacer-bottom-60 { + margin-bottom: 60px !important; +} + .spacer-left-10 { margin-left: 10px; } @@ -499,19 +498,6 @@ button.mat-menu-item.selected { } } -/** - * cdk-virtual-scroll-viewport requires a hight, otherwise it would always be 0 - * Depending in mobile-mode and desktop mode we need to subtract different values - * from 100vh - */ -.virtual-scroll-full-page { - height: calc(100vh - 64px); -} - -.virtual-scroll-with-head-bar { - height: calc(100vh - 129px); -} - /** css hacks https://codepen.io/edge0703/pen/iHJuA */ .innerTable { display: inline-block; @@ -519,12 +505,13 @@ button.mat-menu-item.selected { width: -webkit-fill-available; } -.ngrid-hide-head { - // For some reason, hiding the table header adds an empty meta bar. - .pbl-ngrid-container { - > div { - height: 0; - } +/** + * Compilcated ngrid hack: The meta row won't disappear (just like that) + * Select the first ever container pbl-ngrid-container div and hide + */ +.pbl-ngrid-container { + > div { + height: 0; } }