浏览代码

fontsface

ouidade 4 年之前
父节点
当前提交
9466b09c0f
共有 33 个文件被更改,包括 200 次插入204 次删除
  1. 0 0
      user/pages/01.home/03._ressources/rapport_activite_V1.pdf
  2. 0 0
      user/pages/01.home/03._ressources/rapport_activite_V1.png
  3. 2 2
      user/pages/01.home/03._ressources/ressources.md
  4. 0 19
      user/pages/01.home/04._gouvernance/01._conseil-dadministration/01._presidence/personnes.md
  5. 0 16
      user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/personnes.md
  6. 0 20
      user/pages/01.home/04._gouvernance/01._conseil-dadministration/conseil_dadministration.md
  7. 二进制
      user/pages/01.home/04._gouvernance/01._presidence/MB-3-crop.jpg
  8. 8 0
      user/pages/01.home/04._gouvernance/01._presidence/personnes.md
  9. 二进制
      user/pages/01.home/04._gouvernance/02._equipe-epau/Alain Maugard_TROUVE.jpg
  10. 0 12
      user/pages/01.home/04._gouvernance/02._equipe-epau/personnes.md
  11. 二进制
      user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg
  12. 8 0
      user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/personnes.md
  13. 0 0
      user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/photo_butlen.jpeg
  14. 二进制
      user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/jb_marie_crop.jpg
  15. 7 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/personnes.md
  16. 5 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/02._direction-europan-france/personnes.md
  17. 5 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/03._direction-popsu/personnes.md
  18. 5 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/04._direction-coubertin/personnes.md
  19. 5 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/05._direction-forum-des-solutions/personnes.md
  20. 11 0
      user/pages/01.home/04._gouvernance/03._equipe-epau/equipe-epau.md
  21. 5 2
      user/pages/01.home/04._gouvernance/gouvernance.md
  22. 1 1
      user/pages/01.home/modular.md
  23. 0 0
      user/themes/epau-antimatter/css-compiled/nucleus.css
  24. 43 24
      user/themes/epau-antimatter/css-compiled/template.css
  25. 6 4
      user/themes/epau-antimatter/css/custom.css
  26. 40 70
      user/themes/epau-antimatter/fonts/fonts.css
  27. 7 7
      user/themes/epau-antimatter/scss/configuration/nucleus/_typography.scss
  28. 3 3
      user/themes/epau-antimatter/scss/configuration/template/_typography.scss
  29. 6 1
      user/themes/epau-antimatter/scss/configuration/template/_variables.scss
  30. 9 1
      user/themes/epau-antimatter/scss/template/_header.scss
  31. 17 17
      user/themes/epau-antimatter/scss/template/_typography.scss
  32. 4 1
      user/themes/epau-antimatter/templates/modular.html.twig
  33. 3 4
      user/themes/epau-antimatter/templates/partials/base.html.twig

+ 0 - 0
user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.pdf → user/pages/01.home/03._ressources/rapport_activite_V1.pdf


+ 0 - 0
user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.png → user/pages/01.home/03._ressources/rapport_activite_V1.png


+ 2 - 2
user/pages/01.home/03._rapports-dactivitees/rapport_dactivitees.md → user/pages/01.home/03._ressources/ressources.md

@@ -30,10 +30,10 @@ rapports:
         texte_de_presentation: "Courte explicationVita estillis semper in fuga uxoresque mercenariae\r\n infugauxoresque mercenariae conductae ad tempus expacto atque, ut conductae ad tempus ex pacto atque, ut sit species matrimonii, dotis nomine futura coniunx hastam.\r\n"
         couverture: rapport_activite_V1.png
         pdf: rapport_activite_V1.pdf
-template: modular/rapport_dactivitees
+template: modular/ressources
 process:
     markdown: true
     twig: false
 ---
 
-### Ressources
+# Ressources

+ 0 - 19
user/pages/01.home/04._gouvernance/01._conseil-dadministration/01._presidence/personnes.md

@@ -1,19 +0,0 @@
----
-title: Présidence
-visible: true
-body_classes: 'modular-row personnes'
-personnes:
-    -
-        nom: 'Hélène Peskine'
-        fonction: 'Présidente du Conseil d’administration'
-        biographie: 'Secrétaire permanente du Plan Urbanisme Construction Architecture, Ministère de la Transition écologique, Ministère de la Cohésion des territoires et des Relations avec les Collectivités territoriales'
-        portrait: null
-admin: {  }
-process:
-    markdown: true
-    twig: true
-debugger: true
-template: modular/personnes
----
-
-### Présidence

+ 0 - 16
user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/personnes.md

@@ -1,16 +0,0 @@
----
-title: 'Membres du conseil d''administration'
-visible: true
-body_classes: 'modular-row personnes'
-personnes:
-    -
-        nom: 'Jean-Baptiste Butlen'
-        fonction: 'Membre du Conseil d’administration'
-        biographie: 'Sous-directeur Aménagement durable, Direction Générale de l’Aménagement, du Logement et de la Nature, Ministère de la Transition écologique, Ministère de la Cohésion des territoires et des Relations avec les Collectivités territoriales'
-        portrait: photo_butlen.jpeg
-debugger: true
-template: modular/personnes
-media_order: photo_butlen.jpeg
----
-
-### Membres du conseil d'administration

+ 0 - 20
user/pages/01.home/04._gouvernance/01._conseil-dadministration/conseil_dadministration.md

@@ -1,20 +0,0 @@
----
-title: 'Conseil d''dadministration'
-menu: 'Conseil d''dadministration'
-visible: true
-onpage_menu: true
-body_classes: 'modular fullwidth title-center title-h1h2'
-content:
-    items: '@self.modular'
-    order:
-        by: default
-        dir: asc
-        custom:
-            - _presidence
-            - _membres-du-conseil-dadministration
-admin:
-    children_display_order: collection
-debugger: true
----
-
-## Conseil d'administration

二进制
user/pages/01.home/04._gouvernance/01._presidence/MB-3-crop.jpg


文件差异内容过多而无法显示
+ 8 - 0
user/pages/01.home/04._gouvernance/01._presidence/personnes.md


二进制
user/pages/01.home/04._gouvernance/02._equipe-epau/Alain Maugard_TROUVE.jpg


文件差异内容过多而无法显示
+ 0 - 12
user/pages/01.home/04._gouvernance/02._equipe-epau/personnes.md


二进制
user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg


文件差异内容过多而无法显示
+ 8 - 0
user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/personnes.md


+ 0 - 0
user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/photo_butlen.jpeg → user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/photo_butlen.jpeg


二进制
user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/jb_marie_crop.jpg


文件差异内容过多而无法显示
+ 7 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/personnes.md


+ 5 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/02._direction-europan-france/personnes.md

@@ -0,0 +1,5 @@
+---
+title: 'direction Europan France'
+body_classes: modular
+---
+

+ 5 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/03._direction-popsu/personnes.md

@@ -0,0 +1,5 @@
+---
+title: 'direction POPSU'
+body_classes: modular
+---
+

+ 5 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/04._direction-coubertin/personnes.md

@@ -0,0 +1,5 @@
+---
+title: 'direction Coubertin'
+body_classes: modular
+---
+

+ 5 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/05._direction-forum-des-solutions/personnes.md

@@ -0,0 +1,5 @@
+---
+title: 'direction Forum des Solutions'
+body_classes: modular
+---
+

+ 11 - 0
user/pages/01.home/04._gouvernance/03._equipe-epau/equipe-epau.md

@@ -0,0 +1,11 @@
+---
+title: 'Équipe EPAU'
+content:
+    items: '@self.modular'
+visible: true
+debugger: true
+template: modular/equipe-epau
+body_classes: 'modular-row personnes'
+---
+
+## Équipe EPAU

+ 5 - 2
user/pages/01.home/04._gouvernance/gouvernance.md

@@ -3,14 +3,15 @@ title: Gouvernance
 menu: Gouvernance
 visible: true
 onpage_menu: true
-body_classes: 'modular fullwidth title-center title-h1h2'
+body_classes: 'modular '
 content:
     items: '@self.modular'
     order:
         by: default
         dir: asc
         custom:
-            - _conseil-dadministration
+            - _presidence
+            - _membres-du-conseil-dadministration
             - _equipe-epau
 admin:
     children_display_order: collection
@@ -18,3 +19,5 @@ debugger: true
 ---
 
 # Gouvernance
+
+## Le conseil d’administration de l’Europe des projets architecturaux et urbains et les Directions de programmes de l’Europe des projets architecturaux urbains

+ 1 - 1
user/pages/01.home/modular.md

@@ -11,7 +11,7 @@ content:
         custom:
             - _accueil
             - _programmes
-            - _rapports-dactivitees
+            - _ressources
             - _gouvernance
             - _contact
 media_order: 'EPAU_logo_EPAU_vecto-seul.svg,Republique-francaise-logo.svg,popsu.png'

文件差异内容过多而无法显示
+ 0 - 0
user/themes/epau-antimatter/css-compiled/nucleus.css


+ 43 - 24
user/themes/epau-antimatter/css-compiled/template.css

@@ -30,7 +30,7 @@ a {
     color: black; }
 
 b, strong, label, th {
-  font-weight: 600; }
+  font-weight: 700; }
 
 #container {
   min-height: 100%;
@@ -79,6 +79,11 @@ b, strong, label, th {
   height: 5rem;
   background-color: white;
   box-shadow: 0 0.05rem 1rem rgba(0, 0, 0, 0.15); }
+  #header #logo img {
+    display: flex;
+    flex-direction: row;
+    flex-flow: row;
+    max-height: 5rem; }
   #header.scrolled {
     height: 3rem;
     background-color: rgba(255, 255, 255, 0.9) !important;
@@ -107,7 +112,7 @@ b, strong, label, th {
       #header #logo h3 a {
         color: #000; }
   #header #navbar {
-    font-size: 0.9rem;
+    font-size: 1.4rem;
     /* Child Indicator */ }
     #header #navbar .has-children > a > span {
       display: inline-block;
@@ -147,7 +152,7 @@ b, strong, label, th {
           /* Dropdown CSS */
           /* Active on Hover */ }
           #header #navbar ul.navigation li a {
-            font-family: "Sarabun ExtraBold", sans-serif;
+            font-family: "Sarabun", sans-serif;
             display: inline-block;
             padding: 0.3rem 0.8rem;
             -webkit-backface-visibility: hidden; }
@@ -295,19 +300,19 @@ b, strong, label, th {
       color: #fff; }
 
 html, body, button, input, select, textarea, .pure-g, .pure-g [class*="pure-u"] {
-  font-family: "Sarabun Regular", sans-serif; }
+  font-family: "Sarabun", sans-serif; }
 
 h1 {
-  font-family: "Sarabun ExtraBold", sans-serif;
-  font-weight: 400;
+  font-family: "Sarabun", sans-serif;
+  font-weight: 800;
   text-rendering: optimizeLegibility;
   letter-spacing: -0px; }
 
 h2, h3, h5, h6 {
-  font-family: "Sarabun Light", sans-serif; }
+  font-family: "Sarabun", sans-serif; }
 
 h1 {
-  font-size: 3.2rem; }
+  font-size: 3rem; }
   @media only all and (max-width: 47.938em) {
     h1 {
       font-size: 2.5rem;
@@ -316,29 +321,29 @@ h1 {
 
 @media only all and (min-width: 48em) and (max-width: 59.938em) {
   h2 {
-    font-size: 2.1rem; } }
+    font-size: 1.9rem; } }
 
 @media only all and (max-width: 47.938em) {
   h2 {
-    font-size: 2rem; } }
+    font-size: 1.8rem; } }
 
 @media only all and (min-width: 48em) and (max-width: 59.938em) {
   h3 {
-    font-size: 1.7rem; } }
+    font-size: 1.6rem; } }
 
 @media only all and (max-width: 47.938em) {
   h3 {
-    font-size: 1.6rem; } }
+    font-size: 1.5rem; } }
 
 h4 {
-  font-family: "Sarabun Regular", sans-serif;
-  font-weight: bold; }
+  font-family: "Sarabun", sans-serif;
+  font-weight: 800; }
   @media only all and (min-width: 48em) and (max-width: 59.938em) {
     h4 {
-      font-size: 1.35rem; } }
+      font-size: 1.25rem; } }
   @media only all and (max-width: 47.938em) {
     h4 {
-      font-size: 1.25rem; } }
+      font-size: 1.15rem; } }
 
 h1 {
   text-align: center;
@@ -350,12 +355,26 @@ h2 {
 h3 {
   letter-spacing: -0px; }
 
+h1 + h2 {
+  margin: -2rem 0 2rem 0;
+  font-size: 2rem;
+  line-height: 1;
+  text-align: center;
+  font-family: "Sarabun", sans-serif;
+  font-weight: 300; }
+  @media only all and (min-width: 48em) and (max-width: 59.938em) {
+    h1 + h2 {
+      font-size: 1.6rem; } }
+  @media only all and (max-width: 47.938em) {
+    h1 + h2 {
+      font-size: 1.5rem; } }
+
 h2 + h3 {
   margin: 0.5rem 0 2rem 0;
   font-size: 2rem;
   line-height: 1;
   text-align: center;
-  font-family: "Sarabun Light", sans-serif;
+  font-family: "Sarabun", sans-serif;
   font-weight: 300; }
   @media only all and (min-width: 48em) and (max-width: 59.938em) {
     h2 + h3 {
@@ -365,7 +384,7 @@ h2 + h3 {
       font-size: 1.5rem; } }
 
 p {
-  font-size: 19px; }
+  font-size: 1rem; }
 
 blockquote {
   border-left: 10px solid #F0F2F4; }
@@ -464,7 +483,7 @@ hr {
   display: inline-block;
   text-align: center;
   font-size: 0.7rem;
-  font-family: "Sarabun ExtraBold", sans-serif;
+  font-family: "Sarabun", sans-serif;
   margin-right: 0.75rem; }
 
 fieldset {
@@ -529,14 +548,14 @@ td {
     box-shadow: 0 1px 0 #f32b24; }
 
 .bullets {
-  margin: 1.7rem 0;
-  margin-left: -0.85rem;
-  margin-right: -0.85rem;
+  margin: 1.7em 0;
+  margin-left: -0.85em;
+  margin-right: -0.85em;
   overflow: auto; }
 
 .bullet {
   float: left;
-  padding: 0 0.85rem; }
+  padding: 0 0.85em; }
 
 .two-column-bullet {
   width: 50%; }
@@ -668,7 +687,7 @@ td {
     .list-item .list-blog-date span {
       display: block;
       font-size: 1.75rem;
-      font-weight: 600;
+      font-weight: 700;
       line-height: 110%; }
     .list-item .list-blog-date em {
       display: block;

+ 6 - 4
user/themes/epau-antimatter/css/custom.css

@@ -1,7 +1,8 @@
 #header #navbar ul.navigation li a {
-    font-family: "Sarabun Regular", sans-serif;
-    font-size: 25px;
+    font-family: "Sarabun", sans-serif;
+    font-weight: 400;
     text-transform: uppercase;
+    font-size: 1rem;
     display: inline-block;
     padding: 0.3rem 0.8rem;
     -webkit-backface-visibility: hidden;
@@ -11,7 +12,7 @@
 
   #header.scrolled #navbar  ul.navigation li a {
       color: black !important;
-      font-size: 20px;
+      font-size: 0.95rem;
 
       transition:0.6s ease-in-out;
 
@@ -167,7 +168,8 @@ h2 {
   padding-top: 3rem;
   padding-left: 15%;
   padding-right: 15%;
-  font-family: "Sarabun ExtraBold";
+  font-family: "Sarabun";
+  font-weight: 800;
   font-size: 1rem;
   line-height: 20px;
 }

+ 40 - 70
user/themes/epau-antimatter/fonts/fonts.css

@@ -3,118 +3,96 @@
 
 
 @font-face {
-    font-family: 'sarabunbold';
+    font-family: 'Sarabun';
     src: url('sarabun-bold-webfont.woff2') format('woff2'),
          url('sarabun-bold-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 700;
     font-style: normal;
-
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabunbold_italic';
+    font-family: 'Sarabun';
     src: url('sarabun-bolditalic-webfont.woff2') format('woff2'),
          url('sarabun-bolditalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 700;
+    font-style: italic;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_extraboldregular';
+    font-family: 'Sarabun';
     src: url('sarabun-extrabold-webfont.woff2') format('woff2'),
          url('sarabun-extrabold-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 800;
     font-style: normal;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_extrabolditalic';
+    font-family: 'Sarabun';
     src: url('sarabun-extrabolditalic-webfont.woff2') format('woff2'),
          url('sarabun-extrabolditalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 800;
+    font-style: italic;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_extralightregular';
+    font-family: 'Sarabun';
     src: url('sarabun-extralight-webfont.woff2') format('woff2'),
          url('sarabun-extralight-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 200;
     font-style: normal;
-
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_extralightitalic';
+    font-family: 'Sarabun';
     src: url('sarabun-extralightitalic-webfont.woff2') format('woff2'),
          url('sarabun-extralightitalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-
+    font-weight: 200;
+    font-style: italic;
 }
 
-
-
-
 @font-face {
-    font-family: 'sarabunitalic';
+    font-family: 'Sarabun';
     src: url('sarabun-italic-webfont.woff2') format('woff2'),
          url('sarabun-italic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 400;
+    font-style: italic;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_lightregular';
+    font-family: 'Sarabun';
     src: url('sarabun-light-webfont.woff2') format('woff2'),
          url('sarabun-light-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 300;
     font-style: normal;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_lightitalic';
+    font-family: 'Sarabun';
     src: url('sarabun-lightitalic-webfont.woff2') format('woff2'),
          url('sarabun-lightitalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 300;
+    font-style: italic;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_mediumregular';
+    font-family: 'Sarabun';
     src: url('sarabun-medium-webfont.woff2') format('woff2'),
          url('sarabun-medium-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 500;
     font-style: normal;
 
 }
@@ -123,11 +101,11 @@
 
 
 @font-face {
-    font-family: 'sarabun_mediumitalic';
+    font-family: 'Sarabun';
     src: url('sarabun-mediumitalic-webfont.woff2') format('woff2'),
          url('sarabun-mediumitalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 500;
+    font-style: italic;
 
 }
 
@@ -135,57 +113,49 @@
 
 
 @font-face {
-    font-family: 'sarabunregular';
+    font-family: 'Sarabun';
     src: url('sarabun-regular-webfont.woff2') format('woff2'),
          url('sarabun-regular-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 400;
     font-style: normal;
 
 }
 
-
-
 @font-face {
-    font-family: 'sarabun_semiboldregular';
+    font-family: 'Sarabun';
     src: url('sarabun-semibold-webfont.woff2') format('woff2'),
          url('sarabun-semibold-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 600;
     font-style: normal;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_semibolditalic';
+    font-family: 'Sarabun';
     src: url('sarabun-semibolditalic-webfont.woff2') format('woff2'),
          url('sarabun-semibolditalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 600;
+    font-style: italic;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_thinregular';
+    font-family: 'Sarabun';
     src: url('sarabun-thin-webfont.woff2') format('woff2'),
          url('sarabun-thin-webfont.woff') format('woff');
-    font-weight: normal;
+    font-weight: 100;
     font-style: normal;
 
 }
 
 
-
-
 @font-face {
-    font-family: 'sarabun_thinitalic';
+    font-family: 'Sarabun';
     src: url('sarabun-thinitalic-webfont.woff2') format('woff2'),
          url('sarabun-thinitalic-webfont.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 100;
+    font-style: italic;
 
 }

+ 7 - 7
user/themes/epau-antimatter/scss/configuration/nucleus/_typography.scss

@@ -3,12 +3,12 @@ $core-font-size:				1rem !default;
 $core-line-height:				1.7 !default;
 
 // Heading Sizes
-$h1-font-size:					$core-font-size + 2.20 !default;
-$h2-font-size:					$core-font-size + 1.50 !default;
-$h3-font-size:					$core-font-size + 1.10 !default;
-$h4-font-size:					$core-font-size + 0.75 !default;
-$h5-font-size:					$core-font-size + 0.35 !default;
-$h6-font-size:					$core-font-size - 0.15 !default;
+$h1-font-size:					$core-font-size + 2.0 !default;
+$h2-font-size:					$core-font-size + 1.30 !default;
+$h3-font-size:					$core-font-size + 1.0 !default;
+$h4-font-size:					$core-font-size + 0.65 !default;
+$h5-font-size:					$core-font-size + 0.25 !default;
+$h6-font-size:					$core-font-size - 0.10 !default;
 
 // Spacing
-$leading-margin:				$core-line-height * 1rem !default;
+$leading-margin:				$core-line-height * 1em !default;

+ 3 - 3
user/themes/epau-antimatter/scss/configuration/template/_typography.scss

@@ -1,7 +1,7 @@
 // Font Family
-$font-family-default:  			"Sarabun Regular", sans-serif;
-$font-family-header:  			"Sarabun ExtraBold", sans-serif;
-$font-family-chapeau:     "Sarabun Light", sans-serif;
+$font-family-default:  			"Sarabun", sans-serif;
+$font-family-header:  			"Sarabun", sans-serif;
+$font-family-chapeau:     "Sarabun", sans-serif;
 $font-family-mono: 				"Inconsolata", monospace;
 $font-family-serif:				"Georgia", "Times", "Times New Roman", serif;
 

+ 6 - 1
user/themes/epau-antimatter/scss/configuration/template/_variables.scss

@@ -4,9 +4,14 @@ $footer-height: 6rem;
 $border-radius: 3px;
 
 // Font Weights
-$font-weight-bold: 600;
+$font-weight-extrabold: 800;
+$font-weight-bold: 700;
+$font-weight-semibold: 600;
+$font-weight-medium: 500;
 $font-weight-regular: 400;
 $font-weight-light:300;
+$font-weight-extralight:200;
+$font-weight-thin:100;
 
 // Global Paddings
 $padding-horiz: 7rem;

+ 9 - 1
user/themes/epau-antimatter/scss/template/_header.scss

@@ -11,6 +11,12 @@ $dropdown-color: #f6f6f6;
 	background-color: white;
 	box-shadow: 0 0.05rem 1rem rgba(0,0,0, 0.15);
 
+	#logo img {
+		display: flex;
+		flex-direction: row;
+		flex-flow: row;
+		max-height: $header-height;
+	}
 
 	// scroll based changes
 	&.scrolled {
@@ -24,6 +30,8 @@ $dropdown-color: #f6f6f6;
 			font-size: 1.6rem !important;
 		}
 
+
+
 		#logo a, #navbar span {
 			color: $black !important;
 		}
@@ -68,7 +76,7 @@ $dropdown-color: #f6f6f6;
 	}
 
 	#navbar {
-		font-size: $core-font-size - 0.1rem;
+		font-size: $core-font-size + 0.4rem;
 
 		/* Child Indicator */
 		.has-children {

+ 17 - 17
user/themes/epau-antimatter/scss/template/_typography.scss

@@ -7,7 +7,7 @@ html, body, button, input, select, textarea, .pure-g, .pure-g [class *= "pure-u"
 // Headings
 h1 {
 	font-family: $font-family-header;
-	font-weight: 400;
+	font-weight: 800;
 	text-rendering: optimizeLegibility;
 	letter-spacing: -0px;
 }
@@ -47,7 +47,7 @@ h3 {
 
 h4 {
 	font-family: $font-family-default;
-	font-weight: bold;
+	font-weight: 800;
 	@include breakpoint(tablet-range) {
 		font-size: $h4-font-size - .40;
 	}
@@ -70,20 +70,20 @@ h3 {
 	letter-spacing: -0px;
 }
 
-//	h1 + h2 {
-//	margin: -2rem 0 2rem 0;
-//	font-size: 2rem;
-//	@include breakpoint(tablet-range) {
-// 		font-size: 1.6rem;
-// }
-// 	@include breakpoint(mobile-only) {
-// 		font-size: 1.5rem;
-// 	}
-// 	line-height: 1;
-// 	text-align: center;
-// 	font-family: $font-family-default;
-// 	font-weight: 300;
-// }
+	h1 + h2 {
+	margin: -2rem 0 2rem 0;
+	font-size: 2rem;
+	@include breakpoint(tablet-range) {
+		font-size: 1.6rem;
+}
+	@include breakpoint(mobile-only) {
+		font-size: 1.5rem;
+	}
+	line-height: 1;
+	text-align: center;
+	font-family: $font-family-default;
+	font-weight: 300;
+}
 
 h2 + h3 {
 	margin: 0.5rem 0 2rem 0;
@@ -101,7 +101,7 @@ h2 + h3 {
 }
 
 p {
-	font-size: 19px;
+	font-size: $core-font-size;
 }
 
 

+ 4 - 1
user/themes/epau-antimatter/templates/modular.html.twig

@@ -27,6 +27,9 @@
 {% endblock %}
 
 {% block header_navigation %}
+
+
+
     {% if show_onpage_menu %}
         <ul class="navigation">
         {% for module in page.collection() %}
@@ -45,7 +48,7 @@
     {% else %}
         {{  parent() }}
     {% endif %}
-    {{ dump(header)}}
+
 {% endblock %}
 
 

+ 3 - 4
user/themes/epau-antimatter/templates/partials/base.html.twig

@@ -51,10 +51,9 @@
 
             <div id="logo">
 
-              {% for logo in page.header.content %}
-              <img src='{{ page.media[logo.media_order].url|e }}' alt="{{ config.site.title }}" />
-
-              {% endfor %}
+              <img src="/user/pages/01.home/Republique-francaise-logo.svg" alt="logo France">
+              <img src="user/pages/01.home/EPAU_logo_EPAU_vecto-seul.svg" alt="logo EPAU">
+          
 
               {# marche pas
               {% for image in page.header.media_order %}

部分文件因为文件数量过多而无法显示