diff --git a/user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.pdf b/user/pages/01.home/03._ressources/rapport_activite_V1.pdf similarity index 100% rename from user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.pdf rename to user/pages/01.home/03._ressources/rapport_activite_V1.pdf diff --git a/user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.png b/user/pages/01.home/03._ressources/rapport_activite_V1.png similarity index 100% rename from user/pages/01.home/03._rapports-dactivitees/rapport_activite_V1.png rename to user/pages/01.home/03._ressources/rapport_activite_V1.png diff --git a/user/pages/01.home/03._rapports-dactivitees/rapport_dactivitees.md b/user/pages/01.home/03._ressources/ressources.md similarity index 97% rename from user/pages/01.home/03._rapports-dactivitees/rapport_dactivitees.md rename to user/pages/01.home/03._ressources/ressources.md index 4a80bc0..7b09ece 100644 --- a/user/pages/01.home/03._rapports-dactivitees/rapport_dactivitees.md +++ b/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 \ No newline at end of file +# Ressources diff --git a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/01._presidence/personnes.md b/user/pages/01.home/04._gouvernance/01._conseil-dadministration/01._presidence/personnes.md deleted file mode 100644 index a03afcb..0000000 --- a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/01._presidence/personnes.md +++ /dev/null @@ -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 diff --git a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/personnes.md b/user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/personnes.md deleted file mode 100644 index 31653aa..0000000 --- a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/personnes.md +++ /dev/null @@ -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 diff --git a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/conseil_dadministration.md b/user/pages/01.home/04._gouvernance/01._conseil-dadministration/conseil_dadministration.md deleted file mode 100644 index 37e4a68..0000000 --- a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/conseil_dadministration.md +++ /dev/null @@ -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 diff --git a/user/pages/01.home/04._gouvernance/01._presidence/MB-3-crop.jpg b/user/pages/01.home/04._gouvernance/01._presidence/MB-3-crop.jpg new file mode 100644 index 0000000..59057a5 Binary files /dev/null and b/user/pages/01.home/04._gouvernance/01._presidence/MB-3-crop.jpg differ diff --git a/user/pages/01.home/04._gouvernance/01._presidence/personnes.md b/user/pages/01.home/04._gouvernance/01._presidence/personnes.md new file mode 100644 index 0000000..af729ae --- /dev/null +++ b/user/pages/01.home/04._gouvernance/01._presidence/personnes.md @@ -0,0 +1,20 @@ +--- +title: Présidence +visible: true +body_classes: ' personnes presidence' +personnes: + - + nom: 'Hélène Peskine' + fonction: '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' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: MB-3-crop.jpg +admin: { } +process: + markdown: true + twig: true +debugger: true +template: modular/personnes +media_order: MB-3-crop.jpg +--- + +### Présidence de l'Europe des projets architecturaux et urbains diff --git a/user/pages/01.home/04._gouvernance/02._equipe-epau/Alain Maugard_TROUVE.jpg b/user/pages/01.home/04._gouvernance/02._equipe-epau/Alain Maugard_TROUVE.jpg deleted file mode 100644 index 079f637..0000000 Binary files a/user/pages/01.home/04._gouvernance/02._equipe-epau/Alain Maugard_TROUVE.jpg and /dev/null differ diff --git a/user/pages/01.home/04._gouvernance/02._equipe-epau/personnes.md b/user/pages/01.home/04._gouvernance/02._equipe-epau/personnes.md deleted file mode 100644 index 741cf73..0000000 --- a/user/pages/01.home/04._gouvernance/02._equipe-epau/personnes.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: 'Équipe EPAU' -content: - items: '@self.modular' -visible: true -debugger: true -template: modular/personnes -body_classes: 'modular-row personnes' -personnes: - - - nom: 'Alain Maugard' - fonction: 'Président de l’Association Europan France' - biographie: "Né le 23 avril 1943 à Nérac (Lot-et-Garonne), Alain Maugard est un ancien élève de l’École polytechnique et Ingénieur général des Ponts et Chaussées. Il débute sa carrière au ministère de l’Équipement au service des Affaires économiques et internationales et dans les services urbanisme construction des Directions Départementales. Chef du service de la politique technique à la direction de la Construction et secrétaire permanent du Plan Construction, de 1978 à 1981, il devient successivement directeur adjoint de cabinet des ministres de l’Urbanisme et du Logement Roger Quilliot et Paul Quilès puis directeur de la Construction au ministère de l’Équipement, du Logement, des Transports et de la Mer. En 1990, il est nommé directeur général de l’Établissement public d’aménagement de la Défense (epad), jusqu’en 1993 où il prend la présidence du cstb. Il quitte ces fonctions en 2008 pour rejoindre le Conseil général de l’environnement et du développement durable où il assure la présidence de la section « risques, sécurité, sûreté ». En septembre 2009, il accède à la présidence de Qualibat. \r\nEn outre, Alain Maugard est membre du conseil d’administration de l’Ademe. Il a également piloté le Comité opérationnel (comop) du chantier n°1 « Bâtiments neufs publics et privés » du Grenelle de l’Environnement. \r\n\r\nBibliographie\_:\r\n- Regards sur le bâtiment — Le futur en construction, éditions Le Moniteur, 2006\r\n - Regard sur la ville durable, Alain Maugard et Jean-Pierre Cuisinier, CSTB, mars 2010\r\n - Le BEPOS pour tous (livre électronique), http://outils.xpair.com/livre/bepos-pourtous/7.htm (25 juin 2015) \r\n" - portrait: 'Alain Maugard_TROUVE.jpg' -media_order: 'Alain Maugard_TROUVE.jpg' ---- - -## Équipe EPAU diff --git a/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg b/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg new file mode 100644 index 0000000..78464ea Binary files /dev/null and b/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg differ diff --git a/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/personnes.md b/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/personnes.md new file mode 100644 index 0000000..d6d9d42 --- /dev/null +++ b/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/personnes.md @@ -0,0 +1,32 @@ +--- +title: 'Membres du conseil d''administration' +visible: true +body_classes: 'modular-row personnes' +personnes: + - + nom: 'Jean-Baptiste Butlen' + fonction: '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' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: photo_butlen.jpeg + - + nom: 'Aurélie Cousi' + fonction: 'Directrice, adjointe au directeur général des patrimoines, chargée de l’architecture, Ministère de la Culture' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: photo_butlen.jpeg + - + nom: 'Corinne Langlois' + fonction: 'Sous-directrice à l''architecture, à la qualité de la construction et du cadre de vie, représentante du Ministre en charge de la Culture' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: null + - + nom: 'Vincent Lacaille' + fonction: 'Chef du bureau de la qualité de l’architecture et du paysage, Service de l’architecture, représentant du Ministre en charge de la Culture' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: null +debugger: true +template: modular/personnes +media_order: 'photo_butlen.jpeg,aurelie-cousi-nommee-aux-fonctions-de-directrice.jpg' +--- + +### Membres de l'assemblée générale du Groupement d’intérêt public Europe des projets architecturaux et urbains + diff --git a/user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/photo_butlen.jpeg b/user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/photo_butlen.jpeg similarity index 100% rename from user/pages/01.home/04._gouvernance/01._conseil-dadministration/02._membres-du-conseil-dadministration/photo_butlen.jpeg rename to user/pages/01.home/04._gouvernance/02._membres-du-conseil-dadministration/photo_butlen.jpeg diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/jb_marie_crop.jpg b/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/jb_marie_crop.jpg new file mode 100644 index 0000000..2076ca4 Binary files /dev/null and b/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/jb_marie_crop.jpg differ diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/personnes.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/personnes.md new file mode 100644 index 0000000..3bac104 --- /dev/null +++ b/user/pages/01.home/04._gouvernance/03._equipe-epau/01._direction-generale-epau/personnes.md @@ -0,0 +1,22 @@ +--- +title: 'direction générale EPAU' +body_classes: modular +personnes: + - + nom: 'Jean-Baptiste Marie' + fonction: 'Directeur général Intégrer la bio du conseil stratégique POPSU' + biographie: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam nec sagittis massa. Nulla facilisi. Cras id arcu lorem, et semper purus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis vel enim mi, in lobortis sem. Vestibulum luctus elit eu libero ultrices id fermentum sem sagittis. Nulla imperdiet mauris sed sapien dignissim id aliquam est aliquam. Maecenas non odio ipsum, a elementum nisi. Mauris non erat eu erat placerat convallis. Mauris in pretium urna. Cras laoreet molestie odio, consequat consequat velit commodo eu. Integer vitae lectus ac nunc posuere pellentesque non at eros. Suspendisse non lectus lorem.' + portrait: jb_marie_crop.jpg + - + nom: 'Fabienne Dran' + fonction: 'Assistante de direction' + biographie: null + portrait: null + - + nom: 'Jérôme Candevan' + fonction: 'Responsable du service financier et facturier de l’EPAU, Agent comptable ENSA' + biographie: null + portrait: null +media_order: jb_marie_crop.jpg +--- + diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/02._direction-europan-france/personnes.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/02._direction-europan-france/personnes.md new file mode 100644 index 0000000..7627c00 --- /dev/null +++ b/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 +--- + diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/03._direction-popsu/personnes.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/03._direction-popsu/personnes.md new file mode 100644 index 0000000..06d2af8 --- /dev/null +++ b/user/pages/01.home/04._gouvernance/03._equipe-epau/03._direction-popsu/personnes.md @@ -0,0 +1,5 @@ +--- +title: 'direction POPSU' +body_classes: modular +--- + diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/04._direction-coubertin/personnes.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/04._direction-coubertin/personnes.md new file mode 100644 index 0000000..5a5f5db --- /dev/null +++ b/user/pages/01.home/04._gouvernance/03._equipe-epau/04._direction-coubertin/personnes.md @@ -0,0 +1,5 @@ +--- +title: 'direction Coubertin' +body_classes: modular +--- + diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/05._direction-forum-des-solutions/personnes.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/05._direction-forum-des-solutions/personnes.md new file mode 100644 index 0000000..5e27112 --- /dev/null +++ b/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 +--- + diff --git a/user/pages/01.home/04._gouvernance/03._equipe-epau/equipe-epau.md b/user/pages/01.home/04._gouvernance/03._equipe-epau/equipe-epau.md new file mode 100644 index 0000000..8071959 --- /dev/null +++ b/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 diff --git a/user/pages/01.home/04._gouvernance/gouvernance.md b/user/pages/01.home/04._gouvernance/gouvernance.md index e83ce96..5dcbfc6 100644 --- a/user/pages/01.home/04._gouvernance/gouvernance.md +++ b/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 diff --git a/user/pages/01.home/modular.md b/user/pages/01.home/modular.md index bba6a52..3bb70db 100644 --- a/user/pages/01.home/modular.md +++ b/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' diff --git a/user/themes/epau-antimatter/css-compiled/nucleus.css b/user/themes/epau-antimatter/css-compiled/nucleus.css index fe4c0bb..db9eea4 100644 --- a/user/themes/epau-antimatter/css-compiled/nucleus.css +++ b/user/themes/epau-antimatter/css-compiled/nucleus.css @@ -1,3 +1,624 @@ -*,*::before,*::after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-webkit-viewport{width:device-width}@-moz-viewport{width:device-width}@-ms-viewport{width:device-width}@-o-viewport{width:device-width}@viewport{width:device-width}html{font-size:100%;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent;text-decoration:none}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}mark{background:#ff0;color:#000}sub,sup{font-size:.75rem;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0}pre{overflow:auto}code,kbd,pre,samp{font-size:1rem}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0;table-layout:fixed;width:100%}tr,td,th{vertical-align:middle}th,td{padding:.425rem 0}th{text-align:left}.container{width:75em;margin:0 auto;padding:0}@media only all and (min-width: 60em) and (max-width: 74.938em){.container{width:60em}}@media only all and (min-width: 48em) and (max-width: 59.938em){.container{width:48em}}@media only all and (min-width: 30.063em) and (max-width: 47.938em){.container{width:30em}}@media only all and (max-width: 30em){.container{width:100%}}.grid{display:-webkit-box;display:-moz-box;display:box;display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row;-moz-flex-flow:row;flex-flow:row;list-style:none;margin:0;padding:0}@media only all and (max-width: 47.938em){.grid{-webkit-flex-flow:row wrap;-moz-flex-flow:row wrap;flex-flow:row wrap}}.block{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;-webkit-flex:1;-moz-flex:1;-ms-flex:1;flex:1;min-width:0;min-height:0}@media only all and (max-width: 47.938em){.block{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 100%;-moz-flex:0 100%;-ms-flex:0 100%;flex:0 100%}}.content{margin:.625rem;padding:.938rem}@media only all and (max-width: 47.938em){body [class*="size-"]{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 100%;-moz-flex:0 100%;-ms-flex:0 100%;flex:0 100%}}.size-1-2{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 50%;-moz-flex:0 50%;-ms-flex:0 50%;flex:0 50%}.size-1-3{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 33.33333%;-moz-flex:0 33.33333%;-ms-flex:0 33.33333%;flex:0 33.33333%}.size-1-4{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 25%;-moz-flex:0 25%;-ms-flex:0 25%;flex:0 25%}.size-1-5{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 20%;-moz-flex:0 20%;-ms-flex:0 20%;flex:0 20%}.size-1-6{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 16.66667%;-moz-flex:0 16.66667%;-ms-flex:0 16.66667%;flex:0 16.66667%}.size-1-7{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 14.28571%;-moz-flex:0 14.28571%;-ms-flex:0 14.28571%;flex:0 14.28571%}.size-1-8{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 12.5%;-moz-flex:0 12.5%;-ms-flex:0 12.5%;flex:0 12.5%}.size-1-9{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 11.11111%;-moz-flex:0 11.11111%;-ms-flex:0 11.11111%;flex:0 11.11111%}.size-1-10{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 10%;-moz-flex:0 10%;-ms-flex:0 10%;flex:0 10%}.size-1-11{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 9.09091%;-moz-flex:0 9.09091%;-ms-flex:0 9.09091%;flex:0 9.09091%}.size-1-12{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 8.33333%;-moz-flex:0 8.33333%;-ms-flex:0 8.33333%;flex:0 8.33333%}@media only all and (min-width: 48em) and (max-width: 59.938em){.size-tablet-1-2{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 50%;-moz-flex:0 50%;-ms-flex:0 50%;flex:0 50%}.size-tablet-1-3{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 33.33333%;-moz-flex:0 33.33333%;-ms-flex:0 33.33333%;flex:0 33.33333%}.size-tablet-1-4{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 25%;-moz-flex:0 25%;-ms-flex:0 25%;flex:0 25%}.size-tablet-1-5{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 20%;-moz-flex:0 20%;-ms-flex:0 20%;flex:0 20%}.size-tablet-1-6{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 16.66667%;-moz-flex:0 16.66667%;-ms-flex:0 16.66667%;flex:0 16.66667%}.size-tablet-1-7{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 14.28571%;-moz-flex:0 14.28571%;-ms-flex:0 14.28571%;flex:0 14.28571%}.size-tablet-1-8{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 12.5%;-moz-flex:0 12.5%;-ms-flex:0 12.5%;flex:0 12.5%}.size-tablet-1-9{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 11.11111%;-moz-flex:0 11.11111%;-ms-flex:0 11.11111%;flex:0 11.11111%}.size-tablet-1-10{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 10%;-moz-flex:0 10%;-ms-flex:0 10%;flex:0 10%}.size-tablet-1-11{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 9.09091%;-moz-flex:0 9.09091%;-ms-flex:0 9.09091%;flex:0 9.09091%}.size-tablet-1-12{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;-webkit-flex:0 8.33333%;-moz-flex:0 8.33333%;-ms-flex:0 8.33333%;flex:0 8.33333%}}@media only all and (max-width: 47.938em){@supports not (flex-wrap: wrap){.grid{display:block;-webkit-box-lines:inherit;-moz-box-lines:inherit;box-lines:inherit;-webkit-flex-wrap:inherit;-moz-flex-wrap:inherit;-ms-flex-wrap:inherit;flex-wrap:inherit}.block{display:block;-webkit-box-flex:inherit;-moz-box-flex:inherit;box-flex:inherit;-webkit-flex:inherit;-moz-flex:inherit;-ms-flex:inherit;flex:inherit}}}.first-block{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.last-block{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}.fixed-blocks{-webkit-flex-flow:row wrap;-moz-flex-flow:row wrap;flex-flow:row wrap}.fixed-blocks .block{-webkit-box-flex:inherit;-moz-box-flex:inherit;box-flex:inherit;-webkit-flex:inherit;-moz-flex:inherit;-ms-flex:inherit;flex:inherit;width:25%}@media only all and (min-width: 60em) and (max-width: 74.938em){.fixed-blocks .block{width:33.33333%}}@media only all and (min-width: 48em) and (max-width: 59.938em){.fixed-blocks .block{width:50%}}@media only all and (max-width: 47.938em){.fixed-blocks .block{width:100%}}@supports not (flex-wrap: wrap){.fixed-blocks{display:block;-webkit-flex-flow:inherit;-moz-flex-flow:inherit;flex-flow:inherit}}body{font-size:1rem;line-height:1.7}h1,h2,h3,h4,h5,h6{margin:.85rem 0 1.7rem 0;text-rendering:optimizeLegibility}h1{font-size:3.2rem}h2{font-size:2.5rem}h3{font-size:2.1rem}h4{font-size:1.75rem}h5{font-size:1.35rem}h6{font-size:.85rem}p{margin:1.7rem 0}ul,ol{margin-top:1.7rem;margin-bottom:1.7rem}ul ul,ul ol,ol ul,ol ol{margin-top:0;margin-bottom:0}blockquote{margin:1.7rem 0;padding-left:.85rem}cite{display:block;font-size:.875rem}cite:before{content:"\2014 \0020"}pre{margin:1.7rem 0;padding:.938rem}code{vertical-align:bottom}small{font-size:.875rem}hr{border-left:none;border-right:none;border-top:none;margin:1.7rem 0}fieldset{border:0;padding:.938rem;margin:0 0 1.7rem 0}input,label,select{display:block}label{margin-bottom:.425rem}label.required:after{content:"*"}label abbr{display:none}textarea,input[type="email"],input[type="number"],input[type="password"],input[type="search"],input[type="tel"],input[type="text"],input[type="url"],input[type="color"],input[type="date"],input[type="datetime"],input[type="datetime-local"],input[type="month"],input[type="time"],input[type="week"],select[multiple=multiple]{-webkit-transition:border-color;-moz-transition:border-color;transition:border-color;border-radius:.1875rem;margin-bottom:.85rem;padding:.425rem .425rem;width:100%}textarea:focus,input[type="email"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="text"]:focus,input[type="url"]:focus,input[type="color"]:focus,input[type="date"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,select[multiple=multiple]:focus{outline:none}textarea{resize:vertical}input[type="checkbox"],input[type="radio"]{display:inline;margin-right:.425rem}input[type="file"]{width:100%}select{width:auto;max-width:100%;margin-bottom:1.7rem}button,input[type="submit"]{cursor:pointer;user-select:none;vertical-align:middle;white-space:nowrap;border:inherit} +*, *::before, *::after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } -/*# sourceMappingURL=nucleus.css.map */ \ No newline at end of file +@-webkit-viewport { + width: device-width; } + +@-moz-viewport { + width: device-width; } + +@-ms-viewport { + width: device-width; } + +@-o-viewport { + width: device-width; } + +@viewport { + width: device-width; } + +html { + font-size: 100%; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } + +body { + margin: 0; } + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; } + +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; } + +audio:not([controls]) { + display: none; + height: 0; } + +[hidden], +template { + display: none; } + +a { + background: transparent; + text-decoration: none; } + +a:active, +a:hover { + outline: 0; } + +abbr[title] { + border-bottom: 1px dotted; } + +b, +strong { + font-weight: bold; } + +dfn { + font-style: italic; } + +mark { + background: #ff0; + color: #000; } + +sub, +sup { + font-size: 0.75rem; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +img { + border: 0; + max-width: 100%; } + +svg:not(:root) { + overflow: hidden; } + +figure { + margin: 1em 40px; } + +hr { + height: 0; } + +pre { + overflow: auto; } + +code, +kbd, +pre, +samp { + font-size: 1rem; } + +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; } + +button { + overflow: visible; } + +button, +select { + text-transform: none; } + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; } + +button[disabled], +html input[disabled] { + cursor: default; } + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; } + +input { + line-height: normal; } + +input[type="checkbox"], +input[type="radio"] { + padding: 0; } + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; } + +input[type="search"] { + -webkit-appearance: textfield; } + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +legend { + border: 0; + padding: 0; } + +textarea { + overflow: auto; } + +optgroup { + font-weight: bold; } + +table { + border-collapse: collapse; + border-spacing: 0; + table-layout: fixed; + width: 100%; } + +tr, td, th { + vertical-align: middle; } + +th, td { + padding: 0.425em 0; } + +th { + text-align: left; } + +.container { + width: 75em; + margin: 0 auto; + padding: 0; } + @media only all and (min-width: 60em) and (max-width: 74.938em) { + .container { + width: 60em; } } + @media only all and (min-width: 48em) and (max-width: 59.938em) { + .container { + width: 48em; } } + @media only all and (min-width: 30.063em) and (max-width: 47.938em) { + .container { + width: 30em; } } + @media only all and (max-width: 30em) { + .container { + width: 100%; } } + +.grid { + display: -webkit-box; + display: -moz-box; + display: box; + display: -webkit-flex; + display: -moz-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-flow: row; + -moz-flex-flow: row; + flex-flow: row; + list-style: none; + margin: 0; + padding: 0; } + @media only all and (max-width: 47.938em) { + .grid { + -webkit-flex-flow: row wrap; + -moz-flex-flow: row wrap; + flex-flow: row wrap; } } + +.block { + -webkit-box-flex: 1; + -moz-box-flex: 1; + box-flex: 1; + -webkit-flex: 1; + -moz-flex: 1; + -ms-flex: 1; + flex: 1; + min-width: 0; + min-height: 0; } + @media only all and (max-width: 47.938em) { + .block { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 100%; + -moz-flex: 0 100%; + -ms-flex: 0 100%; + flex: 0 100%; } } + +.content { + margin: 0.625rem; + padding: 0.938rem; } + +@media only all and (max-width: 47.938em) { + body [class*="size-"] { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 100%; + -moz-flex: 0 100%; + -ms-flex: 0 100%; + flex: 0 100%; } } + +.size-1-2 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 50%; + -moz-flex: 0 50%; + -ms-flex: 0 50%; + flex: 0 50%; } + +.size-1-3 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 33.33333%; + -moz-flex: 0 33.33333%; + -ms-flex: 0 33.33333%; + flex: 0 33.33333%; } + +.size-1-4 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 25%; + -moz-flex: 0 25%; + -ms-flex: 0 25%; + flex: 0 25%; } + +.size-1-5 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 20%; + -moz-flex: 0 20%; + -ms-flex: 0 20%; + flex: 0 20%; } + +.size-1-6 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 16.66667%; + -moz-flex: 0 16.66667%; + -ms-flex: 0 16.66667%; + flex: 0 16.66667%; } + +.size-1-7 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 14.28571%; + -moz-flex: 0 14.28571%; + -ms-flex: 0 14.28571%; + flex: 0 14.28571%; } + +.size-1-8 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 12.5%; + -moz-flex: 0 12.5%; + -ms-flex: 0 12.5%; + flex: 0 12.5%; } + +.size-1-9 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 11.11111%; + -moz-flex: 0 11.11111%; + -ms-flex: 0 11.11111%; + flex: 0 11.11111%; } + +.size-1-10 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 10%; + -moz-flex: 0 10%; + -ms-flex: 0 10%; + flex: 0 10%; } + +.size-1-11 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 9.09091%; + -moz-flex: 0 9.09091%; + -ms-flex: 0 9.09091%; + flex: 0 9.09091%; } + +.size-1-12 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 8.33333%; + -moz-flex: 0 8.33333%; + -ms-flex: 0 8.33333%; + flex: 0 8.33333%; } + +@media only all and (min-width: 48em) and (max-width: 59.938em) { + .size-tablet-1-2 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 50%; + -moz-flex: 0 50%; + -ms-flex: 0 50%; + flex: 0 50%; } + .size-tablet-1-3 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 33.33333%; + -moz-flex: 0 33.33333%; + -ms-flex: 0 33.33333%; + flex: 0 33.33333%; } + .size-tablet-1-4 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 25%; + -moz-flex: 0 25%; + -ms-flex: 0 25%; + flex: 0 25%; } + .size-tablet-1-5 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 20%; + -moz-flex: 0 20%; + -ms-flex: 0 20%; + flex: 0 20%; } + .size-tablet-1-6 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 16.66667%; + -moz-flex: 0 16.66667%; + -ms-flex: 0 16.66667%; + flex: 0 16.66667%; } + .size-tablet-1-7 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 14.28571%; + -moz-flex: 0 14.28571%; + -ms-flex: 0 14.28571%; + flex: 0 14.28571%; } + .size-tablet-1-8 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 12.5%; + -moz-flex: 0 12.5%; + -ms-flex: 0 12.5%; + flex: 0 12.5%; } + .size-tablet-1-9 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 11.11111%; + -moz-flex: 0 11.11111%; + -ms-flex: 0 11.11111%; + flex: 0 11.11111%; } + .size-tablet-1-10 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 10%; + -moz-flex: 0 10%; + -ms-flex: 0 10%; + flex: 0 10%; } + .size-tablet-1-11 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 9.09091%; + -moz-flex: 0 9.09091%; + -ms-flex: 0 9.09091%; + flex: 0 9.09091%; } + .size-tablet-1-12 { + -webkit-box-flex: 0; + -moz-box-flex: 0; + box-flex: 0; + -webkit-flex: 0 8.33333%; + -moz-flex: 0 8.33333%; + -ms-flex: 0 8.33333%; + flex: 0 8.33333%; } } + +@media only all and (max-width: 47.938em) { + @supports not (flex-wrap: wrap) { + .grid { + display: block; + -webkit-box-lines: inherit; + -moz-box-lines: inherit; + box-lines: inherit; + -webkit-flex-wrap: inherit; + -moz-flex-wrap: inherit; + -ms-flex-wrap: inherit; + flex-wrap: inherit; } + .block { + display: block; + -webkit-box-flex: inherit; + -moz-box-flex: inherit; + box-flex: inherit; + -webkit-flex: inherit; + -moz-flex: inherit; + -ms-flex: inherit; + flex: inherit; } } } + +.first-block { + -webkit-box-ordinal-group: 0; + -webkit-order: -1; + -ms-flex-order: -1; + order: -1; } + +.last-block { + -webkit-box-ordinal-group: 2; + -webkit-order: 1; + -ms-flex-order: 1; + order: 1; } + +.fixed-blocks { + -webkit-flex-flow: row wrap; + -moz-flex-flow: row wrap; + flex-flow: row wrap; } + .fixed-blocks .block { + -webkit-box-flex: inherit; + -moz-box-flex: inherit; + box-flex: inherit; + -webkit-flex: inherit; + -moz-flex: inherit; + -ms-flex: inherit; + flex: inherit; + width: 25%; } + @media only all and (min-width: 60em) and (max-width: 74.938em) { + .fixed-blocks .block { + width: 33.33333%; } } + @media only all and (min-width: 48em) and (max-width: 59.938em) { + .fixed-blocks .block { + width: 50%; } } + @media only all and (max-width: 47.938em) { + .fixed-blocks .block { + width: 100%; } } + +@supports not (flex-wrap: wrap) { + .fixed-blocks { + display: block; + -webkit-flex-flow: inherit; + -moz-flex-flow: inherit; + flex-flow: inherit; } } + +body { + font-size: 1rem; + line-height: 1.7; } + +h1, h2, h3, h4, h5, h6 { + margin: 0.85em 0 1.7em 0; + text-rendering: optimizeLegibility; } + +h1 { + font-size: 3rem; } + +h2 { + font-size: 2.3rem; } + +h3 { + font-size: 2rem; } + +h4 { + font-size: 1.65rem; } + +h5 { + font-size: 1.25rem; } + +h6 { + font-size: 0.9rem; } + +p { + margin: 1.7em 0; } + +ul, ol { + margin-top: 1.7em; + margin-bottom: 1.7em; } + ul ul, ul ol, ol ul, ol ol { + margin-top: 0; + margin-bottom: 0; } + +blockquote { + margin: 1.7em 0; + padding-left: 0.85em; } + +cite { + display: block; + font-size: 0.875rem; } + cite:before { + content: "\2014 \0020"; } + +pre { + margin: 1.7em 0; + padding: 0.938rem; } + +code { + vertical-align: bottom; } + +small { + font-size: 0.875rem; } + +hr { + border-left: none; + border-right: none; + border-top: none; + margin: 1.7em 0; } + +fieldset { + border: 0; + padding: 0.938rem; + margin: 0 0 1.7em 0; } + +input, +label, +select { + display: block; } + +label { + margin-bottom: 0.425em; } + label.required:after { + content: "*"; } + label abbr { + display: none; } + +textarea, input[type="email"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="url"], input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="time"], input[type="week"], select[multiple=multiple] { + -webkit-transition: border-color; + -moz-transition: border-color; + transition: border-color; + border-radius: 0.1875rem; + margin-bottom: 0.85em; + padding: 0.425em 0.425em; + width: 100%; } + textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus { + outline: none; } + +textarea { + resize: vertical; } + +input[type="checkbox"], input[type="radio"] { + display: inline; + margin-right: 0.425em; } + +input[type="file"] { + width: 100%; } + +select { + width: auto; + max-width: 100%; + margin-bottom: 1.7em; } + +button, +input[type="submit"] { + cursor: pointer; + user-select: none; + vertical-align: middle; + white-space: nowrap; + border: inherit; } diff --git a/user/themes/epau-antimatter/css-compiled/template.css b/user/themes/epau-antimatter/css-compiled/template.css index f55ad99..ae5cc46 100644 --- a/user/themes/epau-antimatter/css-compiled/template.css +++ b/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; diff --git a/user/themes/epau-antimatter/css/custom.css b/user/themes/epau-antimatter/css/custom.css index 421819f..96872b5 100644 --- a/user/themes/epau-antimatter/css/custom.css +++ b/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; } diff --git a/user/themes/epau-antimatter/fonts/fonts.css b/user/themes/epau-antimatter/fonts/fonts.css index 1470e09..c5d18c4 100644 --- a/user/themes/epau-antimatter/fonts/fonts.css +++ b/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; } diff --git a/user/themes/epau-antimatter/scss/configuration/nucleus/_typography.scss b/user/themes/epau-antimatter/scss/configuration/nucleus/_typography.scss index 09a3e9b..ae4825c 100644 --- a/user/themes/epau-antimatter/scss/configuration/nucleus/_typography.scss +++ b/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; diff --git a/user/themes/epau-antimatter/scss/configuration/template/_typography.scss b/user/themes/epau-antimatter/scss/configuration/template/_typography.scss index 0b9b693..2aa2c04 100644 --- a/user/themes/epau-antimatter/scss/configuration/template/_typography.scss +++ b/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; diff --git a/user/themes/epau-antimatter/scss/configuration/template/_variables.scss b/user/themes/epau-antimatter/scss/configuration/template/_variables.scss index 48fc717..1e7fd88 100644 --- a/user/themes/epau-antimatter/scss/configuration/template/_variables.scss +++ b/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; diff --git a/user/themes/epau-antimatter/scss/template/_header.scss b/user/themes/epau-antimatter/scss/template/_header.scss index 358dae8..d42c3c5 100644 --- a/user/themes/epau-antimatter/scss/template/_header.scss +++ b/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 { diff --git a/user/themes/epau-antimatter/scss/template/_typography.scss b/user/themes/epau-antimatter/scss/template/_typography.scss index 7e8f250..efa24ea 100644 --- a/user/themes/epau-antimatter/scss/template/_typography.scss +++ b/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; } diff --git a/user/themes/epau-antimatter/templates/modular.html.twig b/user/themes/epau-antimatter/templates/modular.html.twig index fb7491e..aa5c5fa 100644 --- a/user/themes/epau-antimatter/templates/modular.html.twig +++ b/user/themes/epau-antimatter/templates/modular.html.twig @@ -27,6 +27,9 @@ {% endblock %} {% block header_navigation %} + + + {% if show_onpage_menu %}