From 8a6b4440033d7f1a214845ef0d357f760bd06f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Wed, 6 Nov 2024 16:19:57 +0100 Subject: [PATCH] styles file structure cleanup --- src/main/angular/src/app/app.component.less | 10 +- .../pages/group/group/group.component.html | 4 +- .../pages/group/group/group.component.less | 2 +- .../pages/group/groups/groups.component.less | 2 +- .../group-list/group-list.component.less | 2 +- .../app/pages/profile/profile.component.less | 2 + .../tools/numbers/numbers.component.less | 2 + .../solar-system-printout.component.less | 2 +- .../solar-system/solar-system.component.less | 2 +- .../voltage-drop/voltage-drop.component.less | 2 +- .../src/app/pages/user/user.component.less | 2 +- .../password-tile.component.less | 2 +- .../src/app/shared/text/text.component.less | 2 +- src/main/angular/src/styles.less | 93 +------------------ src/main/angular/src/styles/basic.less | 38 ++++++++ .../src/{common.less => styles/button.less} | 2 +- src/main/angular/src/{ => styles}/config.less | 0 src/main/angular/src/styles/tiles.less | 60 ++++++++++++ src/main/angular/src/styles/user.less | 9 ++ src/main/angular/src/user.less | 18 ---- 20 files changed, 128 insertions(+), 128 deletions(-) create mode 100644 src/main/angular/src/styles/basic.less rename src/main/angular/src/{common.less => styles/button.less} (97%) rename src/main/angular/src/{ => styles}/config.less (100%) create mode 100644 src/main/angular/src/styles/tiles.less create mode 100644 src/main/angular/src/styles/user.less delete mode 100644 src/main/angular/src/user.less diff --git a/src/main/angular/src/app/app.component.less b/src/main/angular/src/app/app.component.less index c78c511..524a784 100644 --- a/src/main/angular/src/app/app.component.less +++ b/src/main/angular/src/app/app.component.less @@ -1,4 +1,4 @@ -@import "../common.less"; +@import "../styles/config"; #mainMenu { border-bottom: 1px solid black; @@ -19,12 +19,4 @@ background-color: lightskyblue; } - .userHasPassword { - color: green; - } - - .userNoPassword { - color: indianred; - } - } diff --git a/src/main/angular/src/app/pages/group/group/group.component.html b/src/main/angular/src/app/pages/group/group/group.component.html index 2753fdf..02d7d01 100644 --- a/src/main/angular/src/app/pages/group/group/group.component.html +++ b/src/main/angular/src/app/pages/group/group/group.component.html @@ -49,7 +49,7 @@
- + @@ -77,7 +77,7 @@
{{ user.name }}
- + diff --git a/src/main/angular/src/app/pages/group/group/group.component.less b/src/main/angular/src/app/pages/group/group/group.component.less index 35ec75f..efd2f7c 100644 --- a/src/main/angular/src/app/pages/group/group/group.component.less +++ b/src/main/angular/src/app/pages/group/group/group.component.less @@ -1,4 +1,4 @@ -@import "../../../../common.less"; +@import "../../../../styles/config"; th { text-align: left; diff --git a/src/main/angular/src/app/pages/group/groups/groups.component.less b/src/main/angular/src/app/pages/group/groups/groups.component.less index 8feab9d..0f966d2 100644 --- a/src/main/angular/src/app/pages/group/groups/groups.component.less +++ b/src/main/angular/src/app/pages/group/groups/groups.component.less @@ -1 +1 @@ -@import "../../../../common.less"; +@import "../../../../styles/config"; diff --git a/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.less b/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.less index 45a2a40..52f693a 100644 --- a/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.less +++ b/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.less @@ -1,4 +1,4 @@ -@import "../../../../../common.less"; +@import "../../../../../styles/config"; td { border: 1px solid black; diff --git a/src/main/angular/src/app/pages/profile/profile.component.less b/src/main/angular/src/app/pages/profile/profile.component.less index 5ffa911..920690a 100644 --- a/src/main/angular/src/app/pages/profile/profile.component.less +++ b/src/main/angular/src/app/pages/profile/profile.component.less @@ -1,3 +1,5 @@ +@import "../../../styles/config"; + table { width: 100%; } diff --git a/src/main/angular/src/app/pages/tools/numbers/numbers.component.less b/src/main/angular/src/app/pages/tools/numbers/numbers.component.less index 7b8fa4c..96236d3 100644 --- a/src/main/angular/src/app/pages/tools/numbers/numbers.component.less +++ b/src/main/angular/src/app/pages/tools/numbers/numbers.component.less @@ -1,3 +1,5 @@ +@import "../../../../styles/config"; + .huge { font-size: 50vmin; white-space: nowrap; 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 4e59ed3..64ba7d1 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,4 +1,4 @@ -@import "../../../../../common.less"; +@import "../../../../../styles/config"; @page { size: A4; 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 25eb9c5..631ab53 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 "../../../../common.less"; +@import "../../../../styles/config"; .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 0baf273..c251192 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 "../../../../common.less"; +@import "../../../../styles/config"; #VoltageDropInputs { 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 6857e0d..ec48dbb 100644 --- a/src/main/angular/src/app/pages/user/user.component.less +++ b/src/main/angular/src/app/pages/user/user.component.less @@ -1 +1 @@ -@import "../../../common.less"; +@import "../../../styles/config"; diff --git a/src/main/angular/src/app/shared/password-tile/password-tile.component.less b/src/main/angular/src/app/shared/password-tile/password-tile.component.less index 66c29f3..ec48dbb 100644 --- a/src/main/angular/src/app/shared/password-tile/password-tile.component.less +++ b/src/main/angular/src/app/shared/password-tile/password-tile.component.less @@ -1 +1 @@ -@import "../../../common"; +@import "../../../styles/config"; 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 7522751..93d6a40 100644 --- a/src/main/angular/src/app/shared/text/text.component.less +++ b/src/main/angular/src/app/shared/text/text.component.less @@ -1,4 +1,4 @@ -@import "../../../common.less"; +@import "../../../styles/config"; .unsaved { background-color: yellow; diff --git a/src/main/angular/src/styles.less b/src/main/angular/src/styles.less index 4c67da1..1ef3f30 100644 --- a/src/main/angular/src/styles.less +++ b/src/main/angular/src/styles.less @@ -1,89 +1,4 @@ -@import "./common.less"; - -body { - font-family: sans-serif; - font-size: 4vw; - margin: 0; -} - -div { - box-sizing: border-box; - overflow: hidden; -} - -a { - text-decoration: none; -} - -input { - all: unset; - background-color: white; - border: 1px solid lightgray; -} - -select { - font-size: inherit; -} - -table { - border-collapse: collapse; -} - -.tileContainer { - padding: @halfSpace; - - .tile { - width: 100%; - padding: @halfSpace; - - .tileInner { - border: 1px solid #ddd; - border-radius: @space; - background-color: #fbfbfb; - - .tileTitle { - font-weight: bold; - padding: @halfSpace @space; - background-color: lightskyblue; - } - - .tileContent { - padding: @halfSpace; - - table { - width: 100%; - } - - td { - white-space: nowrap; - border: 0.2em solid white; - } - - } - - .tileFooter { - padding: @halfSpace @space; - } - - } - - } - -} - -@media (min-width: 1000px) { - - body { - font-size: 18px; - } - - .tileContainer { - - .tile { - float: left; - width: 500px; - } - - } - -} +@import "./styles/basic"; +@import "./styles/tiles"; +@import "./styles/button"; +@import "./styles/user"; diff --git a/src/main/angular/src/styles/basic.less b/src/main/angular/src/styles/basic.less new file mode 100644 index 0000000..93376f8 --- /dev/null +++ b/src/main/angular/src/styles/basic.less @@ -0,0 +1,38 @@ +@import "./config"; + +body { + font-family: sans-serif; + font-size: 4vw; + margin: 0; +} + +div { + box-sizing: border-box; + overflow: hidden; +} + +a { + text-decoration: none; +} + +input { + all: unset; + background-color: white; + border: 1px solid lightgray; +} + +select { + font-size: inherit; +} + +table { + border-collapse: collapse; +} + +@media (min-width: 1000px) { + + body { + font-size: 18px; + } + +} diff --git a/src/main/angular/src/common.less b/src/main/angular/src/styles/button.less similarity index 97% rename from src/main/angular/src/common.less rename to src/main/angular/src/styles/button.less index d00bede..341780b 100644 --- a/src/main/angular/src/common.less +++ b/src/main/angular/src/styles/button.less @@ -1,4 +1,4 @@ -@import "./user.less"; +@import "./config"; .buttons { margin-bottom: @halfSpace; diff --git a/src/main/angular/src/config.less b/src/main/angular/src/styles/config.less similarity index 100% rename from src/main/angular/src/config.less rename to src/main/angular/src/styles/config.less diff --git a/src/main/angular/src/styles/tiles.less b/src/main/angular/src/styles/tiles.less new file mode 100644 index 0000000..65bf947 --- /dev/null +++ b/src/main/angular/src/styles/tiles.less @@ -0,0 +1,60 @@ +@import "./config"; + +.tileContainer { + padding: @halfSpace; + + .tile { + width: 100%; + padding: @halfSpace; + + .tileInner { + border: 1px solid #ddd; + border-radius: @space; + background-color: #fbfbfb; + + .tileTitle { + font-weight: bold; + padding: @halfSpace @space; + background-color: lightskyblue; + } + + .tileContent { + padding: @halfSpace; + + table { + width: 100%; + } + + td { + white-space: nowrap; + border: 0.2em solid white; + } + + } + + .tileFooter { + padding: @halfSpace @space; + } + + } + + } + +} + +@media (min-width: 1000px) { + + body { + font-size: 18px; + } + + .tileContainer { + + .tile { + float: left; + width: 500px; + } + + } + +} diff --git a/src/main/angular/src/styles/user.less b/src/main/angular/src/styles/user.less new file mode 100644 index 0000000..26793eb --- /dev/null +++ b/src/main/angular/src/styles/user.less @@ -0,0 +1,9 @@ +@import "./config"; + +.userHasPassword { + color: green; +} + +.userNoPassword { + color: indianred; +} diff --git a/src/main/angular/src/user.less b/src/main/angular/src/user.less deleted file mode 100644 index 2e466f1..0000000 --- a/src/main/angular/src/user.less +++ /dev/null @@ -1,18 +0,0 @@ -@import "./config.less"; - -.user { - float: left; - padding: @halfSpace; - background-color: lightskyblue; - border-radius: @halfSpace; - margin-right: @halfSpace; - margin-bottom: @halfSpace; -} - -.user_owner { - border: 1px solid black; -} - -.user:hover { - background-color: dodgerblue; -}
{{ user.name }}