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

Jump to bottom

Pc 31772 remplace titles typos with ds #14091

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pc 31772 remplace titles typos with ds #14091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28a8e0f
(PC-31772)[PRO] style: Do not use font-weight and font-style in mixin…
GuillaumeMgz Sep 11, 2024
f724138
(PC-31772)[PRO] style: Replace title typos with DS tokens and delete …
GuillaumeMgz Sep 11, 2024
036f721
(PC-31772)[PRO] feat: Ajust title3 to title2 when necessary.
GuillaumeMgz Sep 20, 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
11 changes: 0 additions & 11 deletions pro/.storybook/preview-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,4 @@
local('Montserrat-Italic'),
url('/pass-culture-main/fonts/Montserrat-Italic.woff2') format('woff2');
}

@font-face {
font-family: Montserrat-ExtraBold;
font-weight: 800;
font-style: normal;
font-display: 'swap';
src:
local('Montserrat ExtraBold'),
local('Montserrat-ExtraBold'),
url('/pass-culture-main/fonts/Montserrat-ExtraBold.woff2') format('woff2');
}
</style>
2 changes: 1 addition & 1 deletion pro/src/components/FormLayout/FormLayout.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $info-box-margin-left: rem.torem(24px);
margin-bottom: rem.torem(24px);

&-title {
@include fonts.title3;
@include fonts.title2;
}

&-header {
Expand Down
2 changes: 1 addition & 1 deletion pro/src/components/SummaryLayout/SummaryLayout.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}

.section-title {
@include fonts.title3;
@include fonts.title2;

padding-right: rem.torem(16px);

Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/AdageIframe/app/components/AdageDiscovery/AdageDiscovery.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
}

.playlist-carousel-title {
@include fonts.title3;
@include fonts.title2;
}
2 changes: 1 addition & 1 deletion ...me/app/components/AdageDiscovery/Playlist/ClassroomPlaylist/ClassroomPlaylist.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "styles/mixins/_rem.scss" as rem;

.playlist-carousel-title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rame/app/components/AdageDiscovery/Playlist/NewOfferPlaylist/NewOfferPlaylist.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "styles/mixins/_rem.scss" as rem;

.playlist-carousel-title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion .../app/components/AdageDiscovery/Playlist/NewOffererPlaylist/NewOffererPlaylist.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "styles/mixins/_rem.scss" as rem;

.playlist-carousel-title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion ...dageIframe/app/components/AdageDiscovery/Playlist/VenuePlaylist/VenuePlaylist.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "styles/mixins/_rem.scss" as rem;

.playlist-carousel-title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/AdageIframe/app/components/OfferInfos/AdageOffer/AdageOffer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
margin-bottom: rem.torem(16px);

&-title {
@include fonts.title3;
@include fonts.title2;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/OfferInfos/AdageOffer/AdageOfferInstitutionPanel/AdageOfferInstitutionPanel.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
gap: rem.torem(8px);

&-title {
@include fonts.title3;
@include fonts.title2;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...omponents/OfferInfos/AdageOffer/AdageOfferPartnerPanel/AdageOfferPartnerPanel.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
gap: rem.torem(8px);

&-title {
@include fonts.title3;
@include fonts.title2;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...OffersInstantSearch/OffersSearch/Offers/AdageOfferListCard/AdageOfferListCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
}

.offer-title {
@include fonts.title3;
@include fonts.title2;
}

.offer-headband {
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Collaborators/Collaborators.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
padding-top: 0;

.main-list-title {
@include fonts.title3;
@include fonts.title2;

border-bottom: rem.torem(2px) solid var(--color-black);
margin-bottom: rem.torem(24px);
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/Offerers/Offerers.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "styles/mixins/_rem.scss" as rem;

.title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: rem.torem(16px);
}
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/Offerers/PartnerPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}

.venue-name {
@include fonts.title4;
@include fonts.title3;

margin-top: rem.torem(8px);
margin-bottom: rem.torem(8px);
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/Offerers/PartnerPages.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

.title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: rem.torem(8px);
}
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/ProfileAndSupport/ProfileAndSupport.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@use "styles/variables/_size.scss" as size;

.title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: rem.torem(16px);
}
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/StatisticsDashboard/OfferStats.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@use "styles/variables/_size.scss" as size;

.title {
@include fonts.bold;
@include fonts.title3;

margin-bottom: rem.torem(8px);
}
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/StatisticsDashboard/StatisticsDashboard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.title {
@include fonts.title3;
@include fonts.title2;
}

.no-data {
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/Home/VenueOfferSteps/VenueOfferSteps.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
display: block;
margin-bottom: rem.torem(8px);

@include fonts.title4;
@include fonts.title3;
}

.inside-partner-block {
Expand Down
4 changes: 2 additions & 2 deletions pro/src/pages/Home/Venues/Venue.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
.toggle-wrapper {
display: flex;
align-items: center;

@include fonts.title3;
}

.venue-name {
@include fonts.title4;

background: none;
border: none;
word-break: break-all;
Expand Down
2 changes: 1 addition & 1 deletion pro/src/pages/VenueEdition/VenueEditionHeader.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

.venue-name {
@include fonts.title3;
@include fonts.title2;
}

.separator {
Expand Down
Binary file removed pro/src/public/fonts/Montserrat-ExtraBold.woff2
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions pro/src/screens/IndividualOffer/BookingsSummary/BookingsSummary.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
gap: rem.torem(16px);
flex-wrap: wrap;
margin-bottom: rem.torem(16px);

&-title {
@include fonts.title3;
@include fonts.title2;
}
}
2 changes: 1 addition & 1 deletion ...s/IndividualOffer/BookingsSummary/DownloadBookingsModal/DownloadBookingsModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.header {
@include fonts.title3;
@include fonts.title2;
}

.one-booking-date-section {
Expand Down
2 changes: 1 addition & 1 deletion pro/src/screens/IndividualOffer/StocksEventCreation/HelpSection/HelpSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

.title {
@include fonts.title3;
@include fonts.title2;

position: absolute;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion ...c/screens/IndividualOfferConfirmationScreen/IndividualOfferConfirmationScreen.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.confirmation-title {
@include fonts.title3;
@include fonts.title2;

margin-bottom: rem.torem(24px);
}
Expand Down
11 changes: 0 additions & 11 deletions pro/src/styles/global/_font_faces.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,3 @@
local("Montserrat-Italic"),
url("/fonts/Montserrat-Italic.woff2") format("woff2");
}

@font-face {
font-family: Montserrat-ExtraBold;
font-weight: 800;
font-style: normal;
font-display: "swap";
src:
local("Montserrat ExtraBold"),
local("Montserrat-ExtraBold"),
url("/fonts/Montserrat-ExtraBold.woff2") format("woff2");
}
6 changes: 0 additions & 6 deletions pro/src/styles/mixins/_fonts-legacy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@

@mixin bold() {
font-family: Montserrat-Bold, system-ui, sans-serif;
font-weight: 700;
font-style: normal;
}

@mixin semi-bold() {
font-family: Montserrat-SemiBold, system-ui, sans-serif;
font-weight: 600;
font-style: normal;
}

@mixin medium() {
font-family: Montserrat-Medium, system-ui, sans-serif;
font-weight: 500;
font-style: normal;
}
44 changes: 12 additions & 32 deletions pro/src/styles/mixins/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,77 +7,57 @@ $body-font-size: rem.torem(15px);
$caption-line-height: rem.torem(16px);

@mixin title1() {
font-family: Montserrat-ExtraBold, system-ui, sans-serif;
font-weight: 800;
font-style: normal;
font-size: rem.torem(26px);
line-height: rem.torem(34px);
font-family: var(--typography-title1-font-family), system-ui, sans-serif;
font-size: var(--typography-title1-font-size);
line-height: var(--typography-title1-line-height);
}

@mixin title2() {
font-family: Montserrat-Medium, system-ui, sans-serif;
font-weight: 500;
font-style: normal;
font-size: rem.torem(22px);
line-height: rem.torem(26px);
font-family: var(--typography-title2-font-family), system-ui, sans-serif;
font-size: var(--typography-title2-font-size);
line-height: var(--typography-title2-line-height);
}

@mixin title3() {
font-family: Montserrat-Bold, system-ui, sans-serif;
font-weight: 700;
font-style: normal;
font-size: rem.torem(20px);
line-height: rem.torem(24px);
font-family: var(--typography-title3-font-family), system-ui, sans-serif;
font-size: var(--typography-title3-font-size);
line-height: var(--typography-title3-line-height);
}

@mixin title4() {
font-family: Montserrat-SemiBold, system-ui, sans-serif;
font-weight: 600;
font-style: normal;
font-size: rem.torem(18px);
line-height: rem.torem(22px);
font-family: var(--typography-title4-font-family), system-ui, sans-serif;
font-size: var(--typography-title4-font-size);
line-height: var(--typography-title4-line-height);
}

@mixin button() {
font-family: Montserrat-Bold, system-ui, sans-serif;
font-weight: 700;
font-style: normal;
font-size: rem.torem(15px);
}

@mixin body() {
font-family: Montserrat-Regular, system-ui, sans-serif;
font-weight: 400;
font-style: normal;
font-size: $body-font-size;
line-height: $body-line-height;
}

@mixin body-important() {
font-family: Montserrat-Medium, system-ui, sans-serif;
font-weight: 500;
font-style: normal;
font-size: $body-font-size;
}

@mixin body-exergue() {
font-family: Montserrat-SemiBold, system-ui, sans-serif;
font-weight: 600;
font-style: normal;
font-size: $body-font-size;
}

@mixin caption() {
font-family: Montserrat-SemiBold, system-ui, sans-serif;
font-weight: 600;
font-style: normal;
font-size: rem.torem(12px);
line-height: $caption-line-height;
}

@mixin placeholder() {
font-family: Montserrat-RegularItalic, system-ui, sans-serif;
font-weight: 400;
font-style: italic;
font-size: rem.torem(15px);
}
Loading