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 98c76224e..d4654b1a6 100644 --- a/client/src/app/site/common/components/start/start.component.html +++ b/client/src/app/site/common/components/start/start.component.html @@ -9,8 +9,6 @@

{{welcomeTitle | translate}}

{{welcomeText | translate}} - -
diff --git a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html index 82f8caffa..66d63cbeb 100644 --- a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html +++ b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html @@ -143,7 +143,7 @@
-

Identifier

+

Identifier

{{ motion.identifier }}
@@ -152,15 +152,15 @@
-
-
+
+
+ [multiple]="true" listname="{{ 'Submitters' | translate }}" [InputListValues]="this.submitterObserver">
-
-

Submitters

+
+

Submitters

{{ submitter.full_name }} @@ -177,7 +177,7 @@
-

Supporters

+

Supporters

  • {{ supporter.full_name }}
@@ -188,7 +188,7 @@
-

State

+

State

{{ motion.state }}
@@ -226,7 +226,7 @@
-

Category

+

Category

{{ motion.category }}
@@ -238,7 +238,7 @@
-

Origin

+

Origin

{{ motion.origin }}
@@ -250,7 +250,7 @@ @@ -259,7 +259,7 @@
-
+
diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.html b/client/src/app/site/motions/components/motion-list/motion-list.component.html index a8a417caf..36a20ecfe 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.html +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.html @@ -51,9 +51,12 @@ State -
+ + + {{ motion.state }} + diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.scss b/client/src/app/site/motions/components/motion-list/motion-list.component.scss index 39b83d56e..ebdc94b63 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.scss +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.scss @@ -9,8 +9,7 @@ /** identifier */ .mat-column-identifier { padding-left: 10px; - padding-right: 30px; - flex: 0 0 40px; + flex: 0 0 50px; line-height: 60px; // set the text in the vertical middle, since vertical-align will not work display: initial; // reset display text-align: center; // center text @@ -35,8 +34,8 @@ /** State */ .mat-column-state { - flex: 0 0 30px; - text-align: center; + flex: 0 0 160px; + justify-content:flex-end !important; mat-icon { font-size: 150%; diff --git a/client/src/app/site/site.component.scss b/client/src/app/site/site.component.scss index c71b781e8..248309967 100644 --- a/client/src/app/site/site.component.scss +++ b/client/src/app/site/site.component.scss @@ -5,17 +5,26 @@ } .os-logo-container { - min-width: 240px; + width: 200px; + margin-left: 10px; background-image: url(/assets/img/openslides-logo-h-dark-transparent.svg); background-size: contain; background-repeat: no-repeat; background-position: center; cursor: pointer; } +.os-logo-container:focus, +.os-logo-container:active, +.os-logo-container:hover, + { + border: none; + outline: none; +} .side-panel { border: 0; box-shadow: 3px 0px 10px 0px rgba(0, 0, 0, 0.2); + width: 260px; } .content { diff --git a/client/src/app/site/site.component.scss-theme.scss b/client/src/app/site/site.component.scss-theme.scss index 4f3914b20..18fc14d15 100644 --- a/client/src/app/site/site.component.scss-theme.scss +++ b/client/src/app/site/site.component.scss-theme.scss @@ -60,6 +60,9 @@ color: mat-color($background, raised-button); } + .mat-expansion-panel-header { + padding: 0 16px !important; + } .mat-expansion-panel-header:hover { // prevent the panel to become white after collapse background: mat-color($primary, darker) !important; diff --git a/client/src/app/site/site.component.ts b/client/src/app/site/site.component.ts index 9081b8f79..81b7e1102 100644 --- a/client/src/app/site/site.component.ts +++ b/client/src/app/site/site.component.ts @@ -67,7 +67,7 @@ export class SiteComponent extends BaseComponent implements OnInit { this.operator.getObservable().subscribe(user => { if (user) { - this.username = user.full_name; + this.username = user.short_name; } else { this.username = translate.instant('Guest'); } diff --git a/client/src/styles.scss b/client/src/styles.scss index 663cd61ad..3de1ff584 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -23,11 +23,15 @@ mat-icon { h1, h2, -h3, -h4, -h5 { +h3 { font-family: Roboto-condensed, Arial, Helvetica, sans-serif; } +h4 { + font-weight: 400; + font-size: 12px; + color: rgba(0, 0, 0, 0.54); + margin-bottom: 5px; +} body { // background: #e8eaed; @@ -142,3 +146,7 @@ footer { mat-expansion-panel { border-radius: 0 !important; } + +mat-panel-title mat-icon { + padding-right: 30px; +}