Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Utiliser les designs tokens sur Mon Pix (PIX-15177). #10807

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
+40 −53
Open

[FEATURE] Utiliser les designs tokens sur Mon Pix (PIX-15177). #10807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37123ed
feat(mon-pix): use pix-body-l font token for competence card name
Libouk Dec 13, 2024
19111e9
feat(mon-pix): use font token for new-information title and text texts
Libouk Dec 13, 2024
af93c54
feat(mon-pix): use font tokens for scorecard details name and descrip…
Libouk Dec 13, 2024
6270768
feat(mon-pix): use font tokens for tutorial card title and details
Libouk Dec 13, 2024
4d62827
feat(mon-pix): use font token for scorecard detail level info
Libouk Dec 13, 2024
892bcf2
feat(mon-pix): use font token for title and text and change a few spa…
Libouk Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions mon-pix/app/styles/components/_certification-not-certifiable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin-right: 10px;
margin-bottom: 50px;
margin-left: 10px;
padding: 20px;
padding: var(--pix-spacing-8x);
text-rendering: optimizelegibility;

@include device-is('desktop') {
Expand All @@ -15,20 +15,18 @@

.certification-not-certifiable__button {
margin-top: 20px;
margin-bottom: 20px;
}

.certification-not-certifiable__title {
font-size: 2rem;
font-family: $font-open-sans;
@extend %pix-title-m;

text-align: center;
}

.certification-not-certifiable__text {
margin-top: 0;
font-size: 1rem;
font-family: $font-open-sans;
line-height: 27px;
@extend %pix-body-l;

margin-top: var(--pix-spacing-4x);
text-align: center;

@include device-is('desktop') {
Expand Down
18 changes: 10 additions & 8 deletions mon-pix/app/styles/components/_competence-card-default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@
font-size: 0.7rem;
}

.competence-card__competence-name {
z-index: 2;
margin: 0 3px;
padding-top: 10px;
font-weight: var(--pix-font-bold);
font-size: 1.17rem;
}

.competence-card__body {
position: absolute;
top: 80px;
Expand Down Expand Up @@ -261,3 +253,13 @@
}
}
}

.competence-card__competence-name {
@extend %pix-body-l;

@include device-is('tablet') {
z-index: 2;
margin: 0 3px;
padding-top: 10px;
Comment on lines +262 to +263
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je comprends que le code a juste été déplacé mais suggestion : pourquoi ne pas utiliser les tokens ici ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ça s'applique à pas mal de fichiers modifiées j'ai l'impression même si tout n'a pas été touché)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'est vrai qu'on n'a pas tout fait, j'étais en pair sur une séance à temps limité avec QuentinC et il avait ciblé des valeurs à changer. On a dû passer à côté d'autres endroits où les tokens pouvaient être utilisés

}
}
10 changes: 4 additions & 6 deletions mon-pix/app/styles/components/_competence-card-mobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,11 @@
}

.competence-card__competence-name {
@extend %pix-body-l;

position: relative;
color: inherit;
font-weight: var(--pix-font-medium);
font-size: 1.125rem;
font-family: inherit;
line-height: inherit;
letter-spacing: inherit;
color: var(--pix-neutral-0);
font-weight: var(--pix-font-bold);
}

.competence-card__body {
Expand Down
11 changes: 4 additions & 7 deletions mon-pix/app/styles/components/_new-information.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,9 @@
}

h2 {
@extend %pix-title-s;

margin-bottom: 14px;
font-weight: var(--pix-font-medium);
font-size: 1.125rem;
font-family: $font-open-sans;
line-height: 1.875rem;
letter-spacing: 0;

@include device-is('tablet') {
Expand All @@ -94,10 +92,9 @@
}

p {
@extend %pix-body-s;

margin: 0;
font-weight: var(--pix-font-normal);
font-size: 0.875rem;
line-height: 1.375rem;
letter-spacing: 0.009rem;
}
}
Expand Down
28 changes: 12 additions & 16 deletions mon-pix/app/styles/components/_scorecard-details.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,27 @@

.tutorials-header {
&__title {
@extend %pix-title-s;

margin-bottom: var(--pix-spacing-4x);
font-size: 2rem;
font-family: $font-open-sans;
}

&__description {
@extend %pix-body-m;

margin: 0 0 10px;
color: var(--pix-neutral-900);
font-weight: var(--pix-font-normal);
font-size: 1rem;
font-family: $font-roboto;
line-height: 1.625rem;
}
}

.tube {
margin-bottom: 40px;

&__title {
@extend %pix-title-xs;

margin-bottom: 24px;
color: var(--pix-neutral-900);
font-weight: var(--pix-font-normal);
font-size: 1.25rem;
font-family: $font-open-sans;
line-height: 2.125rem;
letter-spacing: 0;
}

Expand Down Expand Up @@ -169,16 +165,15 @@
}

&__name {
@extend %pix-title-m;

margin: 15px 0;
font-size: 2rem;
font-family: $font-open-sans;
}

&__description {
@extend %pix-body-m;

color: var(--pix-neutral-500);
font-size: 1rem;
font-family: $font-open-sans;
line-height: 1.625rem;
}
}

Expand All @@ -191,9 +186,10 @@
}

&__level-info {
@extend %pix-body-m;

margin-top: 20px;
color: var(--pix-neutral-800);
letter-spacing: 0.019rem;
white-space: nowrap;
text-transform: uppercase;
}
Expand Down
12 changes: 4 additions & 8 deletions mon-pix/app/styles/components/_tutorial-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@

.tutorial-card-content {
&__title {
@extend %pix-title-xs;

display: -webkit-box;
margin-bottom: 4px;
overflow: hidden;
font-weight: var(--pix-font-medium);
font-size: 1.25rem;
font-family: $font-open-sans;
line-height: 1.25;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
Expand All @@ -38,13 +36,11 @@
}

&__details {
@extend %pix-body-s;

height: 24px;
margin: 0;
color: var(--pix-neutral-500);
font-weight: var(--pix-font-normal);
font-size: 0.813rem;
font-family: $font-roboto;
line-height: 1.5rem;
}

&__actions {
Expand Down
Loading