From 971865601610a14aeab4f23439780a42490457ce Mon Sep 17 00:00:00 2001 From: ouidade Date: Thu, 4 Jul 2024 16:28:02 +0200 Subject: [PATCH] css page consultation --- .../dist/assets/css/bundle.css | 54 ++++++++-------- .../src/assets/scss/global/_fonts.scss | 63 +++++++++++-------- .../scss/global/variables/_typography.scss | 6 +- 3 files changed, 68 insertions(+), 55 deletions(-) diff --git a/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css b/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css index 2b64b36..6cb934c 100644 --- a/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css +++ b/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css @@ -24,51 +24,51 @@ h3 { /*Gilroy*/ /*! Generated by Font Squirrel (https://www.fontsquirrel.com) on July 4, 2024 */ @font-face { - font-family: "gilroy"; - src: url("../dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff2") format("woff2"), url("../dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff") format("woff"); - font-weight: 600; - font-style: italic; + font-family: "gilroy-semiboldita"; + src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; } @font-face { - font-family: "gilroy"; + font-family: "gilroy-semibold"; src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibold-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibold-webfont.woff") format("woff"); - font-weight: 600; + font-weight: normal; font-style: normal; } @font-face { - font-family: "gilroy"; + font-family: "gilroy-regularita"; src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regularitalic-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regularitalic-webfont.woff") format("woff"); - font-weight: 300; - font-style: italic; + font-weight: normal; + font-style: normal; } @font-face { - font-family: "gilroy"; + font-family: "gilroy-regular"; src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regular-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regular-webfont.woff") format("woff"); - font-weight: 300; + font-weight: normal; font-style: normal; } @font-face { - font-family: "gilroy"; + font-family: "gilroy-bolditalic"; src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bolditalic-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bolditalic-webfont.woff") format("woff"); - font-weight: 800; - font-style: italic; -} -@font-face { - font-family: "gilroy"; - src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bold-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bold-webfont.woff") format("woff"); - font-weight: 800; + font-weight: normal; font-style: normal; } @font-face { - font-family: "gilroy"; - src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff") format("woff"); - font-weight: 400; - font-style: italic; + font-family: "gilroy-bold"; + src: url("../fonts/Gilroy/gilroy-bold-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bold-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; } @font-face { - font-family: "gilroy"; - src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-medium-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-medium-webfont.woff") format("woff"); - font-weight: 400; + font-family: "gilroy-mediumital"; + src: url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff2") format("woff2"), url("./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "gilroy-medium"; + src: url("../fonts/Gilroy/gilroy-medium-webfont.woff2") format("woff2"), url("../fonts/Gilroy/gilroy-medium-webfont.woff") format("woff"); + font-weight: normal; font-style: normal; } /*marianne*/ @@ -155,7 +155,7 @@ h3 { position: relative; width: 100vw; background-color: rgb(255, 255, 255); - font-family: "gilroy", sans-serif; + font-family: "gilroy-medium", sans-serif; font-weight: 400; font-style: normal; font-size: 0.8rem; diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_fonts.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_fonts.scss index f01effd..fa4a756 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_fonts.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_fonts.scss @@ -5,76 +5,89 @@ @font-face { - font-family: 'gilroy'; - src: url('../dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff2') format('woff2'), - url('../dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff') format('woff'); - font-weight: 600; - font-style: italic; + font-family: 'gilroy-semiboldita'; + src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff2') format('woff2'), + url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibolditalic-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; } + + @font-face { - font-family: 'gilroy'; + font-family: 'gilroy-semibold'; src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibold-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-semibold-webfont.woff') format('woff'); - font-weight: 600; + font-weight: normal; font-style: normal; } + + + @font-face { - font-family: 'gilroy'; + font-family: 'gilroy-regularita'; src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regularitalic-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regularitalic-webfont.woff') format('woff'); - font-weight: 300; - font-style: italic; + font-weight: normal; + font-style: normal; } + + + @font-face { - font-family: 'gilroy'; + font-family: 'gilroy-regular'; src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regular-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-regular-webfont.woff') format('woff'); - font-weight: 300; + font-weight: normal; font-style: normal; } + + + @font-face { - font-family: 'gilroy'; + font-family: 'gilroy-bolditalic'; src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bolditalic-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bolditalic-webfont.woff') format('woff'); - font-weight: 800; - font-style: italic; + font-weight: normal; + font-style: normal; } + + @font-face { - font-family: 'gilroy'; - src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bold-webfont.woff2') format('woff2'), + font-family: 'gilroy-bold'; + src: url('../fonts/Gilroy/gilroy-bold-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-bold-webfont.woff') format('woff'); - font-weight: 800; + font-weight: normal; font-style: normal; } @font-face { - font-family: 'gilroy'; + font-family: 'gilroy-mediumital'; src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff2') format('woff2'), url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-mediumitalic-webfont.woff') format('woff'); - font-weight: 400; - font-style: italic; + font-weight: normal; + font-style: normal; } @font-face { - font-family: 'gilroy'; - src: url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-medium-webfont.woff2') format('woff2'), - url('./theme/custom/quartiers_de_demain/dist/assets/fonts/Gilroy/gilroy-medium-webfont.woff') format('woff'); - font-weight: 400; + font-family: 'gilroy-medium'; + src: url('../fonts/Gilroy/gilroy-medium-webfont.woff2') format('woff2'), + url('../fonts/Gilroy/gilroy-medium-webfont.woff') format('woff'); + font-weight: normal; font-style: normal; } diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/variables/_typography.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/variables/_typography.scss index f641fee..60cddde 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/variables/_typography.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/variables/_typography.scss @@ -1,7 +1,7 @@ // Font Family -$font-family-default: "gilroy", sans-serif; -$font-family-header: "gilroy", sans-serif; -$font-family-chapeau: "gilroy", sans-serif; +$font-family-default: 'gilroy-medium', sans-serif; +$font-family-header: 'gilroy-medium', sans-serif; +$font-family-chapeau: 'gilroy-medium', sans-serif; $font-extra: 2.3rem;