diff --git a/src/main/angular/src/app/app.component.less b/src/main/angular/src/app/app.component.less index aca454c..fe1e589 100644 --- a/src/main/angular/src/app/app.component.less +++ b/src/main/angular/src/app/app.component.less @@ -1,3 +1,5 @@ +@import "../common.less"; + #mainMenu { border-bottom: 1px solid black; diff --git a/src/main/angular/src/app/pages/tools/numbers/numbers-common.less b/src/main/angular/src/app/pages/tools/numbers/numbers-common.less deleted file mode 100644 index 6a4f2ac..0000000 --- a/src/main/angular/src/app/pages/tools/numbers/numbers-common.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../../../tile.less"; -@import "../../user/user.less"; diff --git a/src/main/angular/src/app/pages/tools/numbers/overview/numbers-overview.component.less b/src/main/angular/src/app/pages/tools/numbers/overview/numbers-overview.component.less index 239147d..103e68d 100644 --- a/src/main/angular/src/app/pages/tools/numbers/overview/numbers-overview.component.less +++ b/src/main/angular/src/app/pages/tools/numbers/overview/numbers-overview.component.less @@ -1 +1 @@ -@import "../numbers-common.less"; +@import "../../../../../common.less"; diff --git a/src/main/angular/src/app/pages/tools/numbers/session/numbers-session.component.less b/src/main/angular/src/app/pages/tools/numbers/session/numbers-session.component.less index 239147d..103e68d 100644 --- a/src/main/angular/src/app/pages/tools/numbers/session/numbers-session.component.less +++ b/src/main/angular/src/app/pages/tools/numbers/session/numbers-session.component.less @@ -1 +1 @@ -@import "../numbers-common.less"; +@import "../../../../../common.less"; diff --git a/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.html b/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.html index 8241a78..af9b72f 100644 --- a/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.html +++ b/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.html @@ -1,20 +1,10 @@ - - - - - - - - + +
Typ TitelBesitzerErstellt Teilnehmer
{{ session.typeDisplayName }}{{ session.title }}{{ session.owner.name }}{{ session.created | date:'yyyy-MM-dd hh:mm' }} -
- {{ user.name }} -
-
{{ session.title }}{{ session.users.length }}
diff --git a/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.less b/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.less index 38e483e..35cdf89 100644 --- a/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.less +++ b/src/main/angular/src/app/pages/tools/numbers/shared/session-list/session-list.component.less @@ -1 +1,13 @@ -@import "../../numbers-common.less"; +@import "../../../../../../common.less"; + +td { + border: 1px solid black; +} + +.title { + +} + +.users { + text-align: center; +} diff --git a/src/main/angular/src/app/pages/tools/solar-system/printout/solar-system-printout.component.less b/src/main/angular/src/app/pages/tools/solar-system/printout/solar-system-printout.component.less index 1ea715b..4e59ed3 100644 --- a/src/main/angular/src/app/pages/tools/solar-system/printout/solar-system-printout.component.less +++ b/src/main/angular/src/app/pages/tools/solar-system/printout/solar-system-printout.component.less @@ -1,3 +1,5 @@ +@import "../../../../../common.less"; + @page { size: A4; margin: 10mm; diff --git a/src/main/angular/src/app/pages/tools/solar-system/solar-system.component.less b/src/main/angular/src/app/pages/tools/solar-system/solar-system.component.less index e7d506a..25eb9c5 100644 --- a/src/main/angular/src/app/pages/tools/solar-system/solar-system.component.less +++ b/src/main/angular/src/app/pages/tools/solar-system/solar-system.component.less @@ -1,4 +1,4 @@ -@import "../../../../tile.less"; +@import "../../../../common.less"; .name { text-align: left; diff --git a/src/main/angular/src/app/pages/tools/voltage-drop/voltage-drop.component.less b/src/main/angular/src/app/pages/tools/voltage-drop/voltage-drop.component.less index 4642f39..0baf273 100644 --- a/src/main/angular/src/app/pages/tools/voltage-drop/voltage-drop.component.less +++ b/src/main/angular/src/app/pages/tools/voltage-drop/voltage-drop.component.less @@ -1,4 +1,4 @@ -@import "../../../../tile.less"; +@import "../../../../common.less"; #VoltageDropInputs { diff --git a/src/main/angular/src/app/pages/user/user.component.html b/src/main/angular/src/app/pages/user/user.component.html index ea4435c..84dc523 100644 --- a/src/main/angular/src/app/pages/user/user.component.html +++ b/src/main/angular/src/app/pages/user/user.component.html @@ -1,4 +1,6 @@

Benutzer: {{ user.name }}

+ +

Gemeinsame Sitzungen

diff --git a/src/main/angular/src/app/pages/user/user.component.less b/src/main/angular/src/app/pages/user/user.component.less index e69de29..6857e0d 100644 --- a/src/main/angular/src/app/pages/user/user.component.less +++ b/src/main/angular/src/app/pages/user/user.component.less @@ -0,0 +1 @@ +@import "../../../common.less"; diff --git a/src/main/angular/src/app/shared/text/text.component.less b/src/main/angular/src/app/shared/text/text.component.less index e69de29..6857e0d 100644 --- a/src/main/angular/src/app/shared/text/text.component.less +++ b/src/main/angular/src/app/shared/text/text.component.less @@ -0,0 +1 @@ +@import "../../../common.less"; diff --git a/src/main/angular/src/common.less b/src/main/angular/src/common.less new file mode 100644 index 0000000..f29d435 --- /dev/null +++ b/src/main/angular/src/common.less @@ -0,0 +1,2 @@ +@import "./tile.less"; +@import "./user.less"; diff --git a/src/main/angular/src/styles.less b/src/main/angular/src/styles.less index 603a0a1..4ecb2e4 100644 --- a/src/main/angular/src/styles.less +++ b/src/main/angular/src/styles.less @@ -1,3 +1,5 @@ +@import "./common.less"; + body { font-family: sans-serif; font-size: 4vw; diff --git a/src/main/angular/src/tile.less b/src/main/angular/src/tile.less index e6f6785..c9d7fd8 100644 --- a/src/main/angular/src/tile.less +++ b/src/main/angular/src/tile.less @@ -1,4 +1,4 @@ -@import "config.less"; +@import "./config.less"; .tileContainer { padding: @halfSpace; diff --git a/src/main/angular/src/app/pages/user/user.less b/src/main/angular/src/user.less similarity index 86% rename from src/main/angular/src/app/pages/user/user.less rename to src/main/angular/src/user.less index 06d2f81..a68df4f 100644 --- a/src/main/angular/src/app/pages/user/user.less +++ b/src/main/angular/src/user.less @@ -1,3 +1,5 @@ +@import "./config.less"; + .user { float: left; padding: @halfSpace;