Skip to content

Commit

Permalink
feat(ui-colors): update couleurs UI kit et complement de label (#2722)
Browse files Browse the repository at this point in the history
* refactor(champ): utiliser la bonne variable de couleur

* refactor(multiple): utiliser color-text-secondary au lieu de placeholder et suppression de placeholder
  • Loading branch information
suli-octo authored Feb 26, 2024
1 parent 2b805e4 commit ee39784
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
$color-message-champs-obligatoires: utilities.$color-primary;
$color-background-etape: utilities.$color-background-secondary;
$color-text-etape: utilities.$color-text-primary-inverse;
$color-text-decharge: utilities.$color-text-secondary;


.header {
Expand Down Expand Up @@ -110,7 +111,7 @@ $color-text-etape: utilities.$color-text-primary-inverse;
}

p {
color: utilities.$color-text-placeholder;
color: $color-text-decharge;
font-size: 0.875rem;
padding: 1rem;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use "../../Input.module";
@use "@styles/utilities" as utilities;

$color-nombre-resultats: utilities.$color-text-placeholder;
$color-nombre-resultats: utilities.$color-text-secondary;

.nombreResultats {
@include utilities.text-small;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use "../../Input.module";
@use "@styles/utilities" as utilities;

$color-nombre-resultats: utilities.$color-text-placeholder;
$color-nombre-resultats: utilities.$color-text-secondary;

.nombreResultats {
@include utilities.text-small;
Expand Down
3 changes: 2 additions & 1 deletion src/client/components/ui/Form/Label/Label.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "@styles/utilities";

$color-text-disabled-or-readonly: utilities.$color-text-secondary;
$color-text-label-complement: utilities.$color-text-secondary;

.label {
display: block;
Expand All @@ -18,7 +19,7 @@ $color-text-disabled-or-readonly: utilities.$color-text-secondary;
.complement {
display: block;
overflow: hidden;
color: utilities.$color-text-placeholder; // TODO (BRUJ 06-10-2023): Ajouter la bonne couleur : devrait s'appeler color-text-secondary d'après l'ui kit
color: $color-text-label-complement;
@include utilities.text-xsmall;
line-height: 1.4;
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/ui/Pagination/Pagination.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$pagination-current-page-color: utilities.$color-text-primary-inverse;
$pagination-current-page-background-color: utilities.$color-background-secondary;
$pagination-disabled-page-color: utilities.$color-text-placeholder;
$pagination-disabled-page-color: utilities.$color-text-secondary;
$pagination-available-page-color: utilities.$color-text-primary;

.pagination {
Expand Down
6 changes: 0 additions & 6 deletions src/styles/theme/_colors.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ Pour utiliser une couleur, on procède de la manière suivante :
<p>$color-text-secondary</p>
<p>#666666</p>
</li>
<li>
<div className="color-text-placeholder"></div>
<p>Placeholder</p>
<p>$color-text-placeholder</p>
<p>#666666</p>
</li>
</ul>
</section>
<section className="colors-cta">
Expand Down
4 changes: 0 additions & 4 deletions src/styles/theme/_colors.stories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@
background-color: variables.$color-text-primary-inverse;
}

& .color-text-placeholder {
background-color: variables.$color-text-placeholder;
}

& .color-text-secondary {
background-color: variables.$color-text-secondary;
}
Expand Down
2 changes: 0 additions & 2 deletions src/styles/theme/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ $color-text-primary: #161616;
$color-text-primary-inverse: #FFFFFF;
$color-text-primary-alternative: #566BB1;
$color-text-secondary: #666666;
$color-text-placeholder: #666666;


/* ***************
* CTA colors
Expand Down

0 comments on commit ee39784

Please sign in to comment.