diff --git a/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html b/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html index 4ea08c0..4f6d898 100644 --- a/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html +++ b/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+
-
+
{{contact.firstName}} {{contact.lastName}}
diff --git a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html index d820f74..3bb9c7d 100644 --- a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html +++ b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html @@ -34,7 +34,7 @@
-
+
{{partner.name}} diff --git a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html index 2f00cd2..16bb119 100644 --- a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html +++ b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html @@ -7,52 +7,51 @@ [getDataFunction]="getData" [dataSource]="dataSource" > -
-
-
-
-

{{post.partnerName}}

+
+
+
+
+ {{ post.createdAt | date:'dd.MM.YYYY':'GMT+0000' }} +

{{post.partnerName}}

{{post.contactName}}

-

{{post.productName}}

-

{{ post.createdAt | date:'dd.MM.YYYY' }}

+

{{post.productName}}

{{ post.ownerName }}

-
-

{{ post.headline }}

+
+

{{ post.headline }}

+ +
+ + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} + + {{ 'basic.comment-it' | translate }} +
-
-
-
+
+

{{ comment.createdAt | date:'dd.MM.YYYY' }}

{{ comment.ownerName }}

-

+

- -
- - {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} - - {{ 'basic.comment-it' | translate }} -
diff --git a/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html b/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html index cbab62d..b0bdfeb 100644 --- a/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html +++ b/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html @@ -1,7 +1,7 @@
-
+

{{ product.name }}

{{ product.description }}

@@ -17,7 +17,7 @@
234856372
-
+
{{product.name}} diff --git a/matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.html b/matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.html index 002966d..e1b3dfe 100644 --- a/matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.html +++ b/matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.html @@ -1,7 +1,7 @@
-
+

{{'overview.sale-user' | translate }}: {{ sale.ownerName }}

{{'overview.partner' | translate}}:
diff --git a/matsen-tool/src/app/_views/sales/sales.component.html b/matsen-tool/src/app/_views/sales/sales.component.html index 3fdc1a8..dda75e0 100644 --- a/matsen-tool/src/app/_views/sales/sales.component.html +++ b/matsen-tool/src/app/_views/sales/sales.component.html @@ -2,6 +2,8 @@

{{ 'basic.sales' | translate }}

- - +
+ +
+
\ No newline at end of file diff --git a/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html b/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html index 53f81f3..6603832 100644 --- a/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html +++ b/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html @@ -1,59 +1,57 @@
-
-
- -
- -
-
-
-
-
- {{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }} -

{{task.partnerName}}

-

{{task.productName}}

-

Zugewiesen an: {{ task.assignedToName }}

-
-
- -

{{ task.headline }}

-

- -
- - {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} - - {{ 'basic.comment-it' | translate }} -
+
+ +
+ +
+
+
+
+
+ {{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }} +

{{task.partnerName}}

+

{{task.productName}}

+

{{ task.assignedToName }}

+
+
+ +

{{ task.headline }}

+

+ +
+ + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} + + {{ 'basic.comment-it' | translate }}
-
-
-
-
-

{{ taskNote.createdAt | date:'dd.MM.YYYY' }}

-

{{ taskNote.ownerName }}

-
-
-

{{ taskNote.message }}

-
- +
+
+
+
+
+

{{ taskNote.createdAt | date:'dd.MM.YYYY' }}

+

{{ taskNote.ownerName }}

+
+
+

+
- -
+
+
\ No newline at end of file diff --git a/matsen-tool/src/app/_views/tasks/tasks.component.html b/matsen-tool/src/app/_views/tasks/tasks.component.html index 15e5f03..01a8c3b 100644 --- a/matsen-tool/src/app/_views/tasks/tasks.component.html +++ b/matsen-tool/src/app/_views/tasks/tasks.component.html @@ -1,8 +1,6 @@
-
-
-

{{'basic.tasks' | translate}}

-
- +
+

{{'basic.tasks' | translate}}

+
\ No newline at end of file diff --git a/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html b/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html index 7a7fa43..077c03b 100644 --- a/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html +++ b/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html @@ -1,14 +1,14 @@
-
+
-
+

{{ user.firstName }} {{ user.lastName }}

-
Email:
-
{{ user.email }}
+
E-Mail Adresse:
+
{{ user.email }}
-
+
{{user.firstName}} {{user.lastName}} diff --git a/matsen-tool/src/assets/scss/_accordion.scss b/matsen-tool/src/assets/scss/_accordion.scss index 29dd87d..e69de29 100644 --- a/matsen-tool/src/assets/scss/_accordion.scss +++ b/matsen-tool/src/assets/scss/_accordion.scss @@ -1,6 +0,0 @@ -.spt-accordion { - .info { - right: 0; - top: 0; - } -} diff --git a/matsen-tool/src/assets/scss/_basics.scss b/matsen-tool/src/assets/scss/_basics.scss index e28688d..744a661 100644 --- a/matsen-tool/src/assets/scss/_basics.scss +++ b/matsen-tool/src/assets/scss/_basics.scss @@ -175,6 +175,13 @@ img { } } +.icon-mini { + height: 15px; + display: inline; + margin-right: 6px; + margin-top: -2px; +} + .spt-main { background: #fff; color: rgba(33,37,41); @@ -188,7 +195,7 @@ img { display: flex; justify-content: flex-end; } - .card:not(.contacts .card, .tasks .card) { + .card:not(.contacts .card, .tasks .card, .post .card) { border: none; border-radius: 0; border-top: 1px solid #2B3A44; @@ -225,11 +232,13 @@ img { } } +.posts .post, .tasks-box { border-top: 1px solid #525f66; padding-top: 3px; background: #fff; } +.posts .post, .tasks { .card { border: none; diff --git a/matsen-tool/src/assets/scss/_sales.scss b/matsen-tool/src/assets/scss/_sales.scss index 239dd31..7e0ee7f 100644 --- a/matsen-tool/src/assets/scss/_sales.scss +++ b/matsen-tool/src/assets/scss/_sales.scss @@ -1,27 +1,27 @@ .sales-summary-container { .sales-summary-bar { - border-radius: 6px; - background: #bbb; - margin: 0 0 0.5rem 0; + background: #f2f2f2; + color: #fff; div { animation: expand 2.5s ease; - border-radius: 6px; span { display: block; - border-radius: 6px; - padding: 15px; + padding: 10px 13px; white-space: nowrap; } } } .sales-summary-turnover { - background: rgb(45,209,159); - background: linear-gradient(109deg, rgba(45,209,159,1) 0%, rgba(64,208,203,1) 36%, rgba(44,138,181,1) 100%); + background: #2b3a44; + //background: rgb(45,209,159); + //background: linear-gradient(109deg, rgba(45,209,159,1) 0%, rgba(64,208,203,1) 36%, rgba(44,138,181,1) 100%); } .sales-summary-profit { - background: rgb(179,208,47); - background: linear-gradient(109deg, rgba(179,208,47,1) 0%, rgba(64,208,70,1) 36%, rgba(44,181,91,1) 100%); + background: #589476; + background: linear-gradient(109deg, #589476 0%, #a9ebaa 100%); + //background: rgb(179,208,47); + //background: linear-gradient(109deg, rgba(179,208,47,1) 0%, rgba(64,208,70,1) 36%, rgba(44,181,91,1) 100%); } } diff --git a/matsen-tool/src/assets/scss/_text.scss b/matsen-tool/src/assets/scss/_text.scss index 433cd2b..c4e7c26 100644 --- a/matsen-tool/src/assets/scss/_text.scss +++ b/matsen-tool/src/assets/scss/_text.scss @@ -1,3 +1,7 @@ +strong { + font-weight: 600; +} + .mat-h1, .mat-headline-5, .mat-typography .mat-h1, @@ -78,6 +82,7 @@ p, ul, ol, dl, +.post h3, .tasks h3 { a { color: $color-matsen;