From f2e470a56334131637ee9e2c260466f7aae01205 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Wed, 13 Dec 2023 16:28:14 +0000
Subject: [PATCH] chore(ui): remove duplicate colors & unused css
---
.../result-list/result-list.component.scss | 4 -
.../footer-form/footer-form.component.scss | 21 ----
.../form/form-view/form-view.component.scss | 1 -
.../profile-employer-selection.component.html | 2 +-
.../profile-employer-selection.component.scss | 67 ----------
.../profile-structure-choice.component.html | 14 +--
.../profile-structure-choice.component.scss | 20 ++-
.../structure-orientator.component.scss | 1 -
.../make-appointment.component.scss | 2 -
.../mediation-hours-selection.component.scss | 1 -
src/app/login/login.component.scss | 2 -
src/app/map/components/map.component.scss | 3 +-
src/app/profile/edit/edit.component.scss | 3 +-
.../personal-offer-edition.component.scss | 3 +-
.../profile-structure.component.scss | 5 -
src/app/profile/profile.component.scss | 1 -
.../reset-password.component.scss | 1 -
.../data-share-consent.component.html | 117 ++++++++----------
.../data-share-consent.component.scss | 16 +--
.../more-filters/more-filters.component.scss | 1 -
.../structure-details.component.scss | 1 -
21 files changed, 72 insertions(+), 214 deletions(-)
diff --git a/src/app/annuaire/result-list/result-list.component.scss b/src/app/annuaire/result-list/result-list.component.scss
index 28878a395..94d2536af 100644
--- a/src/app/annuaire/result-list/result-list.component.scss
+++ b/src/app/annuaire/result-list/result-list.component.scss
@@ -27,8 +27,6 @@
h2 {
@include font-bold-18;
- color: $grey-1;
- text-transform: uppercase;
}
.userNumber {
@@ -102,7 +100,6 @@
.noResult {
@include font-bold-16;
- color: $grey-1;
}
.filtersInfo {
@include font-regular-14;
@@ -139,7 +136,6 @@
}
.count {
@include font-bold-24;
- color: $grey-1;
margin: 1.5rem 0;
}
.access {
diff --git a/src/app/form/footer-form/footer-form.component.scss b/src/app/form/footer-form/footer-form.component.scss
index 69c593dbe..be7b0a981 100644
--- a/src/app/form/footer-form/footer-form.component.scss
+++ b/src/app/form/footer-form/footer-form.component.scss
@@ -11,27 +11,6 @@
border-top: 1px solid $grey-7;
}
-.btn-primary {
- &.previous {
- background-color: $white;
- color: $grey-1;
- border: 1px solid $grey-1;
- }
- &.invalid {
- opacity: 0.4;
- }
-
- &:focus .print {
- background-color: $primary-color;
- }
-
- &.next {
- .rowBtn {
- margin-left: 24px;
- }
- }
-}
-
.print {
stroke: $white;
width: 20px;
diff --git a/src/app/form/form-view/form-view.component.scss b/src/app/form/form-view/form-view.component.scss
index df9690e8f..fd2ccd90e 100644
--- a/src/app/form/form-view/form-view.component.scss
+++ b/src/app/form/form-view/form-view.component.scss
@@ -21,7 +21,6 @@
height: 100%;
margin: 0 auto;
overflow-y: auto;
- color: $grey-1;
padding: 32px 48px;
display: flex;
justify-content: center;
diff --git a/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.html b/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.html
index ab0f71c51..eb90eef72 100644
--- a/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.html
+++ b/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.html
@@ -4,7 +4,7 @@
<p>L’employeur demandé est celui qui figure sur votre fiche de paie (ou fiche de poste)</p>
</div>
<div class="search-structure">
- <div fxLayout="column" fxLayoutAlign="space-between" class="form-group search">
+ <div fxLayout="column" fxLayoutAlign="space-between" class="search">
<label for="employer">Employeur</label>
<div fxLayout="row" fxLayoutGap="13px">
<input
diff --git a/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.scss b/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.scss
index cd3f304b5..07100a183 100644
--- a/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.scss
+++ b/src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.scss
@@ -11,39 +11,6 @@
width: 380px;
border-radius: 20px;
margin: 4px 0px;
-
- .search-input {
- height: 34px;
- border: 0px;
- @include font-regular-15;
- font-style: italic;
- padding: 0px;
- margin: 0px 0px 0px 5px;
- }
-}
-
-::ng-deep .searchIcon {
- padding-right: 12px;
-}
-
-.nb {
- padding: 0px 0px 0px 16px;
- margin: 16px 0px;
-}
-
-.nb-text {
- @include font-regular-13;
- color: $grey-3;
-}
-
-.structure-list {
- margin: 16px 0px;
-}
-
-.filet {
- border-width: 0px 0px 1px 0px;
- border-style: solid;
- border-color: $grey-9;
}
.form-list {
@@ -66,40 +33,6 @@
}
}
-.item-frame {
- padding: 0px 0px 0px 16px;
-}
-
-.name {
- @include font-regular-16;
- font-weight: 600;
- color: $grey-1;
-}
-
-.commune {
- @include font-regular-13;
- font-style: italic;
- color: $grey-3;
- margin: 6px 0px;
-}
-
-.create-text {
- @include font-regular-15;
- color: $grey-1;
- margin: 8px 0px;
-}
-
-.form-icon {
- margin: 0px 24px;
-}
-
-.search-bar {
- display: flex;
- flex-direction: column;
- * {
- width: 400px;
- }
-}
.autocomplete-items {
width: 296px;
}
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
index f9b4776c0..e36acceeb 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
@@ -12,14 +12,12 @@
</div>
<div class="scroll">
<div *ngIf="!isAlreadySearching">
- <div class="nb">
- <div *ngIf="structures">
- <div *ngIf="searchString.length === 0" class="nb-text">{{ structures.length }} structures existantes</div>
- <div *ngIf="searchString.length > 0" class="nb-text" [ngPlural]="structures.length">
- <ng-template ngPluralCase="0">0 structure trouvée</ng-template>
- <ng-template ngPluralCase="1">1 structure trouvée</ng-template>
- <ng-template ngPluralCase="other">{{ structures.length }} structures trouvées</ng-template>
- </div>
+ <div *ngIf="structures" class="nb">
+ <div *ngIf="searchString.length === 0" class="nb-text">{{ structures.length }} structures existantes</div>
+ <div *ngIf="searchString.length > 0" class="nb-text" [ngPlural]="structures.length">
+ <ng-template ngPluralCase="0">0 structure trouvée</ng-template>
+ <ng-template ngPluralCase="1">1 structure trouvée</ng-template>
+ <ng-template ngPluralCase="other">{{ structures.length }} structures trouvées</ng-template>
</div>
</div>
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
index c0828e6ec..3f30f02c4 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
@@ -30,16 +30,14 @@
overflow-y: scroll;
border: 1px solid $grey-6;
margin: 16px 0px 0px 0px;
-}
-
-.nb {
- padding: 0px 0px 0px 16px;
- margin: 16px 0px;
-}
-
-.nb-text {
- @include font-regular-13;
- color: $grey-3;
+ .nb {
+ padding: 0px 0px 0px 16px;
+ margin: 16px 0px;
+ .nb-text {
+ @include font-regular-13;
+ color: $grey-3;
+ }
+ }
}
.structure-list {
@@ -99,7 +97,6 @@
.name {
@include font-regular-16;
font-weight: 600;
- color: $grey-1;
}
.commune {
@@ -111,7 +108,6 @@
.create-text {
@include font-regular-14;
- color: $grey-1;
margin: 8px 0px;
.question {
font-weight: bold;
diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
index aba69feeb..6bfd7b13e 100644
--- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
+++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
@@ -37,7 +37,6 @@
.name {
@include font-regular-16;
font-weight: 600;
- color: $grey-1;
}
.commune {
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
index 536e12941..4fb165b17 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
@@ -22,7 +22,6 @@
}
.headerName {
@include font-bold-18;
- color: $grey-1;
width: 100%;
}
}
@@ -54,7 +53,6 @@
}
.selectListName {
@include font-bold-18;
- color: $grey-1;
width: 100%;
}
h4 {
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
index 759b292ee..c71cef871 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
@@ -38,7 +38,6 @@
text-align: center;
border: 1px solid $grey-1;
border-radius: 4px;
- color: $grey-1;
@include font-regular-14;
margin: auto;
background: $white;
diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss
index 7ad560f20..ead04c857 100644
--- a/src/app/login/login.component.scss
+++ b/src/app/login/login.component.scss
@@ -22,7 +22,6 @@
width: 100%;
max-width: 980px;
box-sizing: border-box;
- color: $grey-1;
background: $white;
border-radius: 8px;
border: 1px solid $grey-6;
@@ -68,7 +67,6 @@
label {
margin-bottom: 4px;
@include font-regular-16;
- color: $grey-1;
}
input {
width: 100%;
diff --git a/src/app/map/components/map.component.scss b/src/app/map/components/map.component.scss
index 9dc332e85..768caf636 100644
--- a/src/app/map/components/map.component.scss
+++ b/src/app/map/components/map.component.scss
@@ -37,7 +37,8 @@
::ng-deep .leaflet-control-zoom {
a {
color: $grey-1;
- opacity: 0.55;
+ text-decoration: none;
+ opacity: 0.75;
&:hover {
opacity: 1;
}
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 304e81963..910d60baf 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -66,7 +66,6 @@
}
.tab {
- color: $grey-1;
padding-bottom: 1rem;
justify-content: center;
display: flex;
@@ -75,7 +74,7 @@
cursor: pointer;
}
&.selected {
- color: $grey-1;
+ font-weight: bold;
border-bottom: 2px solid $grey-1;
}
}
diff --git a/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss b/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
index 3ae7ab18e..be5e66979 100644
--- a/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
+++ b/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
@@ -74,7 +74,6 @@
}
.tab {
- color: $grey-1;
padding-bottom: 1rem;
justify-content: center;
display: flex;
@@ -83,7 +82,7 @@
cursor: pointer;
}
&.selected {
- color: $grey-1;
+ font-weight: bold;
border-bottom: 2px solid $grey-1;
}
}
diff --git a/src/app/profile/profile-structure/profile-structure.component.scss b/src/app/profile/profile-structure/profile-structure.component.scss
index 74bcd23ed..c04e7bc82 100644
--- a/src/app/profile/profile-structure/profile-structure.component.scss
+++ b/src/app/profile/profile-structure/profile-structure.component.scss
@@ -63,7 +63,6 @@
align-items: center;
.sectionTitle {
@include font-bold-18;
- color: $grey-1;
}
.sectionButtons {
display: flex;
@@ -77,10 +76,6 @@
display: flex;
flex-direction: column;
gap: 8px;
- .email {
- text-decoration: underline;
- color: $grey-1;
- }
}
&.members {
diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss
index c3a08de0f..c19db6a4d 100644
--- a/src/app/profile/profile.component.scss
+++ b/src/app/profile/profile.component.scss
@@ -91,7 +91,6 @@ section {
display: flex;
flex-direction: column;
gap: 8px;
- color: $grey-1;
@include font-regular-14;
.row {
diff --git a/src/app/reset-password/reset-password.component.scss b/src/app/reset-password/reset-password.component.scss
index 246725c5d..5d883e7a5 100644
--- a/src/app/reset-password/reset-password.component.scss
+++ b/src/app/reset-password/reset-password.component.scss
@@ -12,7 +12,6 @@
min-height: 450px;
max-height: 75vh;
overflow-y: auto;
- color: $grey-1;
background: $white;
border-radius: 8px;
border: 1px solid $grey-6;
diff --git a/src/app/shared/components/data-share-consent/data-share-consent.component.html b/src/app/shared/components/data-share-consent/data-share-consent.component.html
index 75ea24099..5475a4c27 100644
--- a/src/app/shared/components/data-share-consent/data-share-consent.component.html
+++ b/src/app/shared/components/data-share-consent/data-share-consent.component.html
@@ -5,75 +5,60 @@
[validateDisabled]="!isPageValid"
(closed)="onSubmit()"
>
- <div class="form">
- <h1>
- Acceptez-vous que les informations de vos structures soient mises à disposition sur la plateforme
- data.grandlyon.com<sup>1</sup> ?
- </h1>
+ <h1>
+ Acceptez-vous que les informations de vos structures soient mises à disposition sur la plateforme
+ data.grandlyon.com<sup>1</sup> ?
+ </h1>
- <form class="dataShareConsent" [formGroup]="consentForm">
- <div *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" class="formGroup inline">
- Toutes les structures
- <div class="buttons">
- <app-radio-option
- [id]="'allYes'"
- [label]="'Oui'"
- [value]="true"
- [selected]="allSelected === true"
- (click)="onRadioBtnChangeAll(true)"
- />
- <app-radio-option
- [id]="'allNo'"
- [label]="'Non'"
- [value]="false"
- [selected]="allSelected === false"
- (click)="onRadioBtnChangeAll(false)"
- />
- </div>
+ <form class="dataShareConsent" [formGroup]="consentForm">
+ <div *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" class="formGroup inline">
+ Toutes les structures
+ <div class="buttons">
+ <app-radio-option
+ [id]="'allYes'"
+ [label]="'Oui'"
+ [value]="true"
+ [selected]="allSelected === true"
+ (click)="onRadioBtnChangeAll(true)"
+ />
+ <app-radio-option
+ [id]="'allNo'"
+ [label]="'Non'"
+ [value]="false"
+ [selected]="allSelected === false"
+ (click)="onRadioBtnChangeAll(false)"
+ />
</div>
- <hr *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" />
+ </div>
+ <hr *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" />
- <div *ngFor="let structure of dataConsentPendingStructures" class="formGroup inline">
- {{ structure.structureName }}
- <div class="buttons">
- <app-radio-option
- [id]="structure._id"
- [label]="'Oui'"
- [value]="true"
- [selected]="processDataShareConsentDate(structure) === true"
- (click)="onRadioBtnChangeStructure(structure._id, true)"
- />
- <app-radio-option
- [id]="structure._id"
- [label]="'Non'"
- [value]="false"
- [selected]="processDataShareConsentDate(structure) === false"
- (click)="onRadioBtnChangeStructure(structure._id, false)"
- />
- </div>
+ <div *ngFor="let structure of dataConsentPendingStructures" class="formGroup inline">
+ {{ structure.structureName }}
+ <div class="buttons">
+ <app-radio-option
+ [id]="structure._id"
+ [label]="'Oui'"
+ [value]="true"
+ [selected]="processDataShareConsentDate(structure) === true"
+ (click)="onRadioBtnChangeStructure(structure._id, true)"
+ />
+ <app-radio-option
+ [id]="structure._id"
+ [label]="'Non'"
+ [value]="false"
+ [selected]="processDataShareConsentDate(structure) === false"
+ (click)="onRadioBtnChangeStructure(structure._id, false)"
+ />
</div>
+ </div>
- <p class="informationEndForm">
- <span class="asterisk">*</span> La Métropole de Lyon, engagée pour la transparence de l’action publique et la
- valorisation de ses partenaires, encourage l’ouverture des données. Les données de votre structure seront
- publiées sur la plateforme
- <a href="https://data.grandlyon.com/" target="_blank">https://data.grandlyon.com/</a> sous la licence ouverte
- (open data) et seront donc librement accessibles et réutilisables. Vous pourrez modifier votre choix à tout
- moment, exercer vos droits d’accès et de modification, en le signifiant, par tout moyen à votre convenance,
- auprès de vos interlocuteurs de la Métropole de Lyon.
- </p>
-
- <div class="footerModal" fxLayout="row" fxLayoutAlign="space-around center">
- <button
- type="button"
- class="btn-primary"
- [disabled]="!isPageValid"
- [ngClass]="{ invalid: !isPageValid }"
- (click)="onSubmit()"
- >
- Valider
- </button>
- </div>
- </form>
- </div>
+ <p class="informationEndForm">
+ <sup>1</sup>La Métropole de Lyon, engagée pour la transparence de l’action publique et la valorisation de ses
+ partenaires, encourage l’ouverture des données. Les données de votre structure seront publiées sur la plateforme
+ <a href="https://data.grandlyon.com/" target="_blank">https://data.grandlyon.com/</a> sous la licence ouverte
+ (open data) et seront donc librement accessibles et réutilisables. Vous pourrez modifier votre choix à tout
+ moment, exercer vos droits d’accès et de modification, en le signifiant, par tout moyen à votre convenance, auprès
+ de vos interlocuteurs de la Métropole de Lyon.
+ </p>
+ </form>
</app-v3-modal>
diff --git a/src/app/shared/components/data-share-consent/data-share-consent.component.scss b/src/app/shared/components/data-share-consent/data-share-consent.component.scss
index 9dd883e35..f432f0f49 100644
--- a/src/app/shared/components/data-share-consent/data-share-consent.component.scss
+++ b/src/app/shared/components/data-share-consent/data-share-consent.component.scss
@@ -8,25 +8,13 @@
h1 {
@include font-bold-26;
}
-.form {
- max-width: 90%;
- margin: 32px;
-}
-.footerModal {
- justify-content: center;
- display: flex;
- button {
- &.invalid {
- opacity: 0.4;
- }
- }
-}
.formGroup {
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 1rem;
+ margin-block: 1rem;
+ text-align: left;
.buttons {
display: flex;
gap: 1rem;
diff --git a/src/app/structure-list/components/more-filters/more-filters.component.scss b/src/app/structure-list/components/more-filters/more-filters.component.scss
index 650281236..f1e6c8c95 100644
--- a/src/app/structure-list/components/more-filters/more-filters.component.scss
+++ b/src/app/structure-list/components/more-filters/more-filters.component.scss
@@ -95,7 +95,6 @@
.headerMoreFilters {
position: relative;
text-align: center;
- color: $grey-1;
background: white;
padding: 1rem;
@include font-bold-18;
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index 57c90e441..54129a9e7 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -17,7 +17,6 @@ p:empty {
h1 {
@include font-bold-20;
- color: $grey-1;
}
h2 {
@include font-bold-14;
--
GitLab