From 05d8ba81177622c0e82849f12b60064896bbda76 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Fri, 22 Aug 2025 12:52:30 +0200 Subject: [PATCH] csc multiple selectors --- .../filters/filters-group/filters-group.html | 9 ++-- .../filters/filters-group/filters-group.scss | 6 +++ .../inputs/multi-selector/multi-selector.html | 4 +- .../inputs/multi-selector/multi-selector.ts | 3 +- sae-csc/src/app/app.routes.ts | 16 +++++- sae-csc/src/app/pages/login/login.html | 11 ++-- sae-csc/src/app/pages/login/login.scss | 3 +- sae-csc/src/app/pages/login/login.ts | 4 +- sae-csc/src/app/pages/main/main.html | 5 +- sae-csc/src/app/pages/main/main.scss | 3 +- .../bottom-navigation/bottom-navigation.html | 7 +++ .../bottom-navigation/bottom-navigation.scss | 50 ++++++++++++++++--- .../src/styles/app/styles/pages/_main.scss | 44 ---------------- 13 files changed, 96 insertions(+), 69 deletions(-) diff --git a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.html b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.html index 4cf882f..b47a1bc 100644 --- a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.html +++ b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.html @@ -1,8 +1,11 @@
- - - + + + + + +
diff --git a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss index 51ee03e..f5f37ac 100644 --- a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss +++ b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss @@ -1,5 +1,11 @@ @use '../../src/styles/variables'; +.selectors { + display: flex; + flex-direction: row; + gap: 10px; +} + .dropdown { .dropdown-button { padding: 10px; diff --git a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.html b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.html index 1329a80..bee9fae 100644 --- a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.html +++ b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.html @@ -1,8 +1,8 @@
- - +
{{ label }}
+
- +
diff --git a/sae-csc/src/app/pages/login/login.scss b/sae-csc/src/app/pages/login/login.scss index b43cfe3..0d0514a 100644 --- a/sae-csc/src/app/pages/login/login.scss +++ b/sae-csc/src/app/pages/login/login.scss @@ -25,7 +25,6 @@ margin-bottom: 40px; a { - color: var(--Dark-brand-primary-400, #337DC3); /* Body/Body 4/Sb */ font-family: Barlow; @@ -36,6 +35,8 @@ &:hover { color: white; } + + text-decoration: none; } } diff --git a/sae-csc/src/app/pages/login/login.ts b/sae-csc/src/app/pages/login/login.ts index 9a422e2..8eed97a 100644 --- a/sae-csc/src/app/pages/login/login.ts +++ b/sae-csc/src/app/pages/login/login.ts @@ -1,10 +1,10 @@ import {Component} from '@angular/core'; -import {LoginForm} from 'sae-lib/forms/login-form/login-form'; +import {RouterLink} from '@angular/router'; @Component({ selector: 'app-login', imports: [ - LoginForm + RouterLink ], templateUrl: './login.html', styleUrl: './login.scss' diff --git a/sae-csc/src/app/pages/main/main.html b/sae-csc/src/app/pages/main/main.html index 1d6d35a..4fcb30e 100644 --- a/sae-csc/src/app/pages/main/main.html +++ b/sae-csc/src/app/pages/main/main.html @@ -32,7 +32,10 @@ - +
+ + +