agecem/agecem-org
4
1
Fork 0
Code Issues 31 Pull requests 2 Activity

Merge pull request 'Fix exposition et application des fonts' (#88) from fix/fonts into main

Browse source 
Reviewed-on: #88
This commit is contained in:
Victor Lacasse-Beaudoin 2023-08-01 13:32:07 -05:00
commit 36bd45f2bc
4 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
public/css/fonts.css
View file

@ -1,139 +1,139 @@
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-thin.woff2') format('woff2'),
url('../fonts/Poppins/poppins-thin.woff') format('woff'),
url('../fonts/Poppins/poppins-thin.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-thin.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-thin.woff') format('woff'),
url('/public/fonts/Poppins/poppins-thin.otf') format('otf');
font-weight: 100;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-thin-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-thin-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-thin-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-thin-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-thin-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-thin-italic.otf') format('otf');
font-weight: 100;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-extralight.woff2') format('woff2'),
url('../fonts/Poppins/poppins-extralight.woff') format('woff'),
url('../fonts/Poppins/poppins-extralight.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-extralight.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-extralight.woff') format('woff'),
url('/public/fonts/Poppins/poppins-extralight.otf') format('otf');
font-weight: 200;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-extralight-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-extralight-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-extralight-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-extralight-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-extralight-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-extralight-italic.otf') format('otf');
font-weight: 200;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-light.woff2') format('woff2'),
url('../fonts/Poppins/poppins-light.woff') format('woff'),
url('../fonts/Poppins/poppins-light.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-light.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-light.woff') format('woff'),
url('/public/fonts/Poppins/poppins-light.otf') format('otf');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-light-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-light-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-light-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-light-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-light-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-light-italic.otf') format('otf');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-regular.woff2') format('woff2'),
url('../fonts/Poppins/poppins-regular.woff') format('woff'),
url('../fonts/Poppins/poppins-regular.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-regular.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-regular.woff') format('woff'),
url('/public/fonts/Poppins/poppins-regular.otf') format('otf');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-regular-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-regular-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-regular-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-regular-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-regular-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-regular-italic.otf') format('otf');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-medium.woff2') format('woff2'),
url('../fonts/Poppins/poppins-medium.woff') format('woff'),
url('../fonts/Poppins/poppins-medium.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-medium.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-medium.woff') format('woff'),
url('/public/fonts/Poppins/poppins-medium.otf') format('otf');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-medium-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-medium-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-medium-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-medium-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-medium-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-medium-italic.otf') format('otf');
font-weight: 500;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-semibold.woff2') format('woff2'),
url('../fonts/Poppins/poppins-semibold.woff') format('woff'),
url('../fonts/Poppins/poppins-semibold.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-semibold.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-semibold.woff') format('woff'),
url('/public/fonts/Poppins/poppins-semibold.otf') format('otf');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-semibold-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-semibold-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-semibold-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-semibold-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-semibold-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-semibold-italic.otf') format('otf');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-bold.woff2') format('woff2'),
url('../fonts/Poppins/poppins-bold.woff') format('woff'),
url('../fonts/Poppins/poppins-bold.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-bold.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-bold.woff') format('woff'),
url('/public/fonts/Poppins/poppins-bold.otf') format('otf');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-bold-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-bold-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-bold-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-bold-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-bold-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-bold-italic.otf') format('otf');
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-extrabold.woff2') format('woff2'),
url('../fonts/Poppins/poppins-extrabold.woff') format('woff'),
url('../fonts/Poppins/poppins-extrabold.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-extrabold.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-extrabold.woff') format('woff'),
url('/public/fonts/Poppins/poppins-extrabold.otf') format('otf');
font-weight: 800;
font-style: normal;
@ -141,28 +141,28 @@
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-extrabold-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-extrabold-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-extrabold-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-extrabold-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-extrabold-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-extrabold-italic.otf') format('otf');
font-weight: 800;
font-style: italic;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-black.woff2') format('woff2'),
url('../fonts/Poppins/poppins-black.woff') format('woff'),
url('../fonts/Poppins/poppins-black.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-black.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-black.woff') format('woff'),
url('/public/fonts/Poppins/poppins-black.otf') format('otf');
font-weight: 900;
font-style: normal;
}
@font-face {
font-family: 'Poppins';
src: url('../fonts/Poppins/poppins-black-italic.woff2') format('woff2'),
url('../fonts/Poppins/poppins-black-italic.woff') format('woff'),
url('../fonts/Poppins/poppins-black-italic.otf') format('otf');
font-family: "Poppins";
src: url('/public/fonts/Poppins/poppins-black-italic.woff2') format('woff2'),
url('/public/fonts/Poppins/poppins-black-italic.woff') format('woff'),
url('/public/fonts/Poppins/poppins-black-italic.otf') format('otf');
font-weight: 900;
font-style: italic;
}
}

7
public/css/general.css
View file

@ -1,10 +1,9 @@
.header {
width: 100%;
}
.headerMenu {
font-family: Poppins;
font-family: "Poppins";
font-weight: 400; /*regular*/
font-size: 1.25rem; /*20px*/
color: #000; /*Noir pur*/
@ -20,7 +19,7 @@
}
.heading1 {
font-family: Poppins;
font-family: "Poppins";
font-weight: 600; /*semi-bold*/
font-size: 6rem; /*96px*/
color: #394596; /*Bleu AGECEM*/
@ -28,7 +27,7 @@
}
.heading2 {
font-family: Poppins;
font-family: "Poppins";
font-weight: 600; /*semi-bold*/
font-size: 1.5rem; /*24px*/
color: #394596; /*Bleu AGECEM*/

2
public/public.go
View file

@ -10,7 +10,7 @@ package public
import "embed"
//go:embed css/*.css js/*.js
//go:embed css/*.css js/*.js fonts/*
var publicFS embed.FS
func GetPublicFS() embed.FS {

1
templates/html/general.gohtml
View file

@ -1,3 +1,4 @@
{{ define "general-html" }}
<link rel="stylesheet" href="/public/css/general.css">
<link rel="stylesheet" href="/public/css/fonts.css">
{{ end }}