Skip to content
Snippets Groups Projects
Commit f2e470a5 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

chore(ui): remove duplicate colors & unused css

parent df9ae6e0
No related branches found
No related tags found
2 merge requests!783V3.0.0,!663chore(ui): remove duplicate colors & unused css
Showing
with 72 additions and 213 deletions
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
h2 { h2 {
@include font-bold-18; @include font-bold-18;
color: $grey-1;
text-transform: uppercase;
} }
.userNumber { .userNumber {
...@@ -102,7 +100,6 @@ ...@@ -102,7 +100,6 @@
.noResult { .noResult {
@include font-bold-16; @include font-bold-16;
color: $grey-1;
} }
.filtersInfo { .filtersInfo {
@include font-regular-14; @include font-regular-14;
...@@ -139,7 +136,6 @@ ...@@ -139,7 +136,6 @@
} }
.count { .count {
@include font-bold-24; @include font-bold-24;
color: $grey-1;
margin: 1.5rem 0; margin: 1.5rem 0;
} }
.access { .access {
......
...@@ -11,27 +11,6 @@ ...@@ -11,27 +11,6 @@
border-top: 1px solid $grey-7; 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 { .print {
stroke: $white; stroke: $white;
width: 20px; width: 20px;
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
overflow-y: auto; overflow-y: auto;
color: $grey-1;
padding: 32px 48px; padding: 32px 48px;
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<p>L’employeur demandé est celui qui figure sur votre fiche de paie (ou fiche de poste)</p> <p>L’employeur demandé est celui qui figure sur votre fiche de paie (ou fiche de poste)</p>
</div> </div>
<div class="search-structure"> <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> <label for="employer">Employeur</label>
<div fxLayout="row" fxLayoutGap="13px"> <div fxLayout="row" fxLayoutGap="13px">
<input <input
......
...@@ -11,39 +11,6 @@ ...@@ -11,39 +11,6 @@
width: 380px; width: 380px;
border-radius: 20px; border-radius: 20px;
margin: 4px 0px; 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 { .form-list {
...@@ -66,40 +33,6 @@ ...@@ -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 { .autocomplete-items {
width: 296px; width: 296px;
} }
...@@ -12,14 +12,12 @@ ...@@ -12,14 +12,12 @@
</div> </div>
<div class="scroll"> <div class="scroll">
<div *ngIf="!isAlreadySearching"> <div *ngIf="!isAlreadySearching">
<div class="nb"> <div *ngIf="structures" 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">{{ structures.length }} structures existantes</div> <div *ngIf="searchString.length > 0" class="nb-text" [ngPlural]="structures.length">
<div *ngIf="searchString.length > 0" class="nb-text" [ngPlural]="structures.length"> <ng-template ngPluralCase="0">0 structure trouvée</ng-template>
<ng-template ngPluralCase="0">0 structure trouvée</ng-template> <ng-template ngPluralCase="1">1 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>
<ng-template ngPluralCase="other">{{ structures.length }} structures trouvées</ng-template>
</div>
</div> </div>
</div> </div>
......
...@@ -30,16 +30,14 @@ ...@@ -30,16 +30,14 @@
overflow-y: scroll; overflow-y: scroll;
border: 1px solid $grey-6; border: 1px solid $grey-6;
margin: 16px 0px 0px 0px; margin: 16px 0px 0px 0px;
} .nb {
padding: 0px 0px 0px 16px;
.nb { margin: 16px 0px;
padding: 0px 0px 0px 16px; .nb-text {
margin: 16px 0px; @include font-regular-13;
} color: $grey-3;
}
.nb-text { }
@include font-regular-13;
color: $grey-3;
} }
.structure-list { .structure-list {
...@@ -99,7 +97,6 @@ ...@@ -99,7 +97,6 @@
.name { .name {
@include font-regular-16; @include font-regular-16;
font-weight: 600; font-weight: 600;
color: $grey-1;
} }
.commune { .commune {
...@@ -111,7 +108,6 @@ ...@@ -111,7 +108,6 @@
.create-text { .create-text {
@include font-regular-14; @include font-regular-14;
color: $grey-1;
margin: 8px 0px; margin: 8px 0px;
.question { .question {
font-weight: bold; font-weight: bold;
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
.name { .name {
@include font-regular-16; @include font-regular-16;
font-weight: 600; font-weight: 600;
color: $grey-1;
} }
.commune { .commune {
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
} }
.headerName { .headerName {
@include font-bold-18; @include font-bold-18;
color: $grey-1;
width: 100%; width: 100%;
} }
} }
...@@ -54,7 +53,6 @@ ...@@ -54,7 +53,6 @@
} }
.selectListName { .selectListName {
@include font-bold-18; @include font-bold-18;
color: $grey-1;
width: 100%; width: 100%;
} }
h4 { h4 {
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
text-align: center; text-align: center;
border: 1px solid $grey-1; border: 1px solid $grey-1;
border-radius: 4px; border-radius: 4px;
color: $grey-1;
@include font-regular-14; @include font-regular-14;
margin: auto; margin: auto;
background: $white; background: $white;
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
width: 100%; width: 100%;
max-width: 980px; max-width: 980px;
box-sizing: border-box; box-sizing: border-box;
color: $grey-1;
background: $white; background: $white;
border-radius: 8px; border-radius: 8px;
border: 1px solid $grey-6; border: 1px solid $grey-6;
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
label { label {
margin-bottom: 4px; margin-bottom: 4px;
@include font-regular-16; @include font-regular-16;
color: $grey-1;
} }
input { input {
width: 100%; width: 100%;
......
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
::ng-deep .leaflet-control-zoom { ::ng-deep .leaflet-control-zoom {
a { a {
color: $grey-1; color: $grey-1;
opacity: 0.55; text-decoration: none;
opacity: 0.75;
&:hover { &:hover {
opacity: 1; opacity: 1;
} }
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
} }
.tab { .tab {
color: $grey-1;
padding-bottom: 1rem; padding-bottom: 1rem;
justify-content: center; justify-content: center;
display: flex; display: flex;
...@@ -75,7 +74,7 @@ ...@@ -75,7 +74,7 @@
cursor: pointer; cursor: pointer;
} }
&.selected { &.selected {
color: $grey-1; font-weight: bold;
border-bottom: 2px solid $grey-1; border-bottom: 2px solid $grey-1;
} }
} }
......
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
} }
.tab { .tab {
color: $grey-1;
padding-bottom: 1rem; padding-bottom: 1rem;
justify-content: center; justify-content: center;
display: flex; display: flex;
...@@ -83,7 +82,7 @@ ...@@ -83,7 +82,7 @@
cursor: pointer; cursor: pointer;
} }
&.selected { &.selected {
color: $grey-1; font-weight: bold;
border-bottom: 2px solid $grey-1; border-bottom: 2px solid $grey-1;
} }
} }
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
align-items: center; align-items: center;
.sectionTitle { .sectionTitle {
@include font-bold-18; @include font-bold-18;
color: $grey-1;
} }
.sectionButtons { .sectionButtons {
display: flex; display: flex;
...@@ -77,10 +76,6 @@ ...@@ -77,10 +76,6 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px; gap: 8px;
.email {
text-decoration: underline;
color: $grey-1;
}
} }
&.members { &.members {
......
...@@ -91,7 +91,6 @@ section { ...@@ -91,7 +91,6 @@ section {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px; gap: 8px;
color: $grey-1;
@include font-regular-14; @include font-regular-14;
.row { .row {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
min-height: 450px; min-height: 450px;
max-height: 75vh; max-height: 75vh;
overflow-y: auto; overflow-y: auto;
color: $grey-1;
background: $white; background: $white;
border-radius: 8px; border-radius: 8px;
border: 1px solid $grey-6; border: 1px solid $grey-6;
......
...@@ -5,75 +5,60 @@ ...@@ -5,75 +5,60 @@
[validateDisabled]="!isPageValid" [validateDisabled]="!isPageValid"
(closed)="onSubmit()" (closed)="onSubmit()"
> >
<div class="form"> <h1>
<h1> Acceptez-vous que les informations de vos structures soient mises à disposition sur la plateforme
Acceptez-vous que les informations de vos structures soient mises à disposition sur la plateforme data.grandlyon.com<sup>1</sup> ?
data.grandlyon.com<sup>1</sup> ? </h1>
</h1>
<form class="dataShareConsent" [formGroup]="consentForm"> <form class="dataShareConsent" [formGroup]="consentForm">
<div *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" class="formGroup inline"> <div *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" class="formGroup inline">
Toutes les structures Toutes les structures
<div class="buttons"> <div class="buttons">
<app-radio-option <app-radio-option
[id]="'allYes'" [id]="'allYes'"
[label]="'Oui'" [label]="'Oui'"
[value]="true" [value]="true"
[selected]="allSelected === true" [selected]="allSelected === true"
(click)="onRadioBtnChangeAll(true)" (click)="onRadioBtnChangeAll(true)"
/> />
<app-radio-option <app-radio-option
[id]="'allNo'" [id]="'allNo'"
[label]="'Non'" [label]="'Non'"
[value]="false" [value]="false"
[selected]="allSelected === false" [selected]="allSelected === false"
(click)="onRadioBtnChangeAll(false)" (click)="onRadioBtnChangeAll(false)"
/> />
</div>
</div> </div>
<hr *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" /> </div>
<hr *ngIf="dataConsentPendingStructures && dataConsentPendingStructures.length > 1" />
<div *ngFor="let structure of dataConsentPendingStructures" class="formGroup inline"> <div *ngFor="let structure of dataConsentPendingStructures" class="formGroup inline">
{{ structure.structureName }} {{ structure.structureName }}
<div class="buttons"> <div class="buttons">
<app-radio-option <app-radio-option
[id]="structure._id" [id]="structure._id"
[label]="'Oui'" [label]="'Oui'"
[value]="true" [value]="true"
[selected]="processDataShareConsentDate(structure) === true" [selected]="processDataShareConsentDate(structure) === true"
(click)="onRadioBtnChangeStructure(structure._id, true)" (click)="onRadioBtnChangeStructure(structure._id, true)"
/> />
<app-radio-option <app-radio-option
[id]="structure._id" [id]="structure._id"
[label]="'Non'" [label]="'Non'"
[value]="false" [value]="false"
[selected]="processDataShareConsentDate(structure) === false" [selected]="processDataShareConsentDate(structure) === false"
(click)="onRadioBtnChangeStructure(structure._id, false)" (click)="onRadioBtnChangeStructure(structure._id, false)"
/> />
</div>
</div> </div>
</div>
<p class="informationEndForm"> <p class="informationEndForm">
<span class="asterisk">*</span> La Métropole de Lyon, engagée pour la transparence de l’action publique et la <sup>1</sup>La Métropole de Lyon, engagée pour la transparence de l’action publique et la valorisation de ses
valorisation de ses partenaires, encourage l’ouverture des données. Les données de votre structure seront partenaires, encourage l’ouverture des données. Les données de votre structure seront publiées sur la plateforme
publiées sur la plateforme <a href="https://data.grandlyon.com/" target="_blank">https://data.grandlyon.com/</a> sous la licence ouverte
<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
(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
moment, exercer vos droits d’accès et de modification, en le signifiant, par tout moyen à votre convenance, de vos interlocuteurs de la Métropole de Lyon.
auprès de vos interlocuteurs de la Métropole de Lyon. </p>
</p> </form>
<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>
</app-v3-modal> </app-v3-modal>
...@@ -8,25 +8,13 @@ ...@@ -8,25 +8,13 @@
h1 { h1 {
@include font-bold-26; @include font-bold-26;
} }
.form {
max-width: 90%;
margin: 32px;
}
.footerModal {
justify-content: center;
display: flex;
button {
&.invalid {
opacity: 0.4;
}
}
}
.formGroup { .formGroup {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem; margin-block: 1rem;
text-align: left;
.buttons { .buttons {
display: flex; display: flex;
gap: 1rem; gap: 1rem;
......
...@@ -95,7 +95,6 @@ ...@@ -95,7 +95,6 @@
.headerMoreFilters { .headerMoreFilters {
position: relative; position: relative;
text-align: center; text-align: center;
color: $grey-1;
background: white; background: white;
padding: 1rem; padding: 1rem;
@include font-bold-18; @include font-bold-18;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment