diff --git a/fixperms.sh b/fixperms.sh old mode 100755 new mode 100644 diff --git a/user/pages/01.home/default.md b/user/pages/01.home/default.md index c2a67ee..4d9ba06 100644 --- a/user/pages/01.home/default.md +++ b/user/pages/01.home/default.md @@ -3,5 +3,4 @@ title: Home body_classes: 'title-center title-h1h2' --- -Figures Libres est un [collectif](http://dev.figureslibres.net/collectif) né de la rencontre de deux démarches citoyennes : porter des messages d'utilité [publique](http://dev.figureslibres.net/projets/tag:publique#body-wrapper), [sociale](http://dev.figureslibres.net/projets/tag:sociale#body-wrapper) et [culturelle](http://dev.figureslibres.net/projets/tag:culturelle#body-wrapper) ; Œuvrer sur [logiciels libres](http://dev.figureslibres.net/logiciels-libres) pour créer sans consommer et libérer l'information. -Nous sommes graphistes, développeurs, designers, photographes, artistes, enseignant⋅e⋅s, militant⋅e⋅s… et croisons nos pratiques et compétences pour avancer plus loin à plusieurs. Convaincu⋅e⋅s que la création est un outil démocratique, nous partageons les convictions de nos [commanditaires](http://dev.figureslibres.net/commanditaires). Nous préférons maîtriser [nos outils](http://dev.figureslibres.net/nos-outils), plutôt que l'inverse, les adapter à nos envies et à vos besoins. Comme nous sommes joueur⋅euse⋅s et utopistes nous aimons les construire avec vous et les partager avec tous. Votre projet sera un site, une affiche, une campagne, une application, un livre, une exposition, une manifestation… tant mieux ! nous n'aimons pas les réponses toutes faites ; mais bien faites. \ No newline at end of file +**Figures Libres** est un collectif né de la rencontre de deux démarches citoyennes : porter des messages d'utilité [publique](/projets/publique), [sociale](/projets/sociale) et [culturelle](/projets/culturelle) ; Œuvrer sur logiciels libres pour créer sans consommer et libérer l'information. Nous sommes graphistes, développeurs, designers, photographes, artistes, enseignant⋅e⋅s, militant⋅e⋅s… et croisons nos pratiques et compétences pour avancer plus loin à plusieurs. Convaincu⋅e⋅s que la création est un outil démocratique, nous partageons les convictions de nos commanditaires. Nous préférons maîtriser nos outils, plutôt que l'inverse, les adapter à nos envies et à vos besoins. Comme nous sommes joueur⋅euse⋅s et utopistes nous aimons les construire avec vous et les partager avec tous. Votre projet sera un site, une affiche, une campagne, une application, un livre, une exposition, une manifestation… tant mieux ! nous n'aimons pas les réponses toutes faites ; mais bien faites. diff --git a/user/pages/02.projets/culturelle/blog.md b/user/pages/02.projets/culturelle/blog.md new file mode 100644 index 0000000..cc38d96 --- /dev/null +++ b/user/pages/02.projets/culturelle/blog.md @@ -0,0 +1,13 @@ +--- +title: Culturelle +content: + items: + - '@self.children' + limit: 0 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/02.projets/culturelle/encyclopedie-de-la-parole/1.jpg b/user/pages/02.projets/culturelle/encyclopedie-de-la-parole/1.jpg new file mode 100644 index 0000000..14fcfe7 Binary files /dev/null and b/user/pages/02.projets/culturelle/encyclopedie-de-la-parole/1.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-3/item.md b/user/pages/02.projets/culturelle/encyclopedie-de-la-parole/projet.md similarity index 80% rename from user/pages/02.projets/tous-des-sang-meles-3/item.md rename to user/pages/02.projets/culturelle/encyclopedie-de-la-parole/projet.md index 4c564df..cd30566 100644 --- a/user/pages/02.projets/tous-des-sang-meles-3/item.md +++ b/user/pages/02.projets/culturelle/encyclopedie-de-la-parole/projet.md @@ -1,16 +1,19 @@ --- +date: '02-01-2018 20:51' title: 'L’Encyclopédie de la Parole' +media_order: 1.jpg taxonomy: category: - 'Site web' tag: - - culturelle + - 'Encyclopédie de la Parole' + - 'Echelle 1:1' --- Refonte du siite internet -L’Encyclopédie de la parole est un collectif né en 2007 aux Laboratoires d’Aubervilliers. Depuis plus de 10 ans, elle récolte des enregistrements de paroles qu’elle met en regard au sein d’une collection ordonnée par phénomènes (Compression, Plis, Alternance, Mélodie, Cadence, Projection, Résidus..). En regard également sous forme de performances, de spectacles, d’analyses et de jeux. -L’ensemble de la collection est publié sur une plate-forme internet dédiée, dont la navigation permet la consultation de plus de 1000 sons répertoriés. +L’Encyclopédie de la parole est un collectif né en 2007 aux Laboratoires d’Aubervilliers. Depuis plus de 10 ans, elle récolte des enregistrements de paroles qu’elle met en regard au sein d’une collection ordonnée par phénomènes (Compression, Plis, Alternance, Mélodie, Cadence, Projection, Résidus..). En regard également sous forme de performances, de spectacles, d’analyses et de jeux. +L’ensemble de la collection est publié sur une plate-forme internet dédiée, dont la navigation permet la consultation de plus de 1000 sons répertoriés. Un travail d’orfèvre de Bachir Soussi-Chiadmi pour le développement, accompagné de Maud Boyer et de Kevin Tessier pour la refonte graphique. -www.encyclopediedelaparole.org \ No newline at end of file +www.encyclopediedelaparole.org diff --git a/user/pages/02.projets/culturelle/ethica/OSC_2810.jpg b/user/pages/02.projets/culturelle/ethica/OSC_2810.jpg new file mode 100644 index 0000000..4fd9910 Binary files /dev/null and b/user/pages/02.projets/culturelle/ethica/OSC_2810.jpg differ diff --git a/user/pages/02.projets/culturelle/ethica/projet.md b/user/pages/02.projets/culturelle/ethica/projet.md new file mode 100644 index 0000000..e97ca92 --- /dev/null +++ b/user/pages/02.projets/culturelle/ethica/projet.md @@ -0,0 +1,17 @@ +--- +date: '30-05-2018 19:27' +title: Ethica +media_order: OSC_2810.jpg +taxonomy: + category: + - 'Site web' + tag: + - 'Patrick Fontana' +--- + +Site web et application + +Conception d’un site et d’une application qui propose une version numérique et augmentée de l’Éthique de Spinoza. Grâce à une visualisation inédite du texte, l’application Ethica rend visible le réseau démonstratif de l’œuvre. L’utilisateur peut voir et lire librement le texte, l’explorer de façon simple et intuitive. +http://ethica-spinoza.net/fr +http://app.ethica-spinoza.net/fr/connections +Création graphique Kevin Tessier et Bachir Soussi Chiadmi ; Développement du site vitrine Kevin Tessier ; développement de l’application Bachir Soussi Chiadmi diff --git a/user/pages/02.projets/tous-des-sang-meles-4/2.jpg b/user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/2.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-4/2.jpg rename to user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/2.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-4/3.jpg b/user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/3.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-4/3.jpg rename to user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/3.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-4/4.jpg b/user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/4.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-4/4.jpg rename to user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/4.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-4/item.md b/user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/projet.md similarity index 83% rename from user/pages/02.projets/tous-des-sang-meles-4/item.md rename to user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/projet.md index ee8e890..5a0f1a4 100644 --- a/user/pages/02.projets/tous-des-sang-meles-4/item.md +++ b/user/pages/02.projets/culturelle/les-spectacles-de-lencyclopedie/projet.md @@ -1,11 +1,13 @@ --- +date: '11-07-2018 20:51' title: 'Les spectacles de l’Encyclopédie' media_order: '1.jpg,2.jpg,3.jpg,4.jpg' taxonomy: category: - Éditions tag: - - culturelle + - 'Encyclopédie de la Parole' + - 'Echelle 1:1' --- Dépliant de présentation @@ -15,4 +17,4 @@ Encyclopédie de la Parole / Echelle 1:1 Dépliant de présentation des productions de l’Encyclopédie de la parole, édité à l’occasion du lancement de la nouvelle plate-forme à la Gaité Lyrique. Création et maquette par Kevin Tessier -Fabriqué par nos soins sous Scribus et Gimp pour la retouche image. \ No newline at end of file +Fabriqué par nos soins sous Scribus et Gimp pour la retouche image. diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2861.jpg b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2861.jpg new file mode 100644 index 0000000..6b53644 Binary files /dev/null and b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2861.jpg differ diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2873.jpg b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2873.jpg new file mode 100644 index 0000000..0a1eedc Binary files /dev/null and b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2873.jpg differ diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2884.jpg b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2884.jpg new file mode 100644 index 0000000..5338bed Binary files /dev/null and b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2884.jpg differ diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2909.jpg b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2909.jpg new file mode 100644 index 0000000..a7a9b13 Binary files /dev/null and b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2909.jpg differ diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2913.jpg b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2913.jpg new file mode 100644 index 0000000..62f4043 Binary files /dev/null and b/user/pages/02.projets/culturelle/obscurity-of-light/OSC_2913.jpg differ diff --git a/user/pages/02.projets/culturelle/obscurity-of-light/projet.md b/user/pages/02.projets/culturelle/obscurity-of-light/projet.md new file mode 100644 index 0000000..b96ea87 --- /dev/null +++ b/user/pages/02.projets/culturelle/obscurity-of-light/projet.md @@ -0,0 +1,12 @@ +--- +date: '06-06-2017 19:08' +title: 'Obscurity of Light' +media_order: 'OSC_2861.jpg,OSC_2873.jpg,OSC_2884.jpg,OSC_2909.jpg,OSC_2913.jpg' +taxonomy: + category: + - Éditions + tag: + - 'Rémy Gauche' +--- + +Pochette de l‘album diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2539.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2539.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2539.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2539.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2614_01.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2614_01.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2614_01.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2614_01.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2618_01.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2618_01.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2618_01.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2618_01.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2625_02.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2625_02.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2625_02.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2625_02.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2649.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2649.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2649.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2649.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2672.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2672.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2672.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2672.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/OSC_2703_01.jpg b/user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2703_01.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles/OSC_2703_01.jpg rename to user/pages/02.projets/culturelle/tous-des-sang-meles/OSC_2703_01.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles/item.md b/user/pages/02.projets/culturelle/tous-des-sang-meles/projet.md similarity index 95% rename from user/pages/02.projets/tous-des-sang-meles/item.md rename to user/pages/02.projets/culturelle/tous-des-sang-meles/projet.md index 9db88a7..417a1d0 100644 --- a/user/pages/02.projets/tous-des-sang-meles/item.md +++ b/user/pages/02.projets/culturelle/tous-des-sang-meles/projet.md @@ -1,11 +1,12 @@ --- +date: '06-07-2017 20:53' title: 'Tous, des sang-mêlés' media_order: 'OSC_2566.jpg,OSC_2539.jpg,OSC_2703_01.jpg,OSC_2614_01.jpg,OSC_2618_01.jpg,OSC_2625_02.jpg,OSC_2649.jpg,OSC_2672.jpg' taxonomy: category: - Éditions tag: - - culturelle + - 'MAC VAL' --- Catalogue d’exposition diff --git a/user/pages/02.projets/logo-du-ceras/item.md b/user/pages/02.projets/logo-du-ceras/item.md new file mode 100644 index 0000000..9eb84b0 --- /dev/null +++ b/user/pages/02.projets/logo-du-ceras/item.md @@ -0,0 +1,13 @@ +--- +title: 'Logo du Ceras' +taxonomy: + category: + - 'Identité visuelle' + - 'Site web' +--- + +Identité visuelle + +Refonte de l’identité du CERAS (Centre de Recherche et d’Action Sociales). Le centre regroupe plusieurs missions : la revue Projet, la Doctrine Sociale de l’Église et la formation. Une identité actualisée, pensée pour être déclinée sur les différentes missions. Site de la Doctrine Sociale et brochure des formations développés sur cette nouvelle identité. +www.doctrine-sociale-catholique.fr +Création graphique de Maud Boyer et Sandrine Ripoll en collaboration avec l’agence Aouka pour le développement du site. \ No newline at end of file diff --git a/user/pages/02.projets/nom-du-projets/item.md b/user/pages/02.projets/nom-du-projets/item.md deleted file mode 100644 index 7126bdf..0000000 --- a/user/pages/02.projets/nom-du-projets/item.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: 'Nom du projets' ---- - -blablablablabla -blablablabla -blablabla -blablabla \ No newline at end of file diff --git a/user/pages/02.projets/publique/blog.md b/user/pages/02.projets/publique/blog.md new file mode 100644 index 0000000..e7f317b --- /dev/null +++ b/user/pages/02.projets/publique/blog.md @@ -0,0 +1,13 @@ +--- +title: Publique +content: + items: + - '@self.children' + limit: 0 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2737.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2737.jpg new file mode 100755 index 0000000..0068bb5 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2737.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2765.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2765.jpg new file mode 100755 index 0000000..7cfa140 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2765.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2789.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2789.jpg new file mode 100755 index 0000000..8821ab8 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2789.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2803.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2803.jpg new file mode 100755 index 0000000..a5d85ac Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2803.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2810.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2810.jpg new file mode 100755 index 0000000..4fd9910 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2810.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2831.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2831.jpg new file mode 100755 index 0000000..597639e Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2831.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2838.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2838.jpg new file mode 100755 index 0000000..cc3dfc3 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2838.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2859.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2859.jpg new file mode 100755 index 0000000..779e338 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2859.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2873.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2873.jpg new file mode 100755 index 0000000..6cb02c7 Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2873.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/OSC_2894.jpg b/user/pages/02.projets/publique/gost-2017/OSC_2894.jpg new file mode 100755 index 0000000..927863b Binary files /dev/null and b/user/pages/02.projets/publique/gost-2017/OSC_2894.jpg differ diff --git a/user/pages/02.projets/publique/gost-2017/projet.md b/user/pages/02.projets/publique/gost-2017/projet.md new file mode 100755 index 0000000..d954a26 --- /dev/null +++ b/user/pages/02.projets/publique/gost-2017/projet.md @@ -0,0 +1,15 @@ +--- +date: '06-07-2017 20:55' +title: 'GOST 2017' +media_order: 'OSC_2737.jpg,OSC_2765.jpg,OSC_2789.jpg,OSC_2803.jpg,OSC_2810.jpg,OSC_2831.jpg,OSC_2838.jpg,OSC_2873.jpg,OSC_2859.jpg,OSC_2894.jpg' +taxonomy: + category: + - Éditions + tag: + - 'LGM / SNCF Réseau' +--- + +Catalogue + +Conception du catalogue des statistiques d'utilisation de l'outil de gestion GOST, développé par les ingénieurs de l’agence LGM pour optimiser l’usage des voies de service de la SNCF par les entreprises ferroviaires. +Un travail titanesque de capitalisation de données complexes à traduire visuellement afin de les rendre compréhensible par l’ensemble des agents. Un défi relevé en duo par Maud Boyer pour la maquette et Ouidade Soussi Chiadmi pour la réalisation des graphiques. diff --git a/user/pages/02.projets/publique/ivry-en-fete/projet.md b/user/pages/02.projets/publique/ivry-en-fete/projet.md new file mode 100644 index 0000000..33fe7f1 --- /dev/null +++ b/user/pages/02.projets/publique/ivry-en-fete/projet.md @@ -0,0 +1,13 @@ +--- +date: '06-06-2017 20:56' +title: 'Ivry en Fête' +taxonomy: + category: + - Scénographie + tag: + - Ivry-sur-Seine +--- + +Scénographie du stand municipal + +Stand municipal de la ville à l’occasion d’Ivry en fête. 100 m² d’exposition pour présenter la diversité du service public et la politique internationale de la ville. Cinq « totems » à manipuler pour visualiser les différents métiers des agents municipaux, support d’animation carte du monde, passe-tête ludique et mobilier en palette. Une joyeuse co-conception / réalisation entre Sandrine Ripoll, Isabelle Guénot et le collectif « Au fond à gauche ». diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2920.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2920.jpg new file mode 100644 index 0000000..8a95f47 Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2920.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2922.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2922.jpg new file mode 100644 index 0000000..01ffc72 Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2922.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2924.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2924.jpg new file mode 100644 index 0000000..5deb031 Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2924.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2928.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2928.jpg new file mode 100644 index 0000000..951828a Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2928.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2931.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2931.jpg new file mode 100644 index 0000000..9b4182d Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2931.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2939.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2939.jpg new file mode 100644 index 0000000..7093029 Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2939.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2949.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2949.jpg new file mode 100644 index 0000000..6d13ecb Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2949.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2953.jpg b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2953.jpg new file mode 100644 index 0000000..01a6bb0 Binary files /dev/null and b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/OSC_2953.jpg differ diff --git a/user/pages/02.projets/publique/on-fait-quoi-cet-ete/projet.md b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/projet.md new file mode 100644 index 0000000..bb7b92e --- /dev/null +++ b/user/pages/02.projets/publique/on-fait-quoi-cet-ete/projet.md @@ -0,0 +1,15 @@ +--- +date: '02-03-2017 20:56' +title: "On fait quoi cet été\_?" +media_order: 'OSC_2953.jpg,OSC_2949.jpg,OSC_2939.jpg,OSC_2931.jpg,OSC_2928.jpg,OSC_2924.jpg,OSC_2922.jpg,OSC_2920.jpg' +taxonomy: + category: + - 'Campagne de communication' + tag: + - Montigny-lès-Cormeilles +--- + +Campagne de communication + +Déclinaisons d’affiches thématiques pour la campagne d’été de la ville. +Conception graphique et maquette Sandrine Ripoll diff --git a/user/pages/02.projets/nom-du-projets/OSC_3084.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3084.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/nom-du-projets/OSC_3084.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3084.jpg diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3102.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3102.jpg new file mode 100755 index 0000000..567f9a4 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3102.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3109.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3109.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3109.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3109.jpg diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3115.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3115.jpg new file mode 100755 index 0000000..8996b5b Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3115.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3122.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3122.jpg new file mode 100755 index 0000000..df74699 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3122.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3124.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3124.jpg new file mode 100755 index 0000000..29c48c9 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3124.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3126.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3126.jpg new file mode 100755 index 0000000..0b23556 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3126.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3128.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3128.jpg new file mode 100755 index 0000000..7e07f29 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3128.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3133.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3133.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3133.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3133.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3151.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3151.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3151.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3151.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3159.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3159.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3159.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3159.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3166.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3166.jpg old mode 100644 new mode 100755 similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3166.jpg rename to user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3166.jpg diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3170.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3170.jpg new file mode 100755 index 0000000..f438784 Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3170.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3178.jpg b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3178.jpg new file mode 100755 index 0000000..8f26d0f Binary files /dev/null and b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/OSC_3178.jpg differ diff --git a/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/projet.md b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/projet.md new file mode 100755 index 0000000..d67fe9b --- /dev/null +++ b/user/pages/02.projets/publique/programme-popsu-plate-forme-d'observation-des-projets-et-strategies-urbaines/projet.md @@ -0,0 +1,15 @@ +--- +date: '07-04-2017 20:57' +title: 'Programme POPSU (plate-forme d’observation des projets et stratégies urbaines)' +media_order: 'OSC_3124.jpg,OSC_3084.jpg,OSC_3102.jpg,OSC_3109.jpg,OSC_3115.jpg,OSC_3122.jpg,OSC_3126.jpg,OSC_3128.jpg,OSC_3133.jpg,OSC_3151.jpg,OSC_3159.jpg,OSC_3166.jpg,OSC_3170.jpg,OSC_3178.jpg' +taxonomy: + category: + - Éditions + tag: + - 'POPSU / PUCA' +--- + +Identité visuelle, et édition + +Identité globale des supports de communication pour l’ensemble des six programmes de recherche de la plate-forme POPSU (Plateforme d’Observation des Projets et Stratégies Urbaines – Ministère de la transition écologique et solidaire /Ministère de la cohésion des territoires et des relations avec les collectivités territoriales / Ministère de la culture/ PUCA) +Conception graphique et maquette Maud Boyer secondée par Simon Ruaut pour la plaquette générale diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/decaux25%_HD_1.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/decaux25%_HD_1.jpg new file mode 100644 index 0000000..5cf4586 Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/decaux25%_HD_1.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/dessiner40x60_defBD_1.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/dessiner40x60_defBD_1.jpg new file mode 100644 index 0000000..bf8cb42 Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/dessiner40x60_defBD_1.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/projet.md b/user/pages/02.projets/publique/un-ete-pour-sevader/projet.md new file mode 100644 index 0000000..f36b34e --- /dev/null +++ b/user/pages/02.projets/publique/un-ete-pour-sevader/projet.md @@ -0,0 +1,15 @@ +--- +date: '29-05-2018 20:58' +title: 'Un été pour s’évader' +media_order: 'decaux25%_HD_1.jpg,dessiner40x60_defBD_1.jpg,serie40x60_IMP_1.jpg,serie40x60_IMP_2.jpg,rever40x60_IMP_1.jpg,serie40x60_IMP_4.jpg,serie40x60_IMP_3.jpg' +taxonomy: + category: + - 'Campagne de communication' + tag: + - Montigny-lès-Cormeilles +--- + +Campagne de communication + +Déclinaisons d’affiches thématiques pour la campagne d’été de la ville. +Conception graphique et maquette Sandrine Ripoll et Maud Boyer, prises de vue et retouche photo par Ouidade Soussi-chiadmi diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/rever40x60_IMP_1.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/rever40x60_IMP_1.jpg new file mode 100644 index 0000000..8d1e616 Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/rever40x60_IMP_1.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_1.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_1.jpg new file mode 100644 index 0000000..f856b1d Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_1.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_2.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_2.jpg new file mode 100644 index 0000000..36c0634 Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_2.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_3.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_3.jpg new file mode 100644 index 0000000..b3411db Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_3.jpg differ diff --git a/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_4.jpg b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_4.jpg new file mode 100644 index 0000000..432cc0c Binary files /dev/null and b/user/pages/02.projets/publique/un-ete-pour-sevader/serie40x60_IMP_4.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3084.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3084.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3084.jpg rename to user/pages/02.projets/sociale/ programme-popsu/OSC_3084.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3087.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3087.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3087.jpg rename to user/pages/02.projets/sociale/ programme-popsu/OSC_3087.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3094.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3094.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3094.jpg rename to user/pages/02.projets/sociale/ programme-popsu/OSC_3094.jpg diff --git a/user/pages/02.projets/sociale/ programme-popsu/OSC_3109.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3109.jpg new file mode 100644 index 0000000..7bda571 Binary files /dev/null and b/user/pages/02.projets/sociale/ programme-popsu/OSC_3109.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-6/OSC_3120.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3120.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-6/OSC_3120.jpg rename to user/pages/02.projets/sociale/ programme-popsu/OSC_3120.jpg diff --git a/user/pages/02.projets/sociale/ programme-popsu/OSC_3133.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3133.jpg new file mode 100644 index 0000000..4542ee4 Binary files /dev/null and b/user/pages/02.projets/sociale/ programme-popsu/OSC_3133.jpg differ diff --git a/user/pages/02.projets/sociale/ programme-popsu/OSC_3151.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3151.jpg new file mode 100644 index 0000000..64a5d3f Binary files /dev/null and b/user/pages/02.projets/sociale/ programme-popsu/OSC_3151.jpg differ diff --git a/user/pages/02.projets/sociale/ programme-popsu/OSC_3159.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3159.jpg new file mode 100644 index 0000000..4635cf0 Binary files /dev/null and b/user/pages/02.projets/sociale/ programme-popsu/OSC_3159.jpg differ diff --git a/user/pages/02.projets/sociale/ programme-popsu/OSC_3166.jpg b/user/pages/02.projets/sociale/ programme-popsu/OSC_3166.jpg new file mode 100644 index 0000000..b5b0601 Binary files /dev/null and b/user/pages/02.projets/sociale/ programme-popsu/OSC_3166.jpg differ diff --git a/user/pages/02.projets/tous-des-sang-meles-6/item.md b/user/pages/02.projets/sociale/ programme-popsu/projet.md similarity index 75% rename from user/pages/02.projets/tous-des-sang-meles-6/item.md rename to user/pages/02.projets/sociale/ programme-popsu/projet.md index 420ac5f..f8151ed 100644 --- a/user/pages/02.projets/tous-des-sang-meles-6/item.md +++ b/user/pages/02.projets/sociale/ programme-popsu/projet.md @@ -1,11 +1,15 @@ --- +date: '02-03-2017 21:00' title: 'Programme POPSU (plate-forme d’observation des projets et stratégies urbaines)' media_order: 'OSC_3087.jpg,OSC_3084.jpg,OSC_3094.jpg,OSC_3109.jpg,OSC_3120.jpg,OSC_3133.jpg,OSC_3151.jpg,OSC_3159.jpg,OSC_3166.jpg' taxonomy: + category: + - 'Identité visuelle' + - Éditions tag: - - sociale + - 'POPSU / PUCA' --- POPSU / PUCA (Ministère de la transition écologique et solidaire /Ministère de la cohésion des territoires / Ministère de la culture) -Livre « Les conférences POPSU », Etre métropole dans un monde incertan d’Alain Bourdin / \ No newline at end of file +Livre « Les conférences POPSU », Etre métropole dans un monde incertan d’Alain Bourdin / diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2748_01.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2748_01.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2748_01.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2748_01.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2779_01.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2779_01.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2779_01.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2779_01.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2785.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2785.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2785.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2785.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2793.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2793.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2793.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2793.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2800.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2800.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2800.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2800.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2802.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2802.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2802.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2802.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/OSC_2820.jpg b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2820.jpg similarity index 100% rename from user/pages/02.projets/tous-des-sang-meles-2/OSC_2820.jpg rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/OSC_2820.jpg diff --git a/user/pages/02.projets/tous-des-sang-meles-2/item.md b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/projet.md similarity index 79% rename from user/pages/02.projets/tous-des-sang-meles-2/item.md rename to user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/projet.md index b99c623..952831f 100644 --- a/user/pages/02.projets/tous-des-sang-meles-2/item.md +++ b/user/pages/02.projets/sociale/Comprendre-des-migrations-internationales/projet.md @@ -1,17 +1,18 @@ --- +date: '31-03-2017 21:02' title: 'Comprendre des migrations internationales' -media_order: 'OSC_2779_01.jpg,OSC_2748_01.jpg,OSC_2785.jpg,OSC_2793.jpg,OSC_2800.jpg,OSC_2802.jpg,OSC_2820.jpg' +media_order: 'OSC_2748_01.jpg,OSC_2779_01.jpg,OSC_2785.jpg,OSC_2793.jpg,OSC_2800.jpg,OSC_2802.jpg,OSC_2820.jpg' taxonomy: category: - Éditions tag: - - sociale + - 'La Cimade' --- Collection « Petit guide » outils de vulgarisation Il y’a 740 millions de personnes déplacées dans la monde. Parmi elles, 243 millions ont franchi une frontière pour s’installer dans un pays autre que celui de leur naissance. Soit 3,3 % -Comment sensibiliser le grand public aux enjeux et à la réalité des migrations internationales, sans peur et en toute objectivité. Un livret qui s’inscrit dans la collection « Petit Guide » éditée par La Cimade. +Comment sensibiliser le grand public aux enjeux et à la réalité des migrations internationales, sans peur et en toute objectivité. Un livret qui s’inscrit dans la collection « Petit Guide » éditée par La Cimade. Création graphique et maquette par Maud Boyer en collaboration avec Dugudus pour les illustrations originales. -Fabriqué par nos soins sous Scribus \ No newline at end of file +Fabriqué par nos soins sous Scribus diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2437.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2437.jpg new file mode 100644 index 0000000..36e042f Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2437.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2448.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2448.jpg new file mode 100644 index 0000000..d710a65 Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2448.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2460.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2460.jpg new file mode 100644 index 0000000..6b221ea Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2460.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2527.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2527.jpg new file mode 100644 index 0000000..2d31a1d Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2527.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2573.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2573.jpg new file mode 100644 index 0000000..cc1876d Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2573.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2617.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2617.jpg new file mode 100644 index 0000000..4c5b1ab Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2617.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2654.jpg b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2654.jpg new file mode 100644 index 0000000..77cbd13 Binary files /dev/null and b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/OSC_2654.jpg differ diff --git a/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/projet.md b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/projet.md new file mode 100644 index 0000000..5485d63 --- /dev/null +++ b/user/pages/02.projets/sociale/accompagner-la-transition-ecologique-et-sociale/projet.md @@ -0,0 +1,17 @@ +--- +date: '02-01-2018 21:02' +title: 'Accompagner la transition écologique et sociale' +media_order: 'OSC_2437.jpg,OSC_2448.jpg,OSC_2460.jpg,OSC_2527.jpg,OSC_2573.jpg,OSC_2617.jpg,OSC_2654.jpg' +taxonomy: + category: + - 'Site web' + - Éditions + tag: + - 'CCFD-Terre Solidaire' +--- + +Livret de capitalisation + +Le PAIES est un programme mis en œuvre sur le continent africain, visant à la transformation sociale et écologique des territoires ruraux des régions du Sahel (Mali, Niger, Burkina) et des Grands Lacs (Burundi, Rwanda, RDC). Réunissant pas moins de 13 organisations partenaires du CCFD-Terre Solidaire, le programme PAIES a pour objectif l’amélioration des conditions de vie socio-économique et écologique des populations de ces zones rurales. +Le site internet associé permet aux associations de terrain de consulter les initiatives.https://paies.ccfd-terresolidaire.org/ +Création graphique de Sandrine Ripoll secondée à la maquette par Maud Boyer et Isabelle Guénot. Développement du site : Kevin Tessier diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2510.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2510.jpg new file mode 100644 index 0000000..d6a977a Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2510.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2517_montage.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2517_montage.jpg new file mode 100644 index 0000000..f2ea556 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2517_montage.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2521.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2521.jpg new file mode 100644 index 0000000..7d56de0 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2521.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2525.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2525.jpg new file mode 100644 index 0000000..d6b36c6 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2525.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2540.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2540.jpg new file mode 100644 index 0000000..79f3f8b Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2540.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2549.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2549.jpg new file mode 100644 index 0000000..749959b Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2549.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2554.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2554.jpg new file mode 100644 index 0000000..56d2066 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2554.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2563.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2563.jpg new file mode 100644 index 0000000..5fff5e6 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2563.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2569.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2569.jpg new file mode 100644 index 0000000..736833b Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2569.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2570.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2570.jpg new file mode 100644 index 0000000..6d8e794 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2570.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2598.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2598.jpg new file mode 100644 index 0000000..be8470d Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2598.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2626.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2626.jpg new file mode 100644 index 0000000..2cd3321 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2626.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2629.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2629.jpg new file mode 100644 index 0000000..0617e8a Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2629.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2643.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2643.jpg new file mode 100644 index 0000000..fe7ee9f Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2643.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2646.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2646.jpg new file mode 100644 index 0000000..f7ae132 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2646.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2663.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2663.jpg new file mode 100644 index 0000000..d7e9184 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2663.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2672.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2672.jpg new file mode 100644 index 0000000..c2c97f2 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2672.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2677.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2677.jpg new file mode 100644 index 0000000..00c3ea4 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2677.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2680.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2680.jpg new file mode 100644 index 0000000..b5fa5a4 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2680.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2699.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2699.jpg new file mode 100644 index 0000000..2a14675 Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2699.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2723.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2723.jpg new file mode 100644 index 0000000..8a63c3b Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2723.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2742.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2742.jpg new file mode 100644 index 0000000..b64f0fb Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2742.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2750.jpg b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2750.jpg new file mode 100644 index 0000000..8e18dfd Binary files /dev/null and b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/OSC_2750.jpg differ diff --git a/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/projet.md b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/projet.md new file mode 100644 index 0000000..f202589 --- /dev/null +++ b/user/pages/02.projets/sociale/accueillir-des-migrant-e-s/projet.md @@ -0,0 +1,15 @@ +--- +date: '31-03-2017 21:03' +title: 'Accueillir des migrant.e.s' +media_order: 'OSC_2510.jpg,OSC_2517_montage.jpg,OSC_2521.jpg,OSC_2525.jpg,OSC_2540.jpg,OSC_2549.jpg,OSC_2554.jpg,OSC_2563.jpg,OSC_2569.jpg,OSC_2570.jpg,OSC_2598.jpg,OSC_2626.jpg,OSC_2629.jpg,OSC_2643.jpg,OSC_2646.jpg,OSC_2663.jpg,OSC_2672.jpg,OSC_2677.jpg,OSC_2680.jpg,OSC_2699.jpg,OSC_2723.jpg,OSC_2742.jpg,OSC_2750.jpg' +taxonomy: + category: + - Éditions + tag: + - 'Organisation pour une Citoyenneté Universelle' +--- + +Livrets de restitution + +10 exemples de communes françaises à l’initiative des politiques volontaristes d’accueil des migrants menées en partenariat avec les organisations humanitaires. Toutes ces villes répondent à un même enjeux : comment accueillir, malgré des politiques nationales hostiles, voire xénophobes, et pérenniser ces actions au-delà des alternances politiques. +Création graphique de Maud Boyer, secondé à la maquette par Kevin Tessier et à la réalisation de la couverture par Ouidade Soussi-Chiadmi. diff --git a/user/pages/02.projets/sociale/blog.md b/user/pages/02.projets/sociale/blog.md new file mode 100644 index 0000000..a895676 --- /dev/null +++ b/user/pages/02.projets/sociale/blog.md @@ -0,0 +1,13 @@ +--- +title: Sociale +content: + items: + - '@self.children' + limit: 0 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_1984.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_1984.jpg new file mode 100644 index 0000000..a8f8076 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_1984.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2025.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2025.jpg new file mode 100644 index 0000000..63ccde7 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2025.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2039.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2039.jpg new file mode 100644 index 0000000..2664538 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2039.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2067.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2067.jpg new file mode 100644 index 0000000..e1bb037 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2067.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2093.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2093.jpg new file mode 100644 index 0000000..3d803ad Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2093.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2123.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2123.jpg new file mode 100644 index 0000000..9b985bb Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2123.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2130.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2130.jpg new file mode 100644 index 0000000..2687dc7 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2130.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2223.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2223.jpg new file mode 100644 index 0000000..1b6bffb Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2223.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2224.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2224.jpg new file mode 100644 index 0000000..05cd487 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2224.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2236.jpg b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2236.jpg new file mode 100644 index 0000000..9ac5fe8 Binary files /dev/null and b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/OSC_2236.jpg differ diff --git a/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/projet.md b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/projet.md new file mode 100644 index 0000000..7a5bfee --- /dev/null +++ b/user/pages/02.projets/sociale/cac-40-des-profits-sans-partage/projet.md @@ -0,0 +1,15 @@ +--- +date: '07-05-2018 21:04' +title: 'CAC 40: des profits sans partage' +media_order: 'OSC_1984.jpg,OSC_2025.jpg,OSC_2039.jpg,OSC_2067.jpg,OSC_2093.jpg,OSC_2123.jpg,OSC_2130.jpg,OSC_2223.jpg,OSC_2224.jpg,OSC_2236.jpg' +taxonomy: + category: + - Éditions + tag: + - 'Oxfam France' +--- + +Rapport de plaidoyer + +Une étude inédite sur le partage de la richesse au sein des entreprises du CAC40 depuis 2009, publiée par Oxfam France et le BASIC (Bureau d’Analyse Sociétale pour une Information Citoyenne). Dividendes record, écart des salaires et évasion fiscale, le rapport « CAC40 : des profits sans partage » met en lumière une tendance lourde dans les choix économiques de ces grandes entreprises qui contribuent à alimenter la spirale des inégalités. +Création de la maquette graphique par Maud Boyer secondée par Sandrine Ripoll pour la couverture et Ouidade Soussi-Chiadmi pour les graphiques. diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2800.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2800.jpg new file mode 100644 index 0000000..b50ca59 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2800.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2809.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2809.jpg new file mode 100644 index 0000000..379fe31 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2809.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2820.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2820.jpg new file mode 100644 index 0000000..5ffd138 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2820.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2827.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2827.jpg new file mode 100644 index 0000000..0b4c299 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2827.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2833.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2833.jpg new file mode 100644 index 0000000..1f45283 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2833.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2840.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2840.jpg new file mode 100644 index 0000000..7f06d6e Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2840.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2848.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2848.jpg new file mode 100644 index 0000000..a15ae71 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2848.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/OSC_2852.jpg b/user/pages/02.projets/sociale/clameurs/OSC_2852.jpg new file mode 100644 index 0000000..2e77663 Binary files /dev/null and b/user/pages/02.projets/sociale/clameurs/OSC_2852.jpg differ diff --git a/user/pages/02.projets/sociale/clameurs/projet.md b/user/pages/02.projets/sociale/clameurs/projet.md new file mode 100644 index 0000000..3211d75 --- /dev/null +++ b/user/pages/02.projets/sociale/clameurs/projet.md @@ -0,0 +1,17 @@ +--- +date: '06-05-2018 21:05' +title: Clameurs +media_order: 'OSC_2852.jpg,OSC_2848.jpg,OSC_2840.jpg,OSC_2833.jpg,OSC_2827.jpg,OSC_2820.jpg,OSC_2809.jpg,OSC_2800.jpg' +taxonomy: + category: + - 'Identité visuelle' + - 'Site web' + tag: + - CERAS +--- + +Identité visuelle, site internet et dossier de presse + +Création de l’identité et du site Clameurs, la websérie habitée par Laudato si’. Une web série construite autour de la parole des plus fragiles, mêlant reportages, témoignages et éclairages de spécialistes sur six thématiques : l’accélération, la culture du déchet, notre cadre de vie, notre relation à la création, un « nous » à construire ensemble, nos cultures, notre avenir. +http://www.clameurs-lawebserie.fr/ +Création graphique Maud Boyer et Sandrine Ripoll, design interactif et développement Bachir Soussi Chiadmi diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2900.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2900.jpg new file mode 100644 index 0000000..da1d65a Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2900.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2905.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2905.jpg new file mode 100644 index 0000000..2aff641 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2905.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2911.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2911.jpg new file mode 100644 index 0000000..22f59b2 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2911.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2923.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2923.jpg new file mode 100644 index 0000000..12b77b7 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2923.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2927.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2927.jpg new file mode 100644 index 0000000..7b4a77b Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2927.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2934.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2934.jpg new file mode 100644 index 0000000..5861a13 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2934.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2941.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2941.jpg new file mode 100644 index 0000000..ac38b98 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2941.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2947.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2947.jpg new file mode 100644 index 0000000..62b2803 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2947.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2949.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2949.jpg new file mode 100644 index 0000000..d55cc9d Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2949.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2954.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2954.jpg new file mode 100644 index 0000000..d592732 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2954.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2957.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2957.jpg new file mode 100644 index 0000000..0c67a4b Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2957.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2970.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2970.jpg new file mode 100644 index 0000000..c2f494f Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2970.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2975.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2975.jpg new file mode 100644 index 0000000..b111c48 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2975.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2993.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2993.jpg new file mode 100644 index 0000000..ea2494e Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/OSC_2993.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144112.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144112.jpg new file mode 100644 index 0000000..27415f0 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144112.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144136.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144136.jpg new file mode 100644 index 0000000..0fad2c1 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144136.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144148.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144148.jpg new file mode 100644 index 0000000..b4fd5c9 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144148.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144158.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144158.jpg new file mode 100644 index 0000000..32eadf5 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144158.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144213.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144213.jpg new file mode 100644 index 0000000..3542e24 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144213.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144222.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144222.jpg new file mode 100644 index 0000000..0015a4b Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144222.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144236.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144236.jpg new file mode 100644 index 0000000..cbc5721 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144236.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144249.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144249.jpg new file mode 100644 index 0000000..c380c39 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144249.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144256.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144256.jpg new file mode 100644 index 0000000..a249947 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144256.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144302.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144302.jpg new file mode 100644 index 0000000..5984382 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144302.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144310.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144310.jpg new file mode 100644 index 0000000..df3bdc8 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144310.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144320.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144320.jpg new file mode 100644 index 0000000..9889236 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144320.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144332.jpg b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144332.jpg new file mode 100644 index 0000000..edfb4e2 Binary files /dev/null and b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/Screenshot_20181031_144332.jpg differ diff --git a/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/projet.md b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/projet.md new file mode 100644 index 0000000..425a7b7 --- /dev/null +++ b/user/pages/02.projets/sociale/defi-brownsea-et-peuple-libre/projet.md @@ -0,0 +1,15 @@ +--- +date: '01-05-2018 21:06' +title: 'Défi Brownsea et Peuple Libre' +media_order: 'OSC_2900.jpg,OSC_2905.jpg,OSC_2911.jpg,OSC_2923.jpg,OSC_2927.jpg,OSC_2934.jpg,OSC_2941.jpg,OSC_2947.jpg,OSC_2949.jpg,OSC_2954.jpg,OSC_2957.jpg,OSC_2970.jpg,OSC_2975.jpg,OSC_2993.jpg,Screenshot_20181031_144112.jpg,Screenshot_20181031_144136.jpg,Screenshot_20181031_144148.jpg,Screenshot_20181031_144158.jpg,Screenshot_20181031_144213.jpg,Screenshot_20181031_144222.jpg,Screenshot_20181031_144236.jpg,Screenshot_20181031_144249.jpg,Screenshot_20181031_144256.jpg,Screenshot_20181031_144302.jpg,Screenshot_20181031_144310.jpg,Screenshot_20181031_144320.jpg,Screenshot_20181031_144332.jpg' +taxonomy: + category: + - 'Campagne de communication' + tag: + - 'Scouts et Guides de France' +--- + +Campagnes de communication internes et externes + +Comment mobiliser le mouvement pour permettre à plus de jeunes de vivre l’aventure du scoutisme ? Le temps d’une campagne, le « Peuple Libre » des scouts et Guides de France appelle ses groupes à se mobiliser auprès des populations les plus éloignées du scoutisme, et tous les jeunes de 18 à 25 ans à venir les rejoindre pour animer leurs camps d’été : une aventure intense, solidaire et fraternelle - Identité pour la communication interne, livret à destination des bénévoles, goodies, vidéo grand public. +Conseil en communication, conception graphique et maquette : Sandrine Ripoll et Maud Boyer – Vidéo « Peuple Libre » : Sandrine Ripoll en collaboration avec Farid Mekbel – Relations Presses assurées par l’agence Emma Pom. diff --git a/user/pages/02.projets/sociale/jeunes-et-engages/projet.md b/user/pages/02.projets/sociale/jeunes-et-engages/projet.md new file mode 100644 index 0000000..5d689aa --- /dev/null +++ b/user/pages/02.projets/sociale/jeunes-et-engages/projet.md @@ -0,0 +1,10 @@ +--- +date: '05-01-2015 21:07' +title: 'Jeunes et engagés' +taxonomy: + category: + - 'Site web' + tag: + - CERAS +--- + diff --git a/user/pages/02.projets/sociale/la-mine/projet.md b/user/pages/02.projets/sociale/la-mine/projet.md new file mode 100644 index 0000000..5838325 --- /dev/null +++ b/user/pages/02.projets/sociale/la-mine/projet.md @@ -0,0 +1,15 @@ +--- +date: '07-05-2018 21:07' +title: 'La Mine' +taxonomy: + category: + - 'Identité visuelle' + - Éditions + tag: + - 'Ressourcerie La Mine' +--- + +Identité visuelle et édition + +Création de la charte graphique de la ressourcerie d’Arcueil, La Mine. Un principe simple en noir et blanc sur papiers de couleur, impactant et économique. Programme mensuel, plaquette de présentation, affiches événementielles. +Création graphique Maud Boyer, Sandrine Ripoll et Kevin Tessier. Prise de vues Ouidade Soussi Chiadmi diff --git a/user/pages/02.projets/sociale/nos-terres-valent-plus-que-du-carbone/projet.md b/user/pages/02.projets/sociale/nos-terres-valent-plus-que-du-carbone/projet.md new file mode 100644 index 0000000..090ab3f --- /dev/null +++ b/user/pages/02.projets/sociale/nos-terres-valent-plus-que-du-carbone/projet.md @@ -0,0 +1,17 @@ +--- +date: '06-05-2018 21:08' +title: 'Nos terres valent plus que du carbone' +taxonomy: + category: + - Éditions + tag: + - 'CCFD-Terre Solidaire' +--- + +Rapport de plaidoyer + +La solution de séquestration du carbone dans les sols agricoles est-elle bénéfique à la lutte contre le réchauffement climatique ? Le CCFD-Terre Solidaire démontre que l’urgence de l’agriculture des pays riches doit d’abord être de s’engager dans une transition agricole et alimentaire, et de produire réellement moins de gaz à effet de serre. Les systèmes alternatifs existent mais se développent trop lentement, faute de soutien politique adéquat. Un rapport dans le respect de la charte actuelle. +https://ccfd-terresolidaire.org/infos/souverainete/rapport-sequestration-carbone-terres-agricoles-6119 +Illustration, infographies et maquette par Maud Boyer et Sandrine Ripoll + +Fabriqué par nos soins sous Scribus pour la maquette et inkscape pour les infographies diff --git a/user/pages/02.projets/sociale/revue-projet/projet.md b/user/pages/02.projets/sociale/revue-projet/projet.md new file mode 100755 index 0000000..9da0d3e --- /dev/null +++ b/user/pages/02.projets/sociale/revue-projet/projet.md @@ -0,0 +1,12 @@ +--- +title: Revue-Projet +taxonomy: + category: + - 'Site web' + tag: + - Revue-projet +--- + +Création du nouveau site de la revue Projet pour le CERAS (Centre de Recherche et d’Action Sociales). +www.revue-projet.com +Création graphique Sandrine Ripoll et Maud Boyer en collaboration avec l’agence Aouka pour le développement. diff --git a/user/pages/02.projets/tous-des-sang-meles-5/item.md b/user/pages/02.projets/tous-des-sang-meles-5/item.md deleted file mode 100644 index faadc72..0000000 --- a/user/pages/02.projets/tous-des-sang-meles-5/item.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: 'Nos terres valent plus que du carbone' -taxonomy: - tag: - - sociale ---- - -CCFD-Terre Solidaire - -Rapport de plaidoyer - -44 pages de récit qui remet en question la solution de séquestration de carbone dans les sols agricoles pour lutter contre le réchauffement climatique. Le CCFD-Terre Solidaire démontre que l’agriculture des pays riches doit d’abord s’engager dans une transition agricole et alimentaire et produire réellement moins de gaz à effet de serre. Les systèmes alternatifs existent mais se développent trop lentement, faute de soutien politique adéquat. Un rapport dans le respect de la charte actuelle, illustrations, infographies et maquette par Maud Boyer et Sandrine Ripoll -https://ccfd-terresolidaire.org/infos/souverainete/rapport-sequestration-carbone-terres-agricoles-6119 - -Fabriqué par nos soins sous Scribus pour la maquette et inkscape pour les infographies \ No newline at end of file diff --git a/user/pages/05.commanditaires/ccfd/item.md b/user/pages/05.commanditaires/ccfd/item.md new file mode 100644 index 0000000..5dc0006 --- /dev/null +++ b/user/pages/05.commanditaires/ccfd/item.md @@ -0,0 +1,5 @@ +--- +title: CCFD +--- + +cdsbhdsq vbhdqsvhdsq bdcd qbcdho qcbdihqb \ No newline at end of file diff --git a/user/themes/figureslibres/blueprints/projet.yaml b/user/themes/figureslibres/blueprints/projet.yaml new file mode 100644 index 0000000..c0ea742 --- /dev/null +++ b/user/themes/figureslibres/blueprints/projet.yaml @@ -0,0 +1,139 @@ +extends@: default + +form: + fields: + tabs: + + fields: + content: + fields: + header.date: + ordering@: -4 + type: datetime + label: Date du projet + toggleable: true + help: Indiquez la date de la réalisation du projet, seulement l'année sera affichée sur le front. + + header.taxonomy: + type: taxonomy + label: PLUGIN_ADMIN.TAXONOMY + multiple: true + validate: + type: array + + options: + fields: + publishing: + fields: + header.date: + unset@: true + + taxonomies: + unset@: true + + blog: + type: tab + title: Blog Item + + fields: + + header_options: + type: section + title: Header Options + underline: true + + header.continue_link: + type: toggle + toggleable: true + label: DF Style Link + help: Daring Fireball style title link + highlight: 1 + options: + 1: PLUGIN_ADMIN.ENABLED + 0: PLUGIN_ADMIN.DISABLED + validate: + type: bool + + header.header_image: + type: toggle + toggleable: true + label: Display Header Image + help: Enabled displaying of a header image + highlight: 1 + options: + 1: PLUGIN_ADMIN.ENABLED + 0: PLUGIN_ADMIN.DISABLED + + header.header_image_file: + type: text + toggleable: true + label: Image File + help: image filename that exists in the page folder. If not provided, will use the first image found. + placeholder: For example: myimage.jpg + + header.header_image_width: + type: text + toggleable: true + label: Image Width + size: small + help: Header width in px + placeholder: Default is 900 + validate: + type: int + min: 0 + max: 5000 + + header.header_image_height: + type: text + toggleable: true + label: Image Height + size: small + help: Header height in px + placeholder: Default is 300 + validate: + type: int + min: 0 + max: 5000 + + summary: + type: section + title: Summary + underline: true + + header.summary.enabled: + type: toggle + toggleable: true + label: Summary + highlight: 1 + options: + 1: PLUGIN_ADMIN.ENABLED + 0: PLUGIN_ADMIN.DISABLED + + header.summary.format: + type: select + toggleable: true + label: Format + classes: fancy + options: + 'short': 'Use the first occurence of delimter or size' + 'long': 'Summary delimiter will be ignored' + + header.summary.size: + type: text + toggleable: true + label: Size + classes: large + placeholder: 300 + validate: + type: int + min: 1 + + header.summary.delimiter: + type: text + toggleable: true + label: Summary delimiter + classes: large + placeholder: === + + import@: + type: partials/blog-bits diff --git a/user/themes/figureslibres/css-compiled/theme.css b/user/themes/figureslibres/css-compiled/theme.css index f33c45c..7df241b 100644 --- a/user/themes/figureslibres/css-compiled/theme.css +++ b/user/themes/figureslibres/css-compiled/theme.css @@ -1,21 +1,25 @@ -@font-face { font-family: "Montserrat-Regular"; src: url("../fonts/montserrat/Montserrat-Regular.eot"); src: url("../fonts/montserrat/Montserrat-Regular.eot?#iefix") format("embedded-opentype"), url("../fonts/montserrat/Montserrat-Regular.woff") format("woff"), url("../fonts/montserrat/Montserrat-Regular.ttf") format("truetype"), url("../fonts/montserrat/Montserrat-Regular.svg#Montserrat-Regular") format("svg"); } +@font-face { font-family: "lato"; src: url("../fonts/lato/Lato-Regular.eot"); src: url("../fonts/lato/Lato-Regular.eot?#iefix") format("embedded-opentype"), url("../fonts/lato/Lato-Regular.woff") format("woff"), url("../fonts/lato/Lato-Regular.ttf") format("truetype"), url("../fonts/lato/Lato-Regular.svg#lato") format("svg"); } -@font-face { font-family: "Montserrat-medium"; src: url("../fonts/montserrat/Montserrat-Medium.eot"); src: url("../fonts/montserrat/Montserrat-Medium.eot?#iefix") format("embedded-opentype"), url("../fonts/montserrat/Montserrat-Medium.woff") format("woff"), url("../fonts/montserrat/Montserrat-Medium.ttf") format("truetype"), url("../fonts/montserrat/Montserrat-Medium.svg#Montserrat-medium") format("svg"); } +@font-face { font-family: "syne"; src: url("../fonts/syne/Syne-Bold.eot"); src: url("../fonts/syne/Syne-Bold.eot?#iefix") format("embedded-opentype"), url("../fonts/syne/Syne-Bold.woff") format("woff"), url("../fonts/syne/Syne-Bold.ttf") format("truetype"), url("../fonts/syne/Syne-Bold.svg#syne") format("svg"); } + +@font-face { font-family: "Avara"; src: url("../fonts/avara/Avara-Bold_Italic_web.eot"); src: url("../fonts/avara/Avara-Bold_Italic_web.eot?#iefix") format("embedded-opentype"), url("../fonts/avara/Avara-Bold_Italic_web.woff") format("woff"), url("../fonts/avara/Avara-Bold_Italic_web.ttf") format("truetype"), url("../fonts/avara/Avara-Bold_Italic_web.svg#Avara") format("svg"); } + +@font-face { font-family: "playfairdisplay-regularitalic"; src: url("../fonts/playfair/playfairdisplay-regularitalic.eot"); src: url("../fonts/playfair/playfairdisplay-regularitalic.eot?#iefix") format("embedded-opentype"), url("../fonts/playfair/playfairdisplay-regularitalic.woff") format("woff"), url("../fonts/playfair/playfairdisplay-regularitalic.ttf") format("truetype"), url("../fonts/playfair/playfairdisplay-regularitalic.svg#playfairdisplay-regularitalic") format("svg"); } /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ /* Document ========================================================================== */ /** 1. Correct the line height in all browsers. 2. Prevent adjustments of font size after orientation changes in iOS. */ -html { margin: 0; padding: 0; line-height: 1.15; /* 1 */ -webkit-text-size-adjust: 100%; /* 2 */ } +html { margin: 0; padding: 0; line-height: 1.15; /* 1 */ -webkit-text-size-adjust: 100%; /* 2 */ font-size: 16px; } /* Sections ========================================================================== */ /** Remove the margin in all browsers. */ -body { margin: 0; padding: 0 50px 0 50px; } +body { margin: 0; padding: 0; } /** Render the `main` element consistently in IE. */ main { display: block; } /** Correct the font size and margin on `h1` elements within `section` and `article` contexts in Chrome, Firefox, and Safari. */ -h1 { font-size: 2em; margin: 0; } +h1 { font-size: auto; margin: 0; } /* Grouping content ========================================================================== */ /** 1. Add the correct box sizing in Firefox. 2. Show the overflow in Edge and IE. */ @@ -26,6 +30,8 @@ pre { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } /* Text-level semantics ========================================================================== */ /** Remove the gray background on active links in IE 10. */ +p { margin: 0; } + ul { list-style: none; } ul, li { margin: 0; padding: 0; } @@ -53,7 +59,7 @@ sup { top: -0.5em; } /* Embedded content ========================================================================== */ /** Remove the border on images inside links in IE 10. */ -img { border-style: none; width: 100%; height: 100%; } +img { border-style: none; width: 100%; height: 100%; vertical-align: bottom; } /* Forms ========================================================================== */ /** 1. Change the font styles in all browsers. 2. Remove the margin in Firefox and Safari. */ @@ -115,30 +121,146 @@ template { display: none; } /** Add the correct display in IE 10. */ [hidden] { display: none; } -h1, h2, h3, p, ul, li, a { font-family: 'Montserrat-Regular'; font-weight: normal; } +h1, h2, h3, p, ul, li, a, span { font-family: "lato"; font-weight: lighter; } -h1 { font-size: 1.2rem !important; } +header a { font-size: 3.5rem; line-height: 4rem; } -p { font-family: "Montserrat-Medium" !important; } +.home p { font-size: 3.5rem; line-height: 4rem; } -ul { font-size: 0.8rem; line-height: 1.2rem; } +.home #text_figli strong { position: relative; } -.home p { font-size: 3rem; line-height: 4rem; } +.home #text_figli strong::after { display: block; position: absolute; content: ""; width: 100%; height: 1px; background: black; bottom: 0; } -Header { position: fixed; top: 0; } +.home #text_figli a { position: relative; } -Header h1 { margin: 30px 0 0 30px; } +.home #text_figli a:nth-child(2) { font-family: "playfairdisplay-regularitalic"; } -#start { width: 70%; margin: auto auto auto 10%; } +.home #text_figli a:nth-child(3) { font-family: "syne"; } -.sidebar-right { position: fixed; width: 20%; height: 100%; top: 0; right: 0; display: -ms-flexbox; display: flex; } +.home #text_figli a:nth-child(4) { font-family: "Avara"; } -.sidebar-right ul { margin: auto; text-align: right; margin-right: 20px; } +#item .content-title { display: -ms-flexbox; display: flex; margin: 0.5rem 0; } -.sidebar-right ul a { color: grey; position: relative; } +#item .content-title > * { margin-right: 0.5rem; font-size: 1.15rem; } -.sidebar-right ul a:hover li { position: relative; } +#item .content-title h2 { margin: 0 0.5rem 0 0; } -.sidebar-right ul a:hover li::after { content: " "; top: 7px; right: -13px; display: block; position: absolute; background-color: grey; border-radius: 5px; width: 7px; height: 7px; } +a.publique, span.publique { font-family: "playfairdisplay-regularitalic"; } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"theme.css","sources":["theme.scss","mixins/_fonts.scss","mixins/_variable.scss","theme/_reset.scss","theme/_typography.scss","theme/_header.scss","theme/_start.scss","theme/_sidebar.scss"],"sourcesContent":["// Core variables and mixins\n@import 'mixins/_fonts';\n@import 'mixins/_variable';\n@import 'theme/reset';\n@import 'theme/typography';\n\n@import 'theme/header';\n@import 'theme/start';\n@import 'theme/sidebar';\n\n// @import 'theme/menu';\n// @import 'theme/footer';\n//\n// // Extra Skeleton Styling\n// @import 'theme/blog';\n// @import 'theme/onepage';\n","// Font Family\n$font-family-default:  \t\t\t\"Raleway\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n$font-family-header:  \t\t\t\"Montserrat\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n$font-family-mono: \t\t\t\t\"Inconsolata\", monospace;\n$font-family-serif:\t\t\t\t\"Georgia\", \"Times\", \"Times New Roman\", serif;\n// @font-face\n\n$Regular: \"Montserrat-Regular\";\n$family: \"montserrat\";\n$file-regular: \"Montserrat-Regular\";\n$category: \"sans-serif\";\n\n@mixin font-face($Regular, $file-regular, $family, $category:\"\") {\n    $filepath: \"../fonts/\" + $family + \"/\" + $file-regular;\n    @font-face {\n        font-family: \"#{$Regular}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n              url($filepath + \".ttf\")  format('truetype'),\n              url($filepath + \".svg#\" + $Regular + \"\") format('svg');\n    }\n\n    %#{$Regular} {\n        font: {\n            @if $category != \"\" {\n                family: \"#{$Regular}\", #{$category};\n            }\n            @else {\n                family: \"#{$Regular}\";\n                weight: normal;\n            }\n        }\n    }\n}\n\n$Medium: \"Montserrat-medium\";\n$file-Medium: \"Montserrat-Medium\";\n\n@mixin font-face($Medium, $file-Medium, $family, $category:\"\") {\n    $filepath: \"../fonts/\" + $family + \"/\" + $file-Medium;\n    @font-face {\n        font-family: \"#{$Medium}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n              url($filepath + \".ttf\")  format('truetype'),\n              url($filepath + \".svg#\" + $Medium + \"\") format('svg');\n    }\n\n    %#{$Medium} {\n        font: {\n            @if $category != \"\" {\n                family: \"#{$Medium}\", #{$category};\n            }\n            @else {\n                family: \"#{$Medium}\";\n                weight: normal;\n            }\n        }\n    }\n}\n","@include font-face($Regular, $file-regular, $family, $category);//1\n@include font-face($Medium, $file-Medium, $family, $category);//1\n\n// font-size\n$Fphome: 3rem;\n\n// line-height\n$Flhome: 4rem;\n","/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */\n\n/* Document\n   ========================================================================== */\n\n/**\n * 1. Correct the line height in all browsers.\n * 2. Prevent adjustments of font size after orientation changes in iOS.\n */\n\nhtml {\n  margin: 0;\n  padding: 0;\n  line-height: 1.15; /* 1 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n}\n\n/* Sections\n   ========================================================================== */\n\n/**\n * Remove the margin in all browsers.\n */\n\nbody {\n  margin: 0;\n  padding: 0 50px 0 50px;\n}\n\n/**\n * Render the `main` element consistently in IE.\n */\n\nmain {\n  display: block;\n}\n\n/**\n * Correct the font size and margin on `h1` elements within `section` and\n * `article` contexts in Chrome, Firefox, and Safari.\n */\n\nh1 {\n  font-size: 2em;\n  margin:0;\n}\n\n/* Grouping content\n   ========================================================================== */\n\n/**\n * 1. Add the correct box sizing in Firefox.\n * 2. Show the overflow in Edge and IE.\n */\n\nhr {\n  -webkit-box-sizing: content-box;\n          box-sizing: content-box; /* 1 */\n  height: 0; /* 1 */\n  overflow: visible; /* 2 */\n}\n\n/**\n * 1. Correct the inheritance and scaling of font size in all browsers.\n * 2. Correct the odd `em` font sizing in all browsers.\n */\n\npre {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/* Text-level semantics\n   ========================================================================== */\n\n/**\n * Remove the gray background on active links in IE 10.\n */\nul{\n  list-style: none;\n}\nul,li{\n  margin: 0;\n  padding: 0;\n}\n\na {\n  background-color: transparent;\n  color: black;\n  text-decoration: none;\n}\n\n/**\n * 1. Remove the bottom border in Chrome 57-\n * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n */\n\nabbr[title] {\n  border-bottom: none; /* 1 */\n  text-decoration: underline; /* 2 */\n  -webkit-text-decoration: underline dotted;\n          text-decoration: underline dotted; /* 2 */\n}\n\n/**\n * Add the correct font weight in Chrome, Edge, and Safari.\n */\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\n/**\n * 1. Correct the inheritance and scaling of font size in all browsers.\n * 2. Correct the odd `em` font sizing in all browsers.\n */\n\ncode,\nkbd,\nsamp {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/**\n * Add the correct font size in all browsers.\n */\n\nsmall {\n  font-size: 80%;\n}\n\n/**\n * Prevent `sub` and `sup` elements from affecting the line height in\n * all browsers.\n */\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\n/* Embedded content\n   ========================================================================== */\n\n/**\n * Remove the border on images inside links in IE 10.\n */\n\nimg {\n  border-style: none;\n  width: 100%;\n  height: 100%;\n}\n\n/* Forms\n   ========================================================================== */\n\n/**\n * 1. Change the font styles in all browsers.\n * 2. Remove the margin in Firefox and Safari.\n */\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font-family: inherit; /* 1 */\n  font-size: 100%; /* 1 */\n  line-height: 1.15; /* 1 */\n  margin: 0; /* 2 */\n}\n\n/**\n * Show the overflow in IE.\n * 1. Show the overflow in Edge.\n */\n\nbutton,\ninput { /* 1 */\n  overflow: visible;\n}\n\n/**\n * Remove the inheritance of text transform in Edge, Firefox, and IE.\n * 1. Remove the inheritance of text transform in Firefox.\n */\n\nbutton,\nselect { /* 1 */\n  text-transform: none;\n}\n\n/**\n * Correct the inability to style clickable types in iOS and Safari.\n */\n\nbutton,\n[type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\n/**\n * Remove the inner border and padding in Firefox.\n */\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  border-style: none;\n  padding: 0;\n}\n\n/**\n * Restore the focus styles unset by the previous rule.\n */\n\nbutton:-moz-focusring,\n[type=\"button\"]:-moz-focusring,\n[type=\"reset\"]:-moz-focusring,\n[type=\"submit\"]:-moz-focusring {\n  outline: 1px dotted ButtonText;\n}\n\n/**\n * Correct the padding in Firefox.\n */\n\nfieldset {\n  padding: 0.35em 0.75em 0.625em;\n}\n\n/**\n * 1. Correct the text wrapping in Edge and IE.\n * 2. Correct the color inheritance from `fieldset` elements in IE.\n * 3. Remove the padding so developers are not caught out when they zero out\n *    `fieldset` elements in all browsers.\n */\n\nlegend {\n  -webkit-box-sizing: border-box;\n          box-sizing: border-box; /* 1 */\n  color: inherit; /* 2 */\n  display: table; /* 1 */\n  max-width: 100%; /* 1 */\n  padding: 0; /* 3 */\n  white-space: normal; /* 1 */\n}\n\n/**\n * Add the correct vertical alignment in Chrome, Firefox, and Opera.\n */\n\nprogress {\n  vertical-align: baseline;\n}\n\n/**\n * Remove the default vertical scrollbar in IE 10+.\n */\n\ntextarea {\n  overflow: auto;\n}\n\n/**\n * 1. Add the correct box sizing in IE 10.\n * 2. Remove the padding in IE 10.\n */\n\n[type=\"checkbox\"],\n[type=\"radio\"] {\n  -webkit-box-sizing: border-box;\n          box-sizing: border-box; /* 1 */\n  padding: 0; /* 2 */\n}\n\n/**\n * Correct the cursor style of increment and decrement buttons in Chrome.\n */\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/**\n * 1. Correct the odd appearance in Chrome and Safari.\n * 2. Correct the outline style in Safari.\n */\n\n[type=\"search\"] {\n  -webkit-appearance: textfield; /* 1 */\n  outline-offset: -2px; /* 2 */\n}\n\n/**\n * Remove the inner padding in Chrome and Safari on macOS.\n */\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/**\n * 1. Correct the inability to style clickable types in iOS and Safari.\n * 2. Change font properties to `inherit` in Safari.\n */\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button; /* 1 */\n  font: inherit; /* 2 */\n}\n\n/* Interactive\n   ========================================================================== */\n\n/*\n * Add the correct display in Edge, IE 10+, and Firefox.\n */\n\ndetails {\n  display: block;\n}\n\n/*\n * Add the correct display in all browsers.\n */\n\nsummary {\n  display: list-item;\n}\n\n/* Misc\n   ========================================================================== */\n\n/**\n * Add the correct display in IE 10+.\n */\n\ntemplate {\n  display: none;\n}\n\n/**\n * Add the correct display in IE 10.\n */\n\n[hidden] {\n  display: none;\n}\n","h1, h2, h3, p, ul, li, a{\n  font-family: 'Montserrat-Regular';\n  font-weight: normal;\n}\n\nh1{\n  font-size: 1.2rem!important;\n}\n\np{\n  font-family: 'Montserrat-Medium'!important;\n}\n\nul{\n  font-size: 0.8rem;\n  line-height: 1.2rem;\n}\n\n.home{\n  p{\n    font-size: $Fphome;\n    line-height: $Flhome;\n  }\n}\n","Header{\n  position: fixed;\n  top: 0;\n  h1{\n    margin: 30px 0 0 30px;\n  }\n}\n","#start{\n  width: 70%;\n  margin: auto auto auto 10%;\n}\n",".sidebar-right{\n  position: fixed;\n  width: 20%;\n  height: 100%;\n  top: 0;\n  right: 0;\n  display: flex;\n  ul{\n    margin: auto;\n    text-align: right;\n    margin-right: 20px;\n    a{\n      color: grey;\n      position: relative;\n      &:hover{\n        li{\n          position: relative;\n          &::after{\n            content: \" \";\n            top: 7px;\n            right: -13px;\n            display: block;\n            position: absolute;\n            background-color: grey;\n            border-radius: 5px;\n            width: 7px;\n            height: 7px;\n          }\n        }\n      }\n    }\n  }\n}\n"],"names":[],"mappings":"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"} */ +a.sociale, span.sociale { font-family: "syne"; } + +a.culturelle, span.culturelle { font-family: "Avara"; } + +.sidebar-right ul, .sidebar-right a { font-size: 0.8rem; line-height: 1.25rem; } + +.other_projets h3 { font-size: 3.5rem; margin: 0; } + +.card h2 { margin: 0; font-size: 1rem; } + +header { position: fixed; top: 0; left: 0; margin: 0 0 0 0.5rem; padding: 0.5rem 0; width: calc( 80% - 0.5rem); border-bottom: 1px solid black; } + +html, body, header { background: #f9f9f9fe; } + +body #start { width: calc( 80% - 0.5rem); margin: 0.5rem auto auto 0.5rem; } + +body #start #text_figli p a { position: relative; } + +body #start #text_figli p a::after { display: block; content: ''; position: absolute; top: 0; left: 0; transform: translate(-25%, -65%); z-index: 999; } + +body #start #text_figli p a.marg { margin-right: 0.5rem; } + +body #start #text_figli .card { width: calc(100% / 4); height: auto; overflow: hidden; display: inline-block; vertical-align: top; line-height: 0; margin-right: 0.5rem; position: relative; margin-top: 0.5rem; } + +body #start #text_figli .card .card-header { display: none; } + +body #start #text_figli .card .card-header > * { font-size: 0.8rem; line-height: 1rem; margin-right: 0.5rem; } + +body #start #text_figli .card:hover .card-header { width: 100%; background: rgba(255, 255, 255, 0.5); padding: 0.5rem; display: -ms-inline-flexbox; display: inline-flex; -ms-flex-wrap: wrap; flex-wrap: wrap; position: absolute; transform: translateY(-100%); } + +body #start #text_figli .card:last-child { vertical-align: baseline; } + +body:not(.home) #start { margin-top: calc( 2rem + 4rem); } + +.sidebar-right { position: fixed; width: 20%; height: 100%; right: 0; top: 0; display: -ms-inline-flexbox; display: inline-flex; } + +.sidebar-right .list-projets { margin: auto; } + +.sidebar-right .list-projets ul { margin: 0.5rem 0.5rem 0px 0; text-align: right; } + +.sidebar-right .list-projets ul:nth-child(1) { margin-top: 0; } + +.sidebar-right .list-projets ul li:hover a { color: black; } + +.sidebar-right .list-projets ul a { color: grey; } + +#item_list { display: -ms-inline-flexbox; display: inline-flex; -ms-flex-wrap: wrap; flex-wrap: wrap; width: 100%; } + +#item_list .card { width: calc(( 100% / 2 ) - (1rem / 2)); } + +#item_list .card:nth-child(odd) { margin-right: 1rem; } + +#item_list .card .card-header { display: -ms-inline-flexbox; display: inline-flex; width: 100%; margin-bottom: 0.5rem; } + +#item_list .card .card-header > * { margin-right: 0.5rem; } + +#item .card-image img { margin-bottom: 0.5rem; } + +.other_projets { border-top: 1px solid black; display: -ms-flexbox; display: flex; -ms-flex-wrap: wrap; flex-wrap: wrap; margin-top: 1rem; margin-bottom: 1rem; } + +.other_projets h3 { margin: 1rem 0 0.5rem 0; width: 100%; } + +.other_projets .card { width: calc(( 100% / 3 ) - (1rem / 3)); } + +.other_projets .card:nth-child(-1n+3) { margin-right: 0.5rem; } + +.other_projets .card .card-header { display: -ms-flexbox; display: flex; -ms-flex-wrap: wrap; flex-wrap: wrap; } + +.other_projets .card .card-header > * { margin-right: 0.5rem; } + +@media screen and (max-width: 414px) { header a { font-size: 1.5rem; line-height: 2rem; } + .home p { font-size: 1.5rem !important; line-height: 2rem !important; } + .other_projets h3 { font-size: 1.5rem; } + header { width: calc( 100% - (0.5rem * 2)); } + body #start { width: calc( 100% - (0.5rem * 2)); } + body:not(.home) #start { margin-top: 4rem; } + body .sidebar-right { display: none; } + #item_list .card { width: calc( 100%); } + #item_list .card:nth-child(odd) { margin-right: 0; } + #item_list .card .card-header { margin-bottom: 0.5rem; } + #item_list .card .card-header > * { margin-right: 0.5rem; } + .other_projets { margin-top: 1rem; } + .other_projets .card { width: 100%; } + .other_projets .card:nth-child(-1n+3) { margin-right: 0; } } + +@media screen and (max-width: 768px) and (orientation: portrait) { header a { font-size: 2.5rem; line-height: 3rem; } + .home p { font-size: 2.5rem !important; line-height: 3rem !important; } + .other_projets h3 { font-size: 2.5rem; } + body:not(.home) #start { margin-top: 5rem; } + #item_list .card { width: calc( 100%); } + #item_list .card:nth-child(odd) { margin-right: 0; } + #item_list .card .card-header { margin-bottom: 0.5rem; } + #item_list .card .card-header > * { margin-right: 0.5rem; } } + +@media screen and (max-width: 812px) and (orientation: landscape) { header a { font-size: 1.5rem; line-height: 2rem; } + .home p { font-size: 1.5rem !important; line-height: 2rem !important; } + .other_projets h3 { font-size: 1.5rem; } + header { width: calc( 100% - (0.5rem * 2)); } + body #start { width: calc( 100% - (0.5rem * 2)); } + body:not(.home) #start { margin-top: 4rem; } + body .sidebar-right { display: none; } + #item_list .card { width: calc(( 100% / 2 ) - (1rem / 2)); } + #item_list .card:nth-child(odd) { margin-right: 1rem; } + .other_projets .card { width: calc(( 100% / 3 ) - (1rem / 3)); } + .other_projets .card:nth-child(-1n+3) { margin-right: 0.5rem; } } + +@media screen and (max-width: 910px) and (orientation: portrait) { header a { font-size: 2.5rem; line-height: 3rem; } + .home p { font-size: 2.5rem !important; line-height: 3rem !important; } + .other_projets h3 { font-size: 2.5rem; } + body:not(.home) #start { margin-top: 5rem; } } + +@media screen and (max-width: 660px) { header a { font-size: 1.5rem; line-height: 2rem; } + .home p { font-size: 1.5rem !important; line-height: 2rem !important; } + .other_projets h3 { font-size: 1.5rem; } + body:not(.home) #start { margin-top: 4rem; } } + +/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"theme.css","sources":["theme.scss","configurations/_fonts.scss","configurations/_variable.scss","configurations/_extend.scss","theme/_reset.scss","theme/_typography.scss","theme/_header.scss","theme/_start.scss","theme/_sidebar.scss","theme/_blog.scss","theme/_item.scss","theme/_mobile.scss"],"sourcesContent":["// Core variables and mixins\n@import 'configurations/_fonts';\n@import 'configurations/_variable';\n@import 'configurations/_extend';\n@import 'theme/reset';\n@import 'theme/typography';\n\n@import 'theme/header';\n@import 'theme/start';\n@import 'theme/sidebar';\n@import 'theme/blog';\n@import 'theme/item';\n@import 'theme/mobile'; \n","// Font Family\n$font-family-default:  \t\t\t\"Raleway\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n$font-family-header:  \t\t\t\"Montserrat\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n$font-family-mono: \t\t\t\t\"Inconsolata\", monospace;\n$font-family-serif:\t\t\t\t\"Georgia\", \"Times\", \"Times New Roman\", serif;\n// @font-face\n\n$lato: \"lato\";\n$family: \"lato\";\n$file-regular: \"Lato-Regular\";\n$category: \"sans-serif\";\n\n@mixin font-face($lato, $file-regular, $family, $category:\"\") {\n    $filepath: \"../fonts/\" + $family + \"/\" + $file-regular;\n    @font-face {\n        font-family: \"#{$lato}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n              url($filepath + \".ttf\")  format('truetype'),\n              url($filepath + \".svg#\" + $lato + \"\") format('svg');\n    }\n\n    %#{$lato} {\n        font: {\n            @if $category != \"\" {\n                family: \"#{$lato}\", #{$category};\n            }\n            @else {\n                family: \"#{$lato}\";\n                weight: normal;\n            }\n        }\n    }\n}\n\n$syne: \"syne\";\n$family-bold: \"syne\";\n$file-bold: \"Syne-Bold\";\n\n@mixin font-face($syne, $file-bold, $family-bold, $category:\"\") {\n    $filepath: \"../fonts/\" + $family-bold + \"/\" + $file-bold;\n    @font-face {\n        font-family: \"#{$syne}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n    }\n\n    %#{$syne} {\n        font: {\n            @if $category != \"\" {\n                family: \"#{$syne}\", #{$category};\n            }\n            @else {\n                family: \"#{$syne}\";\n                weight: normal;\n            }\n        }\n    }\n}\n\n$avara: \"Avara\";\n$family-bold-italic: \"avara\";\n$file-bold-italic: \"Avara-Bold_Italic_web\";\n\n@mixin font-face($avara, $file-bold-italic, $family-bold-italic, $category:\"\") {\n    $filepath: \"../fonts/\" + $family-bold-italic + \"/\" + $file-bold-italic;\n    @font-face {\n        font-family: \"#{$avara}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n              url($filepath + \".ttf\")  format('truetype'),\n              url($filepath + \".svg#\" + $avara + \"\") format('svg');\n    }\n\n    %#{$avara} {\n        font: {\n            @if $category != \"\" {\n                family: \"#{$avara}\", #{$category};\n            }\n            @else {\n                family: \"#{$avara}\";\n                weight: normal;\n            }\n        }\n    }\n}\n\n$playfair: \"playfairdisplay-regularitalic\";\n$family-italic: \"playfair\";\n$file-italic: \"playfairdisplay-regularitalic\";\n\n@mixin font-face($playfair, $file-italic, $family-italic, $category:\"\") {\n    $filepath: \"../fonts/\" + $family-italic + \"/\" + $file-italic;\n    @font-face {\n        font-family: \"#{$playfair}\";\n        src: url($filepath + \".eot\");\n        src: url($filepath + \".eot?#iefix\") format('embedded-opentype'),\n              url($filepath + \".woff\") format('woff'),\n              url($filepath + \".ttf\")  format('truetype'),\n              url($filepath + \".svg#\" + $playfair + \"\") format('svg');\n    }\n\n    %#{$playfair} {\n        font: {\n            @if $category != \"\" {\n              family: \"#{$playfair}\", #{$category};\n            }\n            @else {\n                family: \"#{$playfair}\";\n                weight: normal;\n            }\n        }\n    }\n}\n","@include font-face($lato, $file-regular, $family, $category);//1\n@include font-face($syne, $file-bold, $family-bold, $category);//2\n@include font-face($avara, $file-bold-italic, $family-bold-italic, $category);//2\n@include font-face($playfair, $file-italic, $family-italic, $category);//2\n\n// font-size\n$txt-figli: 3.5rem;\n\n// line-height\n$Flhome: 4rem;\n\n$marg: 0.5rem;\n$margI: 1rem;\n$Wi: 80%;\n\n$Wi50: calc(( 100% / 2 ) - (#{$margI} / 2));\n$Wi33: calc(( 100% / 3 ) - (#{$margI} / 3));\n\n\n// mobile\n$txt-figli-m: 1.5rem;\n\n// line-height\n$Flhome-m: 2rem;\n$Wi-m:100%;\n\n// tablette\n$txt-figli-t: 2.5rem;\n\n// line-height\n$Flhome-t: 3rem;\n","","/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */\n\n/* Document\n   ========================================================================== */\n\n/**\n * 1. Correct the line height in all browsers.\n * 2. Prevent adjustments of font size after orientation changes in iOS.\n */\n\nhtml {\n  margin: 0;\n  padding: 0;\n  line-height: 1.15; /* 1 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n  font-size: 16px;\n}\n\n/* Sections\n   ========================================================================== */\n\n/**\n * Remove the margin in all browsers.\n */\n\nbody {\n  margin: 0;\n  padding: 0;\n}\n\n/**\n * Render the `main` element consistently in IE.\n */\n\nmain {\n  display: block;\n}\n\n/**\n * Correct the font size and margin on `h1` elements within `section` and\n * `article` contexts in Chrome, Firefox, and Safari.\n */\n\nh1 {\n  font-size: auto;\n  margin:0;\n}\n\n/* Grouping content\n   ========================================================================== */\n\n/**\n * 1. Add the correct box sizing in Firefox.\n * 2. Show the overflow in Edge and IE.\n */\n\nhr {\n  -webkit-box-sizing: content-box;\n          box-sizing: content-box; /* 1 */\n  height: 0; /* 1 */\n  overflow: visible; /* 2 */\n}\n\n/**\n * 1. Correct the inheritance and scaling of font size in all browsers.\n * 2. Correct the odd `em` font sizing in all browsers.\n */\n\npre {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/* Text-level semantics\n   ========================================================================== */\n\n/**\n * Remove the gray background on active links in IE 10.\n */\np{\n margin: 0;\n}\n\nul{\n  list-style: none;\n}\nul,li{\n  margin: 0;\n  padding: 0;\n}\n\na {\n  background-color: transparent;\n  color: black;\n  text-decoration: none;\n}\n\n/**\n * 1. Remove the bottom border in Chrome 57-\n * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n */\n\nabbr[title] {\n  border-bottom: none; /* 1 */\n  text-decoration: underline; /* 2 */\n  -webkit-text-decoration: underline dotted;\n          text-decoration: underline dotted; /* 2 */\n}\n\n/**\n * Add the correct font weight in Chrome, Edge, and Safari.\n */\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\n/**\n * 1. Correct the inheritance and scaling of font size in all browsers.\n * 2. Correct the odd `em` font sizing in all browsers.\n */\n\ncode,\nkbd,\nsamp {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/**\n * Add the correct font size in all browsers.\n */\n\nsmall {\n  font-size: 80%;\n}\n\n/**\n * Prevent `sub` and `sup` elements from affecting the line height in\n * all browsers.\n */\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\n/* Embedded content\n   ========================================================================== */\n\n/**\n * Remove the border on images inside links in IE 10.\n */\n\nimg {\n  border-style: none;\n  width: 100%;\n  height: 100%;\n  vertical-align: bottom;\n}\n\n/* Forms\n   ========================================================================== */\n\n/**\n * 1. Change the font styles in all browsers.\n * 2. Remove the margin in Firefox and Safari.\n */\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font-family: inherit; /* 1 */\n  font-size: 100%; /* 1 */\n  line-height: 1.15; /* 1 */\n  margin: 0; /* 2 */\n}\n\n/**\n * Show the overflow in IE.\n * 1. Show the overflow in Edge.\n */\n\nbutton,\ninput { /* 1 */\n  overflow: visible;\n}\n\n/**\n * Remove the inheritance of text transform in Edge, Firefox, and IE.\n * 1. Remove the inheritance of text transform in Firefox.\n */\n\nbutton,\nselect { /* 1 */\n  text-transform: none;\n}\n\n/**\n * Correct the inability to style clickable types in iOS and Safari.\n */\n\nbutton,\n[type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\n/**\n * Remove the inner border and padding in Firefox.\n */\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  border-style: none;\n  padding: 0;\n}\n\n/**\n * Restore the focus styles unset by the previous rule.\n */\n\nbutton:-moz-focusring,\n[type=\"button\"]:-moz-focusring,\n[type=\"reset\"]:-moz-focusring,\n[type=\"submit\"]:-moz-focusring {\n  outline: 1px dotted ButtonText;\n}\n\n/**\n * Correct the padding in Firefox.\n */\n\nfieldset {\n  padding: 0.35em 0.75em 0.625em;\n}\n\n/**\n * 1. Correct the text wrapping in Edge and IE.\n * 2. Correct the color inheritance from `fieldset` elements in IE.\n * 3. Remove the padding so developers are not caught out when they zero out\n *    `fieldset` elements in all browsers.\n */\n\nlegend {\n  -webkit-box-sizing: border-box;\n          box-sizing: border-box; /* 1 */\n  color: inherit; /* 2 */\n  display: table; /* 1 */\n  max-width: 100%; /* 1 */\n  padding: 0; /* 3 */\n  white-space: normal; /* 1 */\n}\n\n/**\n * Add the correct vertical alignment in Chrome, Firefox, and Opera.\n */\n\nprogress {\n  vertical-align: baseline;\n}\n\n/**\n * Remove the default vertical scrollbar in IE 10+.\n */\n\ntextarea {\n  overflow: auto;\n}\n\n/**\n * 1. Add the correct box sizing in IE 10.\n * 2. Remove the padding in IE 10.\n */\n\n[type=\"checkbox\"],\n[type=\"radio\"] {\n  -webkit-box-sizing: border-box;\n          box-sizing: border-box; /* 1 */\n  padding: 0; /* 2 */\n}\n\n/**\n * Correct the cursor style of increment and decrement buttons in Chrome.\n */\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/**\n * 1. Correct the odd appearance in Chrome and Safari.\n * 2. Correct the outline style in Safari.\n */\n\n[type=\"search\"] {\n  -webkit-appearance: textfield; /* 1 */\n  outline-offset: -2px; /* 2 */\n}\n\n/**\n * Remove the inner padding in Chrome and Safari on macOS.\n */\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/**\n * 1. Correct the inability to style clickable types in iOS and Safari.\n * 2. Change font properties to `inherit` in Safari.\n */\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button; /* 1 */\n  font: inherit; /* 2 */\n}\n\n/* Interactive\n   ========================================================================== */\n\n/*\n * Add the correct display in Edge, IE 10+, and Firefox.\n */\n\ndetails {\n  display: block;\n}\n\n/*\n * Add the correct display in all browsers.\n */\n\nsummary {\n  display: list-item;\n}\n\n/* Misc\n   ========================================================================== */\n\n/**\n * Add the correct display in IE 10+.\n */\n\ntemplate {\n  display: none;\n}\n\n/**\n * Add the correct display in IE 10.\n */\n\n[hidden] {\n  display: none;\n}\n","h1, h2, h3, p, ul, li, a, span{\n  font-family: $lato;\n  font-weight: lighter;\n}\n\nheader{\n  a{\n    font-size: $txt-figli;\n    line-height: $Flhome;\n  }\n}\n\n.home{\n  p{\n    font-size: $txt-figli;\n    line-height: $Flhome;\n  }\n  #text_figli{\n    strong{\n      position: relative;\n      &::after{\n        display: block;\n        position: absolute;\n        content: \"\";\n        width: 100%;\n        height: 1px;\n        background: black;\n        bottom: 0;\n      }\n    }\n    a{\n      position: relative;\n      &:nth-child(1){\n      }\n      &:nth-child(2){\n        font-family: $playfair;\n      }\n      &:nth-child(3){\n        font-family: $syne;\n      }\n      &:nth-child(4){\n        font-family: $avara;\n      }\n    }\n  }\n}\n\n#item{\n  .content-title{\n    display: flex;\n    margin: $marg 0;\n    & > * {\n      margin-right: $marg;\n      font-size: 1.15rem;\n    }\n    h2{\n      margin: 0 $marg 0 0;\n    }\n  }\n}\n\na.publique, span.publique{\n  font-family: $playfair;\n}\n\na.sociale, span.sociale{\n  font-family: $syne;\n}\n\na.culturelle, span.culturelle{\n  font-family: $avara;\n}\n\n.sidebar-right{\n  ul, a{\n    font-size: 0.8rem;\n    line-height: 1.25rem;\n  }\n}\n\n.other_projets{\n  h3{\n    font-size: $txt-figli;\n    margin: 0;\n  }\n}\n\n.card{\n  h2{\n    margin: 0;\n    font-size: 1rem;\n  }\n}\n","header{\n  position: fixed;\n  top: 0;\n  left: 0;\n  margin: 0 0 0 $marg;\n  padding: $marg 0;\n  width: calc( #{$Wi} - #{$marg} );\n  border-bottom: 1px solid black;\n}\n","html, body, header{\n  background: #f9f9f9fe;\n}\n\nbody{\n  #start{\n      width: calc( #{$Wi} - #{$marg} );\n      margin: $marg auto auto $marg;\n      #text_figli{\n        p {\n          a{\n            position: relative;\n              &::after{\n                display: block;\n                content: '';\n                position: absolute;\n                top: 0;\n                left: 0;\n                transform: translate(-25%,-65%);\n                z-index: 999;\n              }\n            // &:hover{\n            //   &::after{\n            //     content: url('/user/themes/figureslibres/images/ovale.svg');\n            //     width: 100%;\n            //     height: 100%;\n            //     top: 0;\n            //     left: 0;\n            //   }\n            // }\n            &.marg{\n              margin-right: $marg;\n            }\n          }\n        }\n        .card{\n          width: calc(100% / 4);\n          height: auto;\n          overflow: hidden;\n          display: inline-block;\n          vertical-align: top;\n          line-height: 0;\n          margin-right: $marg;\n          position: relative;\n          margin-top: $marg;\n          .card-header{\n            display: none;\n            & > *{\n              font-size: 0.8rem;\n              line-height: 1rem;\n              margin-right: $marg;\n            }\n          }\n          &:hover{\n            .card-header{\n              width: 100%;\n              background: rgba(255, 255, 255, 0.5);\n              padding: $marg;\n              display: inline-flex;\n              flex-wrap: wrap;\n              position: absolute;\n              transform: translateY(-100%);\n            }\n          }\n          &:last-child{\n            vertical-align: baseline;\n          }\n        }\n      }\n  }\n  &:not(.home){\n    #start{\n      margin-top: calc( 2rem +  #{$Flhome});\n    }\n  }\n}\n",".sidebar-right{\n  position: fixed;\n  width: 20%;\n  height: 100%;\n  right: 0;\n  top: 0;\n  display: inline-flex;\n  .list-projets{\n    margin: auto;\n    ul{\n      &:nth-child(1){\n        margin-top: 0;\n      }\n      margin: $marg $marg 0px 0;\n      text-align: right;\n      li{\n        &:hover{\n          a{\n            color: black;\n          }\n        }\n      }\n      a{\n        color: grey;\n      }\n    }\n  }\n}\n","#item_list{\n    display: inline-flex;\n    flex-wrap: wrap;\n    width: 100%;\n  .card{\n    width: $Wi50;\n    &:nth-child(odd){\n      margin-right: $margI;\n    }\n    .card-header{\n      display: inline-flex;\n      width: 100%;\n      margin-bottom: $marg;\n      & > * {\n        margin-right: $marg;\n      }\n    }\n  }\n}\n","#item{\n  .card-image{\n    img{\n      margin-bottom: $marg;\n    }\n  }\n}\n\n.other_projets{\n  border-top: 1px solid black;\n  display: flex;\n  flex-wrap: wrap;\n  margin-top: $margI;\n  margin-bottom: $margI;\n  h3{\n    margin: 1rem 0 $marg 0;\n    width: 100%;\n  }\n  .card{\n    width: $Wi33;\n    &:nth-child(-1n+3){\n      margin-right: $marg;\n    }\n    .card-header{\n      display: flex;\n      flex-wrap: wrap;\n      & > *{\n        margin-right: $marg;\n      }\n    }\n  }\n}\n","@media screen and (max-width: 414px) {\n  // typographie\n  header{\n    a{\n      font-size: $txt-figli-m;\n      line-height: $Flhome-m;\n    }\n  }\n  .home{\n    p{\n      font-size: $txt-figli-m!important;\n      line-height: $Flhome-m!important;\n    }\n  }\n  .other_projets{\n    h3{\n      font-size: $txt-figli-m;\n    }\n  }\n\n  // mep\n  header{\n    width: calc( #{$Wi-m} - (#{$marg} * 2) );\n  }\n\n  body{\n    #start{\n        width: calc( #{$Wi-m} - (#{$marg} * 2) );\n    }\n    &:not(.home){\n      #start{\n        margin-top: $Flhome;\n      }\n    }\n    .sidebar-right{\n      display: none;\n    }\n  }\n\n  #item_list{\n    .card{\n      width: calc( #{$Wi-m}  );\n      &:nth-child(odd){\n        margin-right: 0;\n      }\n      .card-header{\n        margin-bottom: $marg;\n        & > * {\n          margin-right: $marg;\n        }\n      }\n    }\n  }\n\n  .other_projets{\n    margin-top: $margI;\n    .card{\n      width: $Wi-m;\n      &:nth-child(-1n+3){\n        margin-right: 0;\n      }\n    }\n  }\n}\n\n@media screen and (max-width: 768px)  and (orientation: portrait) {\n  // typographie\n  header{\n    a{\n      font-size: 2.5rem;\n      line-height: 3rem;\n    }\n  }\n  .home{\n    p{\n      font-size: $txt-figli-t!important;\n      line-height: $Flhome-t!important;\n    }\n  }\n  .other_projets{\n    h3{\n      font-size: $txt-figli-t;\n    }\n  }\n\n  body{\n    &:not(.home){\n      #start{\n        margin-top: 5rem;\n      }\n    }\n  }\n\n  #item_list{\n    .card{\n      width: calc( #{$Wi-m}  );\n      &:nth-child(odd){\n        margin-right: 0;\n      }\n      .card-header{\n        margin-bottom: $marg;\n        & > * {\n          margin-right: $marg;\n        }\n      }\n    }\n  }\n\n\n\n}\n\n@media screen and (max-width: 812px) and (orientation: landscape) {\n  // typographie\n  header{\n    a{\n      font-size: $txt-figli-m;\n      line-height: $Flhome-m;\n    }\n  }\n  .home{\n    p{\n      font-size: $txt-figli-m!important;\n      line-height: $Flhome-m!important;\n    }\n  }\n  .other_projets{\n    h3{\n      font-size: $txt-figli-m;\n    }\n  }\n\n  // mep\n  header{\n    width: calc( #{$Wi-m} - (#{$marg} * 2) );\n  }\n\n  body{\n    #start{\n        width: calc( #{$Wi-m} - (#{$marg} * 2) );\n    }\n    &:not(.home){\n      #start{\n        margin-top: $Flhome;\n      }\n    }\n    .sidebar-right{\n      display: none;\n    }\n  }\n\n  #item_list{\n    .card{\n      width: $Wi50;\n      &:nth-child(odd){\n        margin-right: $margI;\n      }\n    }\n  }\n\n  .other_projets{\n    .card{\n      width: $Wi33;\n      &:nth-child(-1n+3){\n        margin-right: $marg;\n      }\n    }\n  }\n}\n\n@media screen and (max-width: 910px) and (orientation: portrait) {\n  header{\n    a{\n      font-size: 2.5rem;\n      line-height: 3rem;\n    }\n  }\n  .home{\n    p{\n      font-size: $txt-figli-t!important;\n      line-height: $Flhome-t!important;\n    }\n  }\n  .other_projets{\n    h3{\n      font-size: $txt-figli-t;\n    }\n  }\n  body{\n    &:not(.home){\n      #start{\n        margin-top: 5rem;\n      }\n    }\n  }\n}\n\n@media screen and (max-width: 660px) {\n  header{\n    a{\n      font-size: $txt-figli-m;\n      line-height: $Flhome-m;\n    }\n  }\n  .home{\n    p{\n      font-size: $txt-figli-m!important;\n      line-height: $Flhome-m!important;\n    }\n  }\n  .other_projets{\n    h3{\n      font-size: $txt-figli-m;\n    }\n  }\n\n  body{\n    &:not(.home){\n      #start{\n        margin-top: $Flhome;\n      }\n    }\n  }\n}\n"],"names":[],"mappings":"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"} */ diff --git a/user/themes/figureslibres/css-compiled/theme.min.css b/user/themes/figureslibres/css-compiled/theme.min.css index eb42ced..e8138a3 100644 --- a/user/themes/figureslibres/css-compiled/theme.min.css +++ b/user/themes/figureslibres/css-compiled/theme.min.css @@ -1 +1 @@ -@font-face{font-family:Montserrat-Regular;src:url(../fonts/montserrat/Montserrat-Regular.eot);src:url(../fonts/montserrat/Montserrat-Regular.eot?#iefix) format('embedded-opentype'),url(../fonts/montserrat/Montserrat-Regular.woff) format('woff'),url(../fonts/montserrat/Montserrat-Regular.ttf) format('truetype'),url(../fonts/montserrat/Montserrat-Regular.svg#Montserrat-Regular) format('svg')}@font-face{font-family:Montserrat-medium;src:url(../fonts/montserrat/Montserrat-Medium.eot);src:url(../fonts/montserrat/Montserrat-Medium.eot?#iefix) format('embedded-opentype'),url(../fonts/montserrat/Montserrat-Medium.woff) format('woff'),url(../fonts/montserrat/Montserrat-Medium.ttf) format('truetype'),url(../fonts/montserrat/Montserrat-Medium.svg#Montserrat-medium) format('svg')}/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;margin:0;padding:0;-webkit-text-size-adjust:100%}body{margin:0;padding:0 50px 0 50px}main{display:block}h1{font-size:2em;margin:0}hr{overflow:visible;box-sizing:content-box;height:0}pre{font-family:monospace,monospace;font-size:1em}ul{list-style:none}li,ul{margin:0;padding:0}a{text-decoration:none;color:#000;background-color:transparent}abbr[title]{text-decoration:underline;text-decoration:underline dotted;border-bottom:none;-webkit-text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{width:100%;height:100%;border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{display:table;box-sizing:border-box;max-width:100%;padding:0;white-space:normal;color:inherit}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}a,h1,h2,h3,li,p,ul{font-family:Montserrat-Regular;font-weight:400}h1{font-size:1.2rem!important}p{font-family:Montserrat-Medium!important}ul{font-size:.8rem;line-height:1.2rem}.home p{font-size:3rem;line-height:4rem}header{position:fixed;top:0}header h1{margin:30px 0 0 30px}#start{width:70%;margin:auto auto auto 10%}.sidebar-right{position:fixed;top:0;right:0;display:-ms-flexbox;display:flex;width:20%;height:100%}.sidebar-right ul{margin:auto;margin-right:20px;text-align:right}.sidebar-right ul a{position:relative;color:grey}.sidebar-right ul a:hover li{position:relative}.sidebar-right ul a:hover li::after{position:absolute;top:7px;right:-13px;display:block;width:7px;height:7px;content:' ';border-radius:5px;background-color:grey} \ No newline at end of file +@font-face{font-family:lato;src:url(../fonts/lato/Lato-Regular.eot);src:url(../fonts/lato/Lato-Regular.eot?#iefix) format('embedded-opentype'),url(../fonts/lato/Lato-Regular.woff) format('woff'),url(../fonts/lato/Lato-Regular.ttf) format('truetype'),url(../fonts/lato/Lato-Regular.svg#lato) format('svg')}@font-face{font-family:syne;src:url(../fonts/syne/Syne-Bold.eot);src:url(../fonts/syne/Syne-Bold.eot?#iefix) format('embedded-opentype'),url(../fonts/syne/Syne-Bold.woff) format('woff'),url(../fonts/syne/Syne-Bold.ttf) format('truetype'),url(../fonts/syne/Syne-Bold.svg#syne) format('svg')}@font-face{font-family:Avara;src:url(../fonts/avara/Avara-Bold_Italic_web.eot);src:url(../fonts/avara/Avara-Bold_Italic_web.eot?#iefix) format('embedded-opentype'),url(../fonts/avara/Avara-Bold_Italic_web.woff) format('woff'),url(../fonts/avara/Avara-Bold_Italic_web.ttf) format('truetype'),url(../fonts/avara/Avara-Bold_Italic_web.svg#Avara) format('svg')}@font-face{font-family:playfairdisplay-regularitalic;src:url(../fonts/playfair/playfairdisplay-regularitalic.eot);src:url(../fonts/playfair/playfairdisplay-regularitalic.eot?#iefix) format('embedded-opentype'),url(../fonts/playfair/playfairdisplay-regularitalic.woff) format('woff'),url(../fonts/playfair/playfairdisplay-regularitalic.ttf) format('truetype'),url(../fonts/playfair/playfairdisplay-regularitalic.svg#playfairdisplay-regularitalic) format('svg')}/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{font-size:16px;line-height:1.15;margin:0;padding:0;-webkit-text-size-adjust:100%}body{margin:0;padding:0}main{display:block}h1{font-size:auto;margin:0}hr{overflow:visible;box-sizing:content-box;height:0}pre{font-family:monospace,monospace;font-size:1em}p{margin:0}ul{list-style:none}li,ul{margin:0;padding:0}a{text-decoration:none;color:#000;background-color:transparent}abbr[title]{text-decoration:underline;text-decoration:underline dotted;border-bottom:none;-webkit-text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{width:100%;height:100%;vertical-align:bottom;border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{display:table;box-sizing:border-box;max-width:100%;padding:0;white-space:normal;color:inherit}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}a,h1,h2,h3,li,p,span,ul{font-family:lato;font-weight:lighter}header a{font-size:3.5rem;line-height:4rem}.home p{font-size:3.5rem;line-height:4rem}.home #text_figli strong{position:relative}.home #text_figli strong::after{position:absolute;bottom:0;display:block;width:100%;height:1px;content:'';background:#000}.home #text_figli a{position:relative}.home #text_figli a:nth-child(2){font-family:playfairdisplay-regularitalic}.home #text_figli a:nth-child(3){font-family:syne}.home #text_figli a:nth-child(4){font-family:Avara}#item .content-title{display:-ms-flexbox;display:flex;margin:.5rem 0}#item .content-title>*{font-size:1.15rem;margin-right:.5rem}#item .content-title h2{margin:0 .5rem 0 0}a.publique,span.publique{font-family:playfairdisplay-regularitalic}a.sociale,span.sociale{font-family:syne}a.culturelle,span.culturelle{font-family:Avara}.sidebar-right a,.sidebar-right ul{font-size:.8rem;line-height:1.25rem}.other_projets h3{font-size:3.5rem;margin:0}.card h2{font-size:1rem;margin:0}header{position:fixed;top:0;left:0;width:calc(80% - .5rem);margin:0 0 0 .5rem;padding:.5rem 0;border-bottom:1px solid #000}body,header,html{background:#f9f9f9fe}body #start{width:calc(80% - .5rem);margin:.5rem auto auto .5rem}body #start #text_figli p a{position:relative}body #start #text_figli p a::after{position:absolute;z-index:999;top:0;left:0;display:block;content:'';transform:translate(-25%,-65%)}body #start #text_figli p a.marg{margin-right:.5rem}body #start #text_figli .card{line-height:0;position:relative;display:inline-block;overflow:hidden;width:calc(100% / 4);height:auto;margin-top:.5rem;margin-right:.5rem;vertical-align:top}body #start #text_figli .card .card-header{display:none}body #start #text_figli .card .card-header>*{font-size:.8rem;line-height:1rem;margin-right:.5rem}body #start #text_figli .card:hover .card-header{position:absolute;display:-ms-inline-flexbox;display:inline-flex;width:100%;padding:.5rem;transform:translateY(-100%);background:rgba(255,255,255,.5);-ms-flex-wrap:wrap;flex-wrap:wrap}body #start #text_figli .card:last-child{vertical-align:baseline}body:not(.home) #start{margin-top:calc(2rem + 4rem)}.sidebar-right{position:fixed;top:0;right:0;display:-ms-inline-flexbox;display:inline-flex;width:20%;height:100%}.sidebar-right .list-projets{margin:auto}.sidebar-right .list-projets ul{margin:.5rem .5rem 0 0;text-align:right}.sidebar-right .list-projets ul:nth-child(1){margin-top:0}.sidebar-right .list-projets ul li:hover a{color:#000}.sidebar-right .list-projets ul a{color:grey}#item_list{display:-ms-inline-flexbox;display:inline-flex;width:100%;-ms-flex-wrap:wrap;flex-wrap:wrap}#item_list .card{width:calc((100% / 2) - (1rem / 2))}#item_list .card:nth-child(odd){margin-right:1rem}#item_list .card .card-header{display:-ms-inline-flexbox;display:inline-flex;width:100%;margin-bottom:.5rem}#item_list .card .card-header>*{margin-right:.5rem}#item .card-image img{margin-bottom:.5rem}.other_projets{display:-ms-flexbox;display:flex;margin-top:1rem;margin-bottom:1rem;border-top:1px solid #000;-ms-flex-wrap:wrap;flex-wrap:wrap}.other_projets h3{width:100%;margin:1rem 0 .5rem 0}.other_projets .card{width:calc((100% / 3) - (1rem / 3))}.other_projets .card:nth-child(-1n+3){margin-right:.5rem}.other_projets .card .card-header{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.other_projets .card .card-header>*{margin-right:.5rem}@media screen and (max-width:414px){header a{font-size:1.5rem;line-height:2rem}.home p{font-size:1.5rem!important;line-height:2rem!important}.other_projets h3{font-size:1.5rem}header{width:calc(100% - (.5rem * 2))}body #start{width:calc(100% - (.5rem * 2))}body:not(.home) #start{margin-top:4rem}body .sidebar-right{display:none}#item_list .card{width:calc(100%)}#item_list .card:nth-child(odd){margin-right:0}#item_list .card .card-header{margin-bottom:.5rem}#item_list .card .card-header>*{margin-right:.5rem}.other_projets{margin-top:1rem}.other_projets .card{width:100%}.other_projets .card:nth-child(-1n+3){margin-right:0}}@media screen and (max-width:768px) and (orientation:portrait){header a{font-size:2.5rem;line-height:3rem}.home p{font-size:2.5rem!important;line-height:3rem!important}.other_projets h3{font-size:2.5rem}body:not(.home) #start{margin-top:5rem}#item_list .card{width:calc(100%)}#item_list .card:nth-child(odd){margin-right:0}#item_list .card .card-header{margin-bottom:.5rem}#item_list .card .card-header>*{margin-right:.5rem}}@media screen and (max-width:812px) and (orientation:landscape){header a{font-size:1.5rem;line-height:2rem}.home p{font-size:1.5rem!important;line-height:2rem!important}.other_projets h3{font-size:1.5rem}header{width:calc(100% - (.5rem * 2))}body #start{width:calc(100% - (.5rem * 2))}body:not(.home) #start{margin-top:4rem}body .sidebar-right{display:none}#item_list .card{width:calc((100% / 2) - (1rem / 2))}#item_list .card:nth-child(odd){margin-right:1rem}.other_projets .card{width:calc((100% / 3) - (1rem / 3))}.other_projets .card:nth-child(-1n+3){margin-right:.5rem}}@media screen and (max-width:910px) and (orientation:portrait){header a{font-size:2.5rem;line-height:3rem}.home p{font-size:2.5rem!important;line-height:3rem!important}.other_projets h3{font-size:2.5rem}body:not(.home) #start{margin-top:5rem}}@media screen and (max-width:660px){header a{font-size:1.5rem;line-height:2rem}.home p{font-size:1.5rem!important;line-height:2rem!important}.other_projets h3{font-size:1.5rem}body:not(.home) #start{margin-top:4rem}} \ No newline at end of file diff --git a/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.eot b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.eot new file mode 100644 index 0000000..215482b Binary files /dev/null and b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.eot differ diff --git a/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.svg b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.svg new file mode 100644 index 0000000..fbc51c7 --- /dev/null +++ b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.svg @@ -0,0 +1,1201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.ttf b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.ttf new file mode 100644 index 0000000..3236875 Binary files /dev/null and b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.ttf differ diff --git a/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff new file mode 100644 index 0000000..4dbd145 Binary files /dev/null and b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff differ diff --git a/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff2 b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff2 new file mode 100644 index 0000000..f8081a3 Binary files /dev/null and b/user/themes/figureslibres/fonts/arcoperpetuo/arcoperpetuo-regular.woff2 differ diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.eot b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.eot new file mode 100644 index 0000000..370bc5b Binary files /dev/null and b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.eot differ diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.otf b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.otf new file mode 100644 index 0000000..f5f3701 Binary files /dev/null and b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.otf differ diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.svg b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.svg new file mode 100644 index 0000000..16f53ad --- /dev/null +++ b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.ttf b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.ttf new file mode 100644 index 0000000..8439f8f Binary files /dev/null and b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.ttf differ diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff new file mode 100644 index 0000000..25657fb Binary files /dev/null and b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff differ diff --git a/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff2 b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff2 new file mode 100644 index 0000000..f94bcfe Binary files /dev/null and b/user/themes/figureslibres/fonts/avara/Avara-Bold_Italic_web.woff2 differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Medium.eot b/user/themes/figureslibres/fonts/lato/Lato-Medium.eot new file mode 100644 index 0000000..c4114dd Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Medium.eot differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Medium.ttf b/user/themes/figureslibres/fonts/lato/Lato-Medium.ttf new file mode 100644 index 0000000..4684a7e Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Medium.ttf differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Medium.woff b/user/themes/figureslibres/fonts/lato/Lato-Medium.woff new file mode 100644 index 0000000..39d53fd Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Medium.woff differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Medium.woff2 b/user/themes/figureslibres/fonts/lato/Lato-Medium.woff2 new file mode 100644 index 0000000..01792cb Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Medium.woff2 differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Regular.eot b/user/themes/figureslibres/fonts/lato/Lato-Regular.eot new file mode 100644 index 0000000..11e3f2a Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Regular.eot differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Regular.ttf b/user/themes/figureslibres/fonts/lato/Lato-Regular.ttf new file mode 100644 index 0000000..74decd9 Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Regular.ttf differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Regular.woff b/user/themes/figureslibres/fonts/lato/Lato-Regular.woff new file mode 100644 index 0000000..ae1307f Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Regular.woff differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Regular.woff2 b/user/themes/figureslibres/fonts/lato/Lato-Regular.woff2 new file mode 100644 index 0000000..3bf9843 Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Regular.woff2 differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Semibold.eot b/user/themes/figureslibres/fonts/lato/Lato-Semibold.eot new file mode 100644 index 0000000..d46c5f9 Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Semibold.eot differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Semibold.ttf b/user/themes/figureslibres/fonts/lato/Lato-Semibold.ttf new file mode 100644 index 0000000..faf591e Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Semibold.ttf differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff b/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff new file mode 100644 index 0000000..794417f Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff differ diff --git a/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff2 b/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff2 new file mode 100644 index 0000000..5916925 Binary files /dev/null and b/user/themes/figureslibres/fonts/lato/Lato-Semibold.woff2 differ diff --git a/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.eot b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.eot new file mode 100644 index 0000000..728b217 Binary files /dev/null and b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.eot differ diff --git a/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.svg b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.svg new file mode 100644 index 0000000..d872bab --- /dev/null +++ b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.svg @@ -0,0 +1,652 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff new file mode 100644 index 0000000..d76e417 Binary files /dev/null and b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff differ diff --git a/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff2 b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff2 new file mode 100644 index 0000000..296925a Binary files /dev/null and b/user/themes/figureslibres/fonts/playfair/playfairdisplay-regularitalic.woff2 differ diff --git a/user/themes/figureslibres/fonts/syne/Syne-Bold.eot b/user/themes/figureslibres/fonts/syne/Syne-Bold.eot new file mode 100644 index 0000000..71eee22 Binary files /dev/null and b/user/themes/figureslibres/fonts/syne/Syne-Bold.eot differ diff --git a/user/themes/figureslibres/fonts/syne/Syne-Bold.woff b/user/themes/figureslibres/fonts/syne/Syne-Bold.woff new file mode 100644 index 0000000..717673c Binary files /dev/null and b/user/themes/figureslibres/fonts/syne/Syne-Bold.woff differ diff --git a/user/themes/figureslibres/fonts/syne/Syne-Bold.woff2 b/user/themes/figureslibres/fonts/syne/Syne-Bold.woff2 new file mode 100644 index 0000000..0eda1fb Binary files /dev/null and b/user/themes/figureslibres/fonts/syne/Syne-Bold.woff2 differ diff --git a/user/themes/figureslibres/gulpfile.js b/user/themes/figureslibres/gulpfile.js old mode 100755 new mode 100644 diff --git a/user/themes/figureslibres/images/ovale.svg b/user/themes/figureslibres/images/ovale.svg new file mode 100644 index 0000000..abf988b --- /dev/null +++ b/user/themes/figureslibres/images/ovale.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/user/themes/figureslibres/js/script_k.js b/user/themes/figureslibres/js/script_k.js index 4084c05..5e4baf7 100644 --- a/user/themes/figureslibres/js/script_k.js +++ b/user/themes/figureslibres/js/script_k.js @@ -1,14 +1,33 @@ -var $Sba = $('.sidebar-right a'); -var $Sbsvg = $('.sidebar-right svg'); +var $culturelle = $('#text_figli p > a:nth-of-type(3)'); -function addclass() { - $Sba.hover(function() { - $(this).addClass("hover"); - }, function() { - $(this).removeClass("hover"); +function ajax() { + $.ajax({ + url : 'projets/culturelle.html', // La ressource ciblée + type : 'GET', // Le type de la requête HTTP + dataType:'html', + success: function(data) { + $(data).find('.card').insertAfter($culturelle); + } + }); +} + +function deploy() { + $culturelle.click(function(e){ + $(this).addClass('marg'); + e.preventDefault() + + var $detectCard = $('#text_figli > p > .card'); + if ($detectCard[0]) { + console.log(true); + $(".card").remove(); + $(this).removeClass("marg"); + }else{ + console.log(false); + ajax(); + } }); } jQuery(document).ready(function($){ - addclass(); + deploy(); }); diff --git a/user/themes/figureslibres/package-lock.json b/user/themes/figureslibres/package-lock.json index c11e143..3c173c0 100644 --- a/user/themes/figureslibres/package-lock.json +++ b/user/themes/figureslibres/package-lock.json @@ -44,9 +44,9 @@ "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" }, "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz", + "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -55,6 +55,26 @@ "uri-js": "^4.2.2" } }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -97,6 +117,52 @@ "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", "dev": true }, + "any": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/any/-/any-1.0.0.tgz", + "integrity": "sha1-Cns0jFifr2unCNSiJBBp6lFii14=", + "requires": { + "for-own": "^0.1.2", + "make-iterator": "^0.1.0" + }, + "dependencies": { + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "^1.0.1" + } + }, + "make-iterator": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-0.1.1.tgz", + "integrity": "sha1-hz0nuBmKRlqBSDtvXRbaToY+z1s=", + "requires": { + "for-own": "^0.1.1" + } + } + } + }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "append-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", + "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", + "dev": true, + "requires": { + "buffer-equal": "^1.0.0" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -157,17 +223,32 @@ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", "dev": true }, + "arr-filter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz", + "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", + "dev": true, + "requires": { + "make-iterator": "^1.0.0" + } + }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz", + "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", + "requires": { + "make-iterator": "^1.0.0" + } }, "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, "array-differ": { "version": "1.0.0", @@ -187,12 +268,66 @@ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, + "array-initial": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", + "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", + "dev": true, + "requires": { + "array-slice": "^1.0.0", + "is-number": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true + } + } + }, + "array-last": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz", + "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", + "dev": true, + "requires": { + "is-number": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true + } + } + }, "array-slice": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", "dev": true }, + "array-sort": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz", + "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", + "dev": true, + "requires": { + "default-compare": "^1.0.0", + "get-value": "^2.0.6", + "kind-of": "^5.0.2" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, "array-uniq": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", @@ -226,12 +361,39 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, + "async-done": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", + "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.2", + "process-nextick-args": "^2.0.0", + "stream-exhaust": "^1.0.1" + } + }, + "async-each": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true + }, "async-foreach": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true }, + "async-settle": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", + "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", + "dev": true, + "requires": { + "async-done": "^1.2.2" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -244,17 +406,49 @@ "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" }, "autoprefixer": { - "version": "9.4.3", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.3.tgz", - "integrity": "sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", + "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", "dev": true, "requires": { - "browserslist": "^4.3.6", - "caniuse-lite": "^1.0.30000921", + "browserslist": "^4.6.3", + "caniuse-lite": "^1.0.30000980", + "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.6", - "postcss-value-parser": "^3.3.1" + "postcss": "^7.0.17", + "postcss-value-parser": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "aws-sign2": { @@ -269,11 +463,27 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, + "bach": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", + "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", + "dev": true, + "requires": { + "arr-filter": "^1.1.1", + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "array-each": "^1.0.0", + "array-initial": "^1.0.0", + "array-last": "^1.1.1", + "async-done": "^1.2.2", + "async-settle": "^1.0.0", + "now-and-later": "^2.0.0" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", @@ -345,6 +555,12 @@ "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", "dev": true }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, "block-stream": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", @@ -358,7 +574,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -394,20 +609,26 @@ } }, "browserslist": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.6.tgz", - "integrity": "sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.4.tgz", + "integrity": "sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000921", - "electron-to-chromium": "^1.3.92", - "node-releases": "^1.1.1" + "caniuse-lite": "^1.0.30000981", + "electron-to-chromium": "^1.3.188", + "node-releases": "^1.1.25" } }, - "builtin-modules": { + "buffer-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", + "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", + "dev": true + }, + "buffer-from": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, "cache-base": { @@ -444,10 +665,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000921", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz", - "integrity": "sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw==", - "dev": true + "version": "1.0.30000984", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz", + "integrity": "sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==" }, "caseless": { "version": "0.12.0", @@ -455,6 +675,15 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "requires": { + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" + } + }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -468,6 +697,34 @@ "supports-color": "^2.0.0" } }, + "chokidar": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", + "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + } + } + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -525,18 +782,78 @@ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, + "clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "dev": true + }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", "dev": true }, + "cloneable-readable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", + "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "process-nextick-args": "^2.0.0", + "readable-stream": "^2.3.5" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, + "collection-map": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", + "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", + "dev": true, + "requires": { + "arr-map": "^2.0.2", + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -548,18 +865,18 @@ } }, "color-convert": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", - "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { - "color-name": "1.1.1" + "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "color-support": { @@ -569,9 +886,9 @@ "dev": true }, "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { "delayed-stream": "~1.0.0" @@ -584,16 +901,59 @@ "dev": true }, "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } }, "console-control-strings": { "version": "1.1.0", @@ -615,6 +975,16 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, + "copy-props": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", + "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "dev": true, + "requires": { + "each-props": "^1.3.0", + "is-plain-object": "^2.0.1" + } + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -706,11 +1076,12 @@ } }, "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "^0.10.50", + "type": "^1.0.1" } }, "dashdash": { @@ -756,9 +1127,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "object-assign": { "version": "4.1.1", @@ -778,13 +1149,35 @@ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "default-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", + "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", "dev": true, "requires": { - "clone": "^1.0.2" + "kind-of": "^5.0.2" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "default-resolution": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", + "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "requires": { + "object-keys": "^1.0.12" } }, "define-property": { @@ -840,12 +1233,6 @@ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true }, - "deprecated": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", - "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=", - "dev": true - }, "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", @@ -866,6 +1253,60 @@ "readable-stream": "~1.1.9" } }, + "duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dev": true, + "requires": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "each-props": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", + "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.1", + "object.defaults": "^1.1.0" + } + }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -877,18 +1318,29 @@ } }, "electron-to-chromium": { - "version": "1.3.94", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.94.tgz", - "integrity": "sha512-miQqXALb6eBD3OetCtg3UM5XTLMwHISux0l6mh14iiV5SE+qvftgOCXT9Vvp53fWaCLET4sfA/SmIMYHXkaNmw==", + "version": "1.3.189", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.189.tgz", + "integrity": "sha512-C26Kv6/rLNmGDaPR5HORMtTQat9aWBBKjQk9aFtN1Bk6cQBSw8cYdsel/mcrQlNlMMjt1sAKsTYqf77+sK2uTw==", "dev": true }, "end-of-stream": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { - "once": "~1.3.0" + "once": "^1.4.0" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + } } }, "error-ex": { @@ -900,14 +1352,37 @@ "is-arrayish": "^0.2.1" } }, + "es-abstract": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", + "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + } + }, + "es-to-primitive": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", + "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "es5-ext": { - "version": "0.10.46", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz", - "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", + "version": "0.10.50", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", + "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", "requires": { "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", - "next-tick": "1" + "next-tick": "^1.0.0" } }, "es6-iterator": { @@ -930,13 +1405,13 @@ } }, "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", "requires": { "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.1" } }, @@ -999,6 +1474,19 @@ "homedir-polyfill": "^1.0.1" } }, + "export-dirs": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/export-dirs/-/export-dirs-0.2.4.tgz", + "integrity": "sha1-Lha5tG68LAestlfM3744RTk/50I=" + }, + "export-files": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/export-files/-/export-files-2.1.1.tgz", + "integrity": "sha1-u/ZFdAU6CeTrmOX0NQHVcrLDzn8=", + "requires": { + "lazy-cache": "^1.0.3" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -1143,12 +1631,6 @@ } } }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", - "dev": true - }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -1160,21 +1642,21 @@ } }, "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", + "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", "dev": true, "requires": { "detect-file": "^1.0.0", - "is-glob": "^3.1.0", + "is-glob": "^4.0.0", "micromatch": "^3.0.4", "resolve-dir": "^1.0.1" } }, "fined": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz", - "integrity": "sha512-jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", "dev": true, "requires": { "expand-tilde": "^2.0.2", @@ -1184,23 +1666,58 @@ "parse-filepath": "^1.0.1" } }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", - "dev": true - }, "flagged-respawn": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", "dev": true }, + "flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, "for-own": { "version": "1.0.0", @@ -1237,16 +1754,555 @@ "map-cache": "^0.2.2" } }, + "fs-mkdirp-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", + "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "through2": "^2.0.3" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "fsevents": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "dev": true, + "optional": true, + "requires": { + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "minipass": { + "version": "2.3.5", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.3.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^4.1.0", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.12.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "rimraf": { + "version": "2.6.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "3.0.3", + "bundled": true, + "dev": true + } + } + }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -1256,13 +2312,18 @@ }, "dependencies": { "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", "dev": true } } }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -1287,15 +2348,6 @@ } } }, - "gaze": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", - "dev": true, - "requires": { - "globule": "~0.1.0" - } - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -1324,71 +2376,102 @@ } }, "glob": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { + "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^2.0.1", - "once": "^1.3.0" + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } } }, "glob-stream": { - "version": "3.1.18", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", "dev": true, "requires": { - "glob": "^4.3.1", - "glob2base": "^0.0.12", - "minimatch": "^2.0.1", - "ordered-read-streams": "^0.1.0", - "through2": "^0.6.1", - "unique-stream": "^1.0.0" + "extend": "^3.0.0", + "glob": "^7.1.1", + "glob-parent": "^3.1.0", + "is-negated-glob": "^1.0.0", + "ordered-read-streams": "^1.0.0", + "pumpify": "^1.3.5", + "readable-stream": "^2.1.5", + "remove-trailing-separator": "^1.0.1", + "to-absolute-glob": "^2.0.0", + "unique-stream": "^2.0.2" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, "readable-stream": { - "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "through2": { - "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" + "safe-buffer": "~5.1.0" } } } }, "glob-watcher": { - "version": "0.0.6", - "resolved": "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", + "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", "dev": true, "requires": { - "gaze": "^0.5.1" - } - }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", - "dev": true, - "requires": { - "find-index": "^0.1.1" + "anymatch": "^2.0.0", + "async-done": "^1.2.0", + "chokidar": "^2.0.0", + "is-negated-glob": "^1.0.0", + "just-debounce": "^1.0.0", + "object.defaults": "^1.1.0" } }, "global-modules": { @@ -1415,52 +2498,6 @@ "which": "^1.2.14" } }, - "globule": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", - "dev": true, - "requires": { - "glob": "~3.1.21", - "lodash": "~1.0.1", - "minimatch": "~0.2.11" - }, - "dependencies": { - "glob": { - "version": "3.1.21", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", - "dev": true, - "requires": { - "graceful-fs": "~1.2.0", - "inherits": "1", - "minimatch": "~0.2.11" - } - }, - "graceful-fs": { - "version": "1.2.3", - "resolved": "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=", - "dev": true - }, - "inherits": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=", - "dev": true - }, - "minimatch": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", - "dev": true, - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, "glogg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", @@ -1477,47 +2514,94 @@ "dev": true }, "graceful-fs": { - "version": "3.0.11", - "resolved": "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", - "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", - "dev": true, - "requires": { - "natives": "^1.1.0" - } + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", + "dev": true }, "gulp": { - "version": "3.9.1", - "resolved": "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", - "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", + "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", "dev": true, "requires": { - "archy": "^1.0.0", - "chalk": "^1.0.0", - "deprecated": "^0.0.1", - "gulp-util": "^3.0.0", - "interpret": "^1.0.0", - "liftoff": "^2.1.0", - "minimist": "^1.1.0", - "orchestrator": "^0.3.0", - "pretty-hrtime": "^1.0.0", - "semver": "^4.1.0", - "tildify": "^1.0.0", - "v8flags": "^2.0.2", - "vinyl-fs": "^0.3.0" + "glob-watcher": "^5.0.3", + "gulp-cli": "^2.2.0", + "undertaker": "^1.2.1", + "vinyl-fs": "^3.0.0" + }, + "dependencies": { + "gulp-cli": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz", + "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==", + "dev": true, + "requires": { + "ansi-colors": "^1.0.1", + "archy": "^1.0.0", + "array-sort": "^1.0.0", + "color-support": "^1.1.3", + "concat-stream": "^1.6.0", + "copy-props": "^2.0.1", + "fancy-log": "^1.3.2", + "gulplog": "^1.0.0", + "interpret": "^1.1.0", + "isobject": "^3.0.1", + "liftoff": "^3.1.0", + "matchdep": "^2.0.0", + "mute-stdout": "^1.0.0", + "pretty-hrtime": "^1.0.0", + "replace-homedir": "^1.0.0", + "semver-greatest-satisfied-range": "^1.1.0", + "v8flags": "^3.0.1", + "yargs": "^7.1.0" + } + } } }, "gulp-autoprefixer": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-6.0.0.tgz", - "integrity": "sha512-MyLymXKVGTVBx/okQSBqmdhwhyqi3igBmZBwgpZp0GRbY1LY8VctOTLzwkQ18bZKJkSDnOKR5u32TMY9wSYdqQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-6.1.0.tgz", + "integrity": "sha512-Ti/BUFe+ekhbDJfspZIMiOsOvw51KhI9EncsDfK7NaxjqRm+v4xS9v99kPxEoiDavpWqQWvG8Y6xT1mMlB3aXA==", "dev": true, "requires": { - "autoprefixer": "^9.1.3", + "autoprefixer": "^9.5.1", "fancy-log": "^1.3.2", "plugin-error": "^1.0.1", "postcss": "^7.0.2", - "through2": "^2.0.0", - "vinyl-sourcemaps-apply": "^0.2.0" + "through2": "^3.0.1", + "vinyl-sourcemaps-apply": "^0.2.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "string_decoder": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz", + "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "through2": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "dev": true, + "requires": { + "readable-stream": "2 || 3" + } + } } }, "gulp-clean-css": { @@ -1550,9 +2634,9 @@ "dev": true }, "gulp-sass": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.1.tgz", - "integrity": "sha512-OMQEgWNggpog8Tc5v1MuI6eo+5iiPkVeLL76iBhDoEEScLUPfZlpvzmgTnLkpcqdrNodZxpz5qcv6mS2rulk3g==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.2.tgz", + "integrity": "sha512-q8psj4+aDrblJMMtRxihNBdovfzGrXJp1l4JU0Sz4b/Mhsi2DPrKFYCGDwjIWRENs04ELVHxdOJQ7Vs98OFohg==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -1581,9 +2665,9 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -1607,9 +2691,9 @@ } }, "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -1618,9 +2702,9 @@ } }, "gulp-sourcemaps": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz", - "integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz", + "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==", "requires": { "@gulp-sourcemaps/identity-map": "1.X", "@gulp-sourcemaps/map-sources": "1.X", @@ -1636,9 +2720,9 @@ }, "dependencies": { "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" }, "source-map": { "version": "0.6.1", @@ -1682,6 +2766,14 @@ "glogg": "^1.0.0" } }, + "gutil": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/gutil/-/gutil-1.6.4.tgz", + "integrity": "sha1-d8+fqgWMBHbWO506xfvgTgcvbNI=", + "requires": { + "sliced": "*" + } + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -1698,6 +2790,14 @@ "har-schema": "^2.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -1722,6 +2822,11 @@ "sparkles": "^1.0.0" } }, + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" + }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -1761,9 +2866,9 @@ } }, "homedir-polyfill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", - "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, "requires": { "parse-passwd": "^1.0.0" @@ -1786,6 +2891,11 @@ "sshpk": "^1.7.0" } }, + "immutable": { + "version": "4.0.0-rc.12", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.12.tgz", + "integrity": "sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A==" + }, "in-publish": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", @@ -1823,9 +2933,9 @@ "dev": true }, "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, "invert-kv": { @@ -1864,26 +2974,35 @@ } } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" }, "is-data-descriptor": { "version": "0.1.4", @@ -1905,6 +3024,11 @@ } } }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -1927,8 +3051,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { "version": "2.1.1", @@ -1954,15 +3077,26 @@ "number-is-nan": "^1.0.0" } }, + "is-generator-function": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz", + "integrity": "sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==" + }, "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "^2.1.1" } }, + "is-negated-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", + "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=", + "dev": true + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -1987,7 +3121,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "requires": { "isobject": "^3.0.1" } @@ -1997,6 +3130,14 @@ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "requires": { + "has": "^1.0.1" + } + }, "is-relative": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", @@ -2006,6 +3147,14 @@ "is-unc-path": "^1.0.0" } }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "requires": { + "has-symbols": "^1.0.0" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -2027,6 +3176,12 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, + "is-valid-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", + "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -2048,8 +3203,7 @@ "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "isstream": { "version": "0.1.2", @@ -2058,9 +3212,9 @@ "dev": true }, "js-base64": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz", - "integrity": "sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", + "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", "dev": true }, "jsbn": { @@ -2081,6 +3235,12 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -2099,11 +3259,72 @@ "verror": "1.10.0" } }, + "just-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", + "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=", + "dev": true + }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "last-run": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", + "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", + "dev": true, + "requires": { + "default-resolution": "^2.0.0", + "es6-weak-map": "^2.0.1" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "^2.0.5" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } }, "lcid": { "version": "1.0.0", @@ -2114,14 +3335,23 @@ "invert-kv": "^1.0.0" } }, + "lead": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", + "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", + "dev": true, + "requires": { + "flush-write-stream": "^1.0.2" + } + }, "liftoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", - "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", + "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==", "dev": true, "requires": { "extend": "^3.0.0", - "findup-sync": "^2.0.0", + "findup-sync": "^3.0.0", "fined": "^1.0.1", "flagged-respawn": "^1.0.0", "is-plain-object": "^2.0.4", @@ -2144,9 +3374,9 @@ }, "dependencies": { "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", "dev": true }, "strip-bom": { @@ -2160,12 +3390,6 @@ } } }, - "lodash": { - "version": "1.0.2", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", - "dev": true - }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -2220,12 +3444,6 @@ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -2264,12 +3482,6 @@ "lodash.isarray": "^3.0.0" } }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -2303,6 +3515,11 @@ "lodash.escape": "^3.0.0" } }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -2331,7 +3548,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "dev": true, "requires": { "kind-of": "^6.0.2" } @@ -2357,6 +3573,41 @@ "object-visit": "^1.0.0" } }, + "matchdep": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", + "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", + "dev": true, + "requires": { + "findup-sync": "^2.0.0", + "micromatch": "^3.0.4", + "resolve": "^1.4.0", + "stack-trace": "0.0.10" + }, + "dependencies": { + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "dev": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + } + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, "memoizee": { "version": "0.4.14", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", @@ -2398,6 +3649,11 @@ } } }, + "merge": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -2420,27 +3676,26 @@ } }, "mime-db": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", "dev": true }, "mime-types": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", - "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "dev": true, "requires": { - "mime-db": "~1.37.0" + "mime-db": "1.40.0" } }, "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "^1.0.0" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -2450,9 +3705,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -2502,10 +3757,16 @@ "duplexer2": "0.0.2" } }, + "mute-stdout": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", + "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==", + "dev": true + }, "nan": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.0.tgz", - "integrity": "sha512-zT5nC0JhbljmyEf+Z456nvm7iO7XgRV2hYxoBtPpnyp+0Q4aCoP6uWNn76v/I6k2kCYNLWqWbwBWQcjsNI/bjw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "dev": true }, "nanomatch": { @@ -2527,12 +3788,6 @@ "to-regex": "^3.0.1" } }, - "natives": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", - "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==", - "dev": true - }, "next-tick": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", @@ -2559,9 +3814,9 @@ }, "dependencies": { "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2573,9 +3828,9 @@ } }, "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", "dev": true }, "minimatch": { @@ -2596,26 +3851,26 @@ } }, "node-releases": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.1.tgz", - "integrity": "sha512-2UXrBr6gvaebo5TNF84C66qyJJ6r0kxBObgZIDX3D3/mt1ADKiHux3NJPWisq0wxvJJdkjECH+9IIKYViKj71Q==", + "version": "1.1.25", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz", + "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==", "dev": true, "requires": { "semver": "^5.3.0" }, "dependencies": { "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true } } }, "node-sass": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz", - "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", + "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -2625,12 +3880,10 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", + "lodash": "^4.17.11", "meow": "^3.7.0", "mkdirp": "^0.5.1", - "nan": "^2.10.0", + "nan": "^2.13.2", "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", @@ -2649,9 +3902,9 @@ } }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2674,9 +3927,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true }, "minimatch": { @@ -2706,15 +3959,26 @@ } }, "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "resolve": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } } }, "normalize-path": { @@ -2736,6 +4000,15 @@ "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" }, + "now-and-later": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", + "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", + "dev": true, + "requires": { + "once": "^1.3.2" + } + }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", @@ -2803,6 +4076,11 @@ } } }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -2812,6 +4090,18 @@ "isobject": "^3.0.0" } }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, "object.defaults": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", @@ -2824,6 +4114,44 @@ "isobject": "^3.0.0" } }, + "object.entries": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz", + "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.filter": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/object.filter/-/object.filter-0.3.0.tgz", + "integrity": "sha1-EJHGk5S0T5bZ1jVt0IeFAorWv/k=", + "requires": { + "for-own": "^0.1.2", + "make-iterator": "^0.1.0" + }, + "dependencies": { + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "^1.0.1" + } + }, + "make-iterator": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-0.1.1.tgz", + "integrity": "sha1-hz0nuBmKRlqBSDtvXRbaToY+z1s=", + "requires": { + "for-own": "^0.1.1" + } + } + } + }, "object.map": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", @@ -2834,15 +4162,43 @@ "make-iterator": "^1.0.0" } }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "requires": { + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" + }, + "dependencies": { + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "^1.0.1" + } + } + } + }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "requires": { "isobject": "^3.0.1" } }, + "object.reduce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz", + "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", + "dev": true, + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, "once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", @@ -2852,23 +4208,47 @@ "wrappy": "1" } }, - "orchestrator": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", - "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "ordered-read-streams": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", + "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", "dev": true, "requires": { - "end-of-stream": "~0.1.5", - "sequencify": "~0.0.7", - "stream-consume": "~0.1.0" + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, - "ordered-read-streams": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", - "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=", - "dev": true - }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -2932,6 +4312,31 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", + "requires": { + "process": "^0.11.1", + "util": "^0.10.3" + }, + "dependencies": { + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + } + } + } + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true + }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", @@ -2980,9 +4385,9 @@ }, "dependencies": { "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", "dev": true } } @@ -3033,14 +4438,14 @@ "dev": true }, "postcss": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.7.tgz", - "integrity": "sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { - "chalk": "^2.4.1", + "chalk": "^2.4.2", "source-map": "^0.6.1", - "supports-color": "^5.5.0" + "supports-color": "^6.1.0" }, "dependencies": { "ansi-styles": { @@ -3053,14 +4458,25 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "source-map": { @@ -3070,9 +4486,9 @@ "dev": true }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -3081,9 +4497,9 @@ } }, "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz", + "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==", "dev": true }, "pretty-hrtime": { @@ -3092,6 +4508,11 @@ "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", "dev": true }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + }, "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", @@ -3104,11 +4525,32 @@ "dev": true }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz", + "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==", "dev": true }, + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "pumpify": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", + "dev": true, + "requires": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + } + }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -3154,6 +4596,49 @@ "string_decoder": "~0.10.x" } }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -3183,6 +4668,27 @@ "safe-regex": "^1.1.0" } }, + "remove-bom-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", + "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", + "dev": true, + "requires": { + "is-buffer": "^1.1.5", + "is-utf8": "^0.2.1" + } + }, + "remove-bom-stream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", + "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", + "dev": true, + "requires": { + "remove-bom-buffer": "^3.0.0", + "safe-buffer": "^5.1.0", + "through2": "^2.0.3" + } + }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -3197,8 +4703,7 @@ "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "repeating": { "version": "2.0.1", @@ -3215,6 +4720,17 @@ "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", "dev": true }, + "replace-homedir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", + "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", + "dev": true, + "requires": { + "homedir-polyfill": "^1.0.1", + "is-absolute": "^1.0.0", + "remove-trailing-separator": "^1.1.0" + } + }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", @@ -3256,9 +4772,9 @@ "dev": true }, "resolve": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz", - "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -3274,6 +4790,15 @@ "global-modules": "^1.0.0" } }, + "resolve-options": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", + "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", + "dev": true, + "requires": { + "value-or-function": "^3.0.0" + } + }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -3285,19 +4810,27 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "^0.1.1" + } + }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" }, "dependencies": { "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -3352,9 +4885,9 @@ }, "dependencies": { "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -3366,9 +4899,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true }, "minimatch": { @@ -3409,11 +4942,14 @@ "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true }, - "sequencify": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", - "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=", - "dev": true + "semver-greatest-satisfied-range": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", + "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", + "dev": true, + "requires": { + "sver-compat": "^1.5.0" + } }, "set-blocking": { "version": "2.0.0", @@ -3422,9 +4958,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -3456,6 +4992,11 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "sliced": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -3619,9 +5160,9 @@ } }, "spdx-license-ids": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz", - "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", "dev": true }, "split-string": { @@ -3634,9 +5175,9 @@ } }, "sshpk": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", - "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { "asn1": "~0.2.3", @@ -3650,6 +5191,12 @@ "tweetnacl": "~0.14.0" } }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true + }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -3712,10 +5259,16 @@ } } }, - "stream-consume": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", - "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==", + "stream-exhaust": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", + "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", + "dev": true + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "dev": true }, "string-width": { @@ -3744,16 +5297,6 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", - "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", - "dev": true, - "requires": { - "first-chunk-stream": "^1.0.0", - "is-utf8": "^0.2.0" - } - }, "strip-bom-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", @@ -3768,20 +5311,35 @@ "get-stdin": "^4.0.1" } }, + "striptags": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz", + "integrity": "sha1-TEULcI1BuL85zyTEn/I0/Gqr/TI=" + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, + "sver-compat": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", + "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", + "dev": true, + "requires": { + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" + } + }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { "block-stream": "*", - "fstream": "^1.0.2", + "fstream": "^1.0.12", "inherits": "2" } }, @@ -3823,13 +5381,14 @@ } } }, - "tildify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", - "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "through2-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", + "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", "dev": true, "requires": { - "os-homedir": "^1.0.0" + "through2": "~2.0.0", + "xtend": "~4.0.0" } }, "time-stamp": { @@ -3847,6 +5406,16 @@ "next-tick": "1" } }, + "to-absolute-glob": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", + "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", + "dev": true, + "requires": { + "is-absolute": "^1.0.0", + "is-negated-glob": "^1.0.0" + } + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -3889,6 +5458,15 @@ "repeat-string": "^1.6.1" } }, + "to-through": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", + "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", + "dev": true, + "requires": { + "through2": "^2.0.3" + } + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -3923,9 +5501,9 @@ }, "dependencies": { "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -3962,52 +5540,67 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "type": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz", + "integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==" + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", "dev": true }, + "undertaker": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz", + "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", + "dev": true, + "requires": { + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "bach": "^1.0.0", + "collection-map": "^1.0.0", + "es6-weak-map": "^2.0.1", + "last-run": "^1.1.0", + "object.defaults": "^1.0.0", + "object.reduce": "^1.0.0", + "undertaker-registry": "^1.0.0" + } + }, + "undertaker-registry": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", + "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=", + "dev": true + }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-stream": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", - "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", - "dev": true + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", + "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", + "dev": true, + "requires": { + "json-stable-stringify-without-jsonify": "^1.0.1", + "through2-filter": "^3.0.0" + } }, "unset-value": { "version": "1.0.0", @@ -4055,6 +5648,12 @@ } } }, + "upath": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", + "dev": true + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -4075,17 +5674,175 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", - "dev": true + "util": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.1.tgz", + "integrity": "sha512-MREAtYOp+GTt9/+kwf00IYoHZyjM8VU4aVrkzUlejyqaIjd2GztVl5V9hGXKlvBKE3gENn/FMfHE5v6hElXGcQ==", + "requires": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "object.entries": "^1.1.0", + "safe-buffer": "^5.1.2" + } }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "utils": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/utils/-/utils-0.3.1.tgz", + "integrity": "sha1-BO+utCkKZwN6TN39L/VhRMw6RYE=", + "requires": { + "any": "^1.0.0", + "arr-diff": "^1.1.0", + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "arr-union": "^3.0.0", + "array-each": "^0.1.1", + "array-slice": "^0.2.3", + "array-unique": "^0.2.1", + "center-align": "^0.1.1", + "export-dirs": "^0.2.4", + "export-files": "^2.1.0", + "for-in": "^0.1.4", + "for-own": "^0.1.3", + "has-values": "^0.1.3", + "is-number": "^2.0.2", + "is-plain-object": "^2.0.1", + "kind-of": "^2.0.1", + "make-iterator": "^0.2.0", + "object.defaults": "^0.3.0", + "object.filter": "^0.3.0", + "object.omit": "^2.0.0", + "object.pick": "^1.1.1", + "object.reduce": "^0.1.7", + "right-align": "^0.1.3", + "striptags": "^2.0.3", + "word-wrap": "^1.1.0" + }, + "dependencies": { + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "requires": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + } + }, + "array-each": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-0.1.1.tgz", + "integrity": "sha1-xdUrqCJfNtcoF4unrsQTrPrd0Pk=" + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=" + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + }, + "for-in": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", + "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "^1.0.1" + }, + "dependencies": { + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "isobject": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz", + "integrity": "sha1-8Pm4zpLdVA+gdAiC44NaLgIux4o=" + }, + "kind-of": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", + "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", + "requires": { + "is-buffer": "^1.0.2" + } + }, + "make-iterator": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-0.2.1.tgz", + "integrity": "sha1-oZxmATK1SubWT4gewUBWx0bb6XI=", + "requires": { + "kind-of": "^3.0.3" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "object.defaults": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-0.3.0.tgz", + "integrity": "sha1-seucvHjEx71WysbK496tWnETiCo=", + "requires": { + "array-each": "^0.1.0", + "array-slice": "^0.2.3", + "for-own": "^0.1.3", + "isobject": "^1.0.0" + } + }, + "object.reduce": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-0.1.7.tgz", + "integrity": "sha1-0YDoT3LSGDSK9FNStVFlJGuVBG0=", + "requires": { + "for-own": "^0.1.3" + } + } + } + }, "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", @@ -4093,12 +5850,12 @@ "dev": true }, "v8flags": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", - "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", + "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==", "dev": true, "requires": { - "user-home": "^1.1.1" + "homedir-polyfill": "^1.0.1" } }, "validate-npm-package-license": { @@ -4111,6 +5868,12 @@ "spdx-expression-parse": "^3.0.0" } }, + "value-or-function": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", + "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", + "dev": true + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -4134,57 +5897,139 @@ } }, "vinyl-fs": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", + "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", "dev": true, "requires": { - "defaults": "^1.0.0", - "glob-stream": "^3.1.5", - "glob-watcher": "^0.0.6", - "graceful-fs": "^3.0.0", - "mkdirp": "^0.5.0", - "strip-bom": "^1.0.0", - "through2": "^0.6.1", - "vinyl": "^0.4.0" + "fs-mkdirp-stream": "^1.0.0", + "glob-stream": "^6.1.0", + "graceful-fs": "^4.0.0", + "is-valid-glob": "^1.0.0", + "lazystream": "^1.0.0", + "lead": "^1.0.0", + "object.assign": "^4.0.4", + "pumpify": "^1.3.5", + "readable-stream": "^2.3.3", + "remove-bom-buffer": "^3.0.0", + "remove-bom-stream": "^1.2.0", + "resolve-options": "^1.1.0", + "through2": "^2.0.0", + "to-through": "^2.0.0", + "value-or-function": "^3.0.0", + "vinyl": "^2.0.0", + "vinyl-sourcemap": "^1.1.0" }, "dependencies": { "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { - "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "through2": { - "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" + "safe-buffer": "~5.1.0" } }, "vinyl": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", - "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "dev": true, "requires": { - "clone": "^0.2.0", - "clone-stats": "^0.0.1" + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + } + } + } + }, + "vinyl-sourcemap": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", + "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", + "dev": true, + "requires": { + "append-buffer": "^1.0.2", + "convert-source-map": "^1.5.0", + "graceful-fs": "^4.1.6", + "normalize-path": "^2.1.1", + "now-and-later": "^2.0.0", + "remove-bom-buffer": "^3.0.0", + "vinyl": "^2.0.0" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "vinyl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "dev": true, + "requires": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" } } } @@ -4247,6 +6092,11 @@ "vow": "~0.4.0" } }, + "vue": { + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", + "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -4271,6 +6121,11 @@ "string-width": "^1.0.2 || 2" } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", diff --git a/user/themes/figureslibres/package.json b/user/themes/figureslibres/package.json old mode 100755 new mode 100644 index 82e31df..d0219dc --- a/user/themes/figureslibres/package.json +++ b/user/themes/figureslibres/package.json @@ -24,12 +24,12 @@ "url": "https://github.com/picturepan2/spectre/issues" }, "devDependencies": { - "gulp": "^3.9.1", - "gulp-autoprefixer": "latest", + "gulp": "^4.0.2", + "gulp-autoprefixer": "^6.1.0", "gulp-clean-css": "^3.9.4", "gulp-csscomb": "^3.0.8", "gulp-rename": "^1.2.2", - "gulp-sass": "^4.0.1" + "gulp-sass": "^4.0.2" }, "browserslist": [ "last 4 Chrome versions", @@ -40,7 +40,16 @@ "Explorer >= 10" ], "dependencies": { - "gulp-sourcemaps": "^2.6.4", - "normalize.css": "^8.0.1" + "caniuse-lite": "^1.0.30000984", + "gulp-sourcemaps": "^2.6.5", + "gutil": "^1.6.4", + "immutable": "^4.0.0-rc.12", + "merge": "^1.2.1", + "minimatch": "^3.0.4", + "normalize.css": "^8.0.1", + "path": "^0.12.7", + "util": "^0.12.1", + "utils": "^0.3.1", + "vue": "^2.6.10" } } diff --git a/user/themes/figureslibres/scss/configurations/_extend.scss b/user/themes/figureslibres/scss/configurations/_extend.scss new file mode 100644 index 0000000..e69de29 diff --git a/user/themes/figureslibres/scss/configurations/_fonts.scss b/user/themes/figureslibres/scss/configurations/_fonts.scss new file mode 100644 index 0000000..751c43e --- /dev/null +++ b/user/themes/figureslibres/scss/configurations/_fonts.scss @@ -0,0 +1,117 @@ +// Font Family +$font-family-default: "Raleway", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; +$font-family-header: "Montserrat", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; +$font-family-mono: "Inconsolata", monospace; +$font-family-serif: "Georgia", "Times", "Times New Roman", serif; +// @font-face + +$lato: "lato"; +$family: "lato"; +$file-regular: "Lato-Regular"; +$category: "sans-serif"; + +@mixin font-face($lato, $file-regular, $family, $category:"") { + $filepath: "../fonts/" + $family + "/" + $file-regular; + @font-face { + font-family: "#{$lato}"; + src: url($filepath + ".eot"); + src: url($filepath + ".eot?#iefix") format('embedded-opentype'), + url($filepath + ".woff") format('woff'), + url($filepath + ".ttf") format('truetype'), + url($filepath + ".svg#" + $lato + "") format('svg'); + } + + %#{$lato} { + font: { + @if $category != "" { + family: "#{$lato}", #{$category}; + } + @else { + family: "#{$lato}"; + weight: normal; + } + } + } +} + +$syne: "syne"; +$family-bold: "syne"; +$file-bold: "Syne-Bold"; + +@mixin font-face($syne, $file-bold, $family-bold, $category:"") { + $filepath: "../fonts/" + $family-bold + "/" + $file-bold; + @font-face { + font-family: "#{$syne}"; + src: url($filepath + ".eot"); + src: url($filepath + ".eot?#iefix") format('embedded-opentype'), + url($filepath + ".woff") format('woff'), + } + + %#{$syne} { + font: { + @if $category != "" { + family: "#{$syne}", #{$category}; + } + @else { + family: "#{$syne}"; + weight: normal; + } + } + } +} + +$avara: "Avara"; +$family-bold-italic: "avara"; +$file-bold-italic: "Avara-Bold_Italic_web"; + +@mixin font-face($avara, $file-bold-italic, $family-bold-italic, $category:"") { + $filepath: "../fonts/" + $family-bold-italic + "/" + $file-bold-italic; + @font-face { + font-family: "#{$avara}"; + src: url($filepath + ".eot"); + src: url($filepath + ".eot?#iefix") format('embedded-opentype'), + url($filepath + ".woff") format('woff'), + url($filepath + ".ttf") format('truetype'), + url($filepath + ".svg#" + $avara + "") format('svg'); + } + + %#{$avara} { + font: { + @if $category != "" { + family: "#{$avara}", #{$category}; + } + @else { + family: "#{$avara}"; + weight: normal; + } + } + } +} + +$playfair: "playfairdisplay-regularitalic"; +$family-italic: "playfair"; +$file-italic: "playfairdisplay-regularitalic"; + +@mixin font-face($playfair, $file-italic, $family-italic, $category:"") { + $filepath: "../fonts/" + $family-italic + "/" + $file-italic; + @font-face { + font-family: "#{$playfair}"; + src: url($filepath + ".eot"); + src: url($filepath + ".eot?#iefix") format('embedded-opentype'), + url($filepath + ".woff") format('woff'), + url($filepath + ".ttf") format('truetype'), + url($filepath + ".svg#" + $playfair + "") format('svg'); + } + + %#{$playfair} { + font: { + @if $category != "" { + family: "#{$playfair}", #{$category}; + } + @else { + family: "#{$playfair}"; + weight: normal; + } + } + } +} diff --git a/user/themes/figureslibres/scss/configurations/_variable.scss b/user/themes/figureslibres/scss/configurations/_variable.scss new file mode 100644 index 0000000..d737f2a --- /dev/null +++ b/user/themes/figureslibres/scss/configurations/_variable.scss @@ -0,0 +1,31 @@ +@include font-face($lato, $file-regular, $family, $category);//1 +@include font-face($syne, $file-bold, $family-bold, $category);//2 +@include font-face($avara, $file-bold-italic, $family-bold-italic, $category);//2 +@include font-face($playfair, $file-italic, $family-italic, $category);//2 + +// font-size +$txt-figli: 3.5rem; + +// line-height +$Flhome: 4rem; + +$marg: 0.5rem; +$margI: 1rem; +$Wi: 80%; + +$Wi50: calc(( 100% / 2 ) - (#{$margI} / 2)); +$Wi33: calc(( 100% / 3 ) - (#{$margI} / 3)); + + +// mobile +$txt-figli-m: 1.5rem; + +// line-height +$Flhome-m: 2rem; +$Wi-m:100%; + +// tablette +$txt-figli-t: 2.5rem; + +// line-height +$Flhome-t: 3rem; diff --git a/user/themes/figureslibres/scss/mixins/_fonts.scss b/user/themes/figureslibres/scss/mixins/_fonts.scss deleted file mode 100644 index e16fce6..0000000 --- a/user/themes/figureslibres/scss/mixins/_fonts.scss +++ /dev/null @@ -1,62 +0,0 @@ -// Font Family -$font-family-default: "Raleway", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; -$font-family-header: "Montserrat", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; -$font-family-mono: "Inconsolata", monospace; -$font-family-serif: "Georgia", "Times", "Times New Roman", serif; -// @font-face - -$Regular: "Montserrat-Regular"; -$family: "montserrat"; -$file-regular: "Montserrat-Regular"; -$category: "sans-serif"; - -@mixin font-face($Regular, $file-regular, $family, $category:"") { - $filepath: "../fonts/" + $family + "/" + $file-regular; - @font-face { - font-family: "#{$Regular}"; - src: url($filepath + ".eot"); - src: url($filepath + ".eot?#iefix") format('embedded-opentype'), - url($filepath + ".woff") format('woff'), - url($filepath + ".ttf") format('truetype'), - url($filepath + ".svg#" + $Regular + "") format('svg'); - } - - %#{$Regular} { - font: { - @if $category != "" { - family: "#{$Regular}", #{$category}; - } - @else { - family: "#{$Regular}"; - weight: normal; - } - } - } -} - -$Medium: "Montserrat-medium"; -$file-Medium: "Montserrat-Medium"; - -@mixin font-face($Medium, $file-Medium, $family, $category:"") { - $filepath: "../fonts/" + $family + "/" + $file-Medium; - @font-face { - font-family: "#{$Medium}"; - src: url($filepath + ".eot"); - src: url($filepath + ".eot?#iefix") format('embedded-opentype'), - url($filepath + ".woff") format('woff'), - url($filepath + ".ttf") format('truetype'), - url($filepath + ".svg#" + $Medium + "") format('svg'); - } - - %#{$Medium} { - font: { - @if $category != "" { - family: "#{$Medium}", #{$category}; - } - @else { - family: "#{$Medium}"; - weight: normal; - } - } - } -} diff --git a/user/themes/figureslibres/scss/mixins/_variable.scss b/user/themes/figureslibres/scss/mixins/_variable.scss deleted file mode 100644 index 4c162c4..0000000 --- a/user/themes/figureslibres/scss/mixins/_variable.scss +++ /dev/null @@ -1,8 +0,0 @@ -@include font-face($Regular, $file-regular, $family, $category);//1 -@include font-face($Medium, $file-Medium, $family, $category);//1 - -// font-size -$Fphome: 3rem; - -// line-height -$Flhome: 4rem; diff --git a/user/themes/figureslibres/scss/theme.scss b/user/themes/figureslibres/scss/theme.scss index d5df185..aedac93 100644 --- a/user/themes/figureslibres/scss/theme.scss +++ b/user/themes/figureslibres/scss/theme.scss @@ -1,16 +1,13 @@ // Core variables and mixins -@import 'mixins/_fonts'; -@import 'mixins/_variable'; +@import 'configurations/_fonts'; +@import 'configurations/_variable'; +@import 'configurations/_extend'; @import 'theme/reset'; @import 'theme/typography'; @import 'theme/header'; @import 'theme/start'; @import 'theme/sidebar'; - -// @import 'theme/menu'; -// @import 'theme/footer'; -// -// // Extra Skeleton Styling -// @import 'theme/blog'; -// @import 'theme/onepage'; +@import 'theme/blog'; +@import 'theme/item'; +@import 'theme/mobile'; diff --git a/user/themes/figureslibres/scss/theme/_blog.scss b/user/themes/figureslibres/scss/theme/_blog.scss index 2702c8e..290faee 100644 --- a/user/themes/figureslibres/scss/theme/_blog.scss +++ b/user/themes/figureslibres/scss/theme/_blog.scss @@ -1,113 +1,19 @@ -/** Extra columns spacing **/ -.extra-spacing:not(.col-12), :not(.col12) > .e-content { - padding-right: 1rem; - - @include breakpoint(md) { - padding-right: 0; - } -} - -/** Breadcrumbs styling **/ -#breadcrumbs { - padding-left: 0; - display: flex; - align-items: center; - margin-top: -1rem; - margin-bottom: 1rem; - - - i { - display: none; - } - - span, a { - padding: 0 0.5rem; - &:first-child { - padding-left: 0; +#item_list{ + display: inline-flex; + flex-wrap: wrap; + width: 100%; + .card{ + width: $Wi50; + &:nth-child(odd){ + margin-right: $margI; } - } - - span, a { - &:not(:first-child)::before { - color: #e7e9ed; - content: "/"; - padding-right: 1rem; - } - } -} - -/** Blog Listing **/ -.blog-listing { - - .bricklayer-column { - padding-left: 0px; - padding-right: 25px; - - } - .card { - margin-bottom: 25px; - border: 0; - box-shadow: 0 10px 45px -9px rgba(0,0,0,0.1); - } - - .card-footer { - text-align: right; - } - - .blog-date { - font-size: 13px; - } - - .label { - - } -} - -/** Blog Item **/ -.content-title { - margin-bottom: 2rem; - - h2 { - margin-bottom: 0.5rem; - } -} - -.label { - font-size: 12px; - text-transform: uppercase; -} - -/** Pagination **/ -ul.pagination { - justify-content: center; -} - -.prev-next { - margin-top: 4rem; -} - -/** Sidebar specific tweaks **/ -#sidebar { - - ul.related-pages { - box-shadow: none; - padding: 0; - - li { - border-bottom: 1px solid $border-color; - &:last-child { - border-bottom: 0; + .card-header{ + display: inline-flex; + width: 100%; + margin-bottom: $marg; + & > * { + margin-right: $marg; } } - } - - ul.archives { - list-style: none; - margin-left: 0; - - .label { - vertical-align: text-top; - } - } -} \ No newline at end of file +} diff --git a/user/themes/figureslibres/scss/theme/_header.scss b/user/themes/figureslibres/scss/theme/_header.scss index 57024b2..eab21b0 100644 --- a/user/themes/figureslibres/scss/theme/_header.scss +++ b/user/themes/figureslibres/scss/theme/_header.scss @@ -1,7 +1,9 @@ -Header{ +header{ position: fixed; top: 0; - h1{ - margin: 30px 0 0 30px; - } + left: 0; + margin: 0 0 0 $marg; + padding: $marg 0; + width: calc( #{$Wi} - #{$marg} ); + border-bottom: 1px solid black; } diff --git a/user/themes/figureslibres/scss/theme/_item.scss b/user/themes/figureslibres/scss/theme/_item.scss new file mode 100644 index 0000000..3328fad --- /dev/null +++ b/user/themes/figureslibres/scss/theme/_item.scss @@ -0,0 +1,32 @@ +#item{ + .card-image{ + img{ + margin-bottom: $marg; + } + } +} + +.other_projets{ + border-top: 1px solid black; + display: flex; + flex-wrap: wrap; + margin-top: $margI; + margin-bottom: $margI; + h3{ + margin: 1rem 0 $marg 0; + width: 100%; + } + .card{ + width: $Wi33; + &:nth-child(-1n+3){ + margin-right: $marg; + } + .card-header{ + display: flex; + flex-wrap: wrap; + & > *{ + margin-right: $marg; + } + } + } +} diff --git a/user/themes/figureslibres/scss/theme/_menu.scss b/user/themes/figureslibres/scss/theme/_menu.scss index fee9483..e69de29 100644 --- a/user/themes/figureslibres/scss/theme/_menu.scss +++ b/user/themes/figureslibres/scss/theme/_menu.scss @@ -1,94 +0,0 @@ -.dropmenu { - - @include breakpoint(md) { - display: none; - } - - ul { - white-space: nowrap; - margin: 0; - display: flex; - - li { - position: relative; - margin: 0; - - a { - text-decoration: none; - padding: $dropmenu-vert-padding ($dropmenu-horiz-padding + $dropmenu-child-padding) $dropmenu-vert-padding $dropmenu-horiz-padding; - display: block; - - &:hover, &:focus, &.active { - color: $dropmenu-hover-text !important; - } - - &:before { - content: '\f107'; - font-family: 'FontAwesome'; - display: inline-block; - vertical-align: middle; - float: right; - margin-right: - (2 *$dropmenu-child-padding); - } - - &:only-child { - //background: none; - padding-right: $dropmenu-horiz-padding; - - &:before { - content: ''; - } - } - } - - &:hover { - & > ul { - display: block; - visibility: visible; - } - } - } - - ul li a:before { - content: '\f105'; - } - - ul { - position: absolute; - top: 100%; - list-style: none; - background: $dropmenu-bg; - box-shadow: $dropmenu-shadow; - visibility: hidden; - - ul { - position: absolute; - left: 100%; - top: 0; - } - } - - } - - & > ul > li { - display: inline-block; - } - - // Animation options - &.animated { - ul li { - transition: background .7s, color 0.5s; - } - - ul li:hover > ul { - opacity: 1; - transform: translateY(0); - } - - ul ul { - transition: transform .3s, opacity .5s; - opacity: 0; - transform: translateY(-10px); - } - } -} \ No newline at end of file diff --git a/user/themes/figureslibres/scss/theme/_mixins.scss b/user/themes/figureslibres/scss/theme/_mixins.scss index 273a0a4..e69de29 100644 --- a/user/themes/figureslibres/scss/theme/_mixins.scss +++ b/user/themes/figureslibres/scss/theme/_mixins.scss @@ -1,77 +0,0 @@ -@mixin breakpoint($point) { - @if $point == 2x { - @media (min-width:$size-2x) { - @content; - } - } @else if $point == xl { - @media (max-width: $size-xl) { - @content; - } - - } @else if $point == lg { - @media (max-width: $size-lg) { - @content; - } - } @else if $point == md { - @media (max-width: $size-md) { - @content; - } - } @else if $point == sm { - @media (max-width: $size-sm) { - @content; - } - } @else if $point == xs { - @media (max-width: $size-xs) { - @content; - } - } @else { - @warn "Breakpoint mixin supports: xs, sm, md, lg, xl, 2x"; - } -} - -@mixin vertical-align($position: relative) { - position: $position; - top: 50%; - transform: translateY(-50%); -} - -@mixin button-primary() { - background: $primary-color; - border-color: $primary-color-dark; - color: $light-color; - &:focus, - &:hover { - background: darken($primary-color-dark, 2%); - border-color: darken($primary-color-dark, 5%); - color: $light-color; - } - &:active, - &.active { - background: darken($primary-color-dark, 4%); - border-color: darken($primary-color-dark, 7%); - color: $light-color; - } -} - -@function strip-unit($value) { - @return $value / ($value * 0 + 1); -} - -@mixin fluid-type($min-vw, $max-vw, $min-font-size, $max-font-size) { - $u1: unit($min-vw); - $u2: unit($max-vw); - $u3: unit($min-font-size); - $u4: unit($max-font-size); - - @if $u1 == $u2 and $u1 == $u3 and $u1 == $u4 { - & { - font-size: $min-font-size; - @media screen and (min-width: $min-vw) { - font-size: calc(#{$min-font-size} + #{strip-unit($max-font-size - $min-font-size)} * ((100vw - #{$min-vw}) / #{strip-unit($max-vw - $min-vw)})); - } - @media screen and (min-width: $max-vw) { - font-size: $max-font-size; - } - } - } -} diff --git a/user/themes/figureslibres/scss/theme/_mobile.scss b/user/themes/figureslibres/scss/theme/_mobile.scss index c27b28f..756aeb5 100644 --- a/user/themes/figureslibres/scss/theme/_mobile.scss +++ b/user/themes/figureslibres/scss/theme/_mobile.scss @@ -1,193 +1,224 @@ -.mobile-container { - position: absolute; - //width: 100%; - //height: 100%; - top: 40%; - left: 0; - margin: 0 auto; - z-index: 2; -} - -.mobile-logo { - svg, img { - height: 42px; - margin-top: .7rem; - margin-left: 1.4rem; - - path { - fill: $light-color; +@media screen and (max-width: 414px) { + // typographie + header{ + a{ + font-size: $txt-figli-m; + line-height: $Flhome-m; } - } -} - -// Hamburger Menu -.mobile-menu { - - display: none; - top: 0; - right: 0; - z-index: 3; - - .header-fixed & { - position: fixed; + .home{ + p{ + font-size: $txt-figli-m!important; + line-height: $Flhome-m!important; + } + } + .other_projets{ + h3{ + font-size: $txt-figli-m; + } } - @include breakpoint(md) { - display: block; + // mep + header{ + width: calc( #{$Wi-m} - (#{$marg} * 2) ); } - .button_container { - position: absolute; - top: 1.3rem; - right: $horiz-padding; - height: $mobile-button-height; - width: $mobile-button-width; - cursor: pointer; - z-index: 100; - transition: opacity .25s ease, top 0.5s ease; - - $bar-offset: $mobile-button-height / 3; - - &:hover { - opacity: .7; + body{ + #start{ + width: calc( #{$Wi-m} - (#{$marg} * 2) ); } - - &.active { - position: fixed; - - .top { - transform: translateY($bar-offset) translateX(0) rotate(45deg); - background: $mobile-color-active; - } - .middle { - opacity: 0; - background: $mobile-color-active; - } - - .bottom { - transform: translateY(-($bar-offset)) translateX(0) rotate(-45deg); - background: $mobile-color-active; + &:not(.home){ + #start{ + margin-top: $Flhome; } } + .sidebar-right{ + display: none; + } + } - span { - background: $mobile-color-main; - border: none; - height: 4px; - width: 100%; - position: absolute; - top: 0; - left: 0; - transition: all .35s ease; - cursor: pointer; - - &:nth-of-type(2) { - top: $bar-offset; + #item_list{ + .card{ + width: calc( #{$Wi-m} ); + &:nth-child(odd){ + margin-right: 0; } + .card-header{ + margin-bottom: $marg; + & > * { + margin-right: $marg; + } + } + } + } - &:nth-of-type(3) { - top: $bar-offset * 2; + .other_projets{ + margin-top: $margI; + .card{ + width: $Wi-m; + &:nth-child(-1n+3){ + margin-right: 0; } } } } -.overlay { - position: fixed; - background: #000; - top: 0; - left: 0; - width: 100%; - height: 0%; - opacity: 0; - visibility: hidden; - transition: opacity .35s, visibility .35s, height .35s; - - &.open { - opacity: .95; - visibility: visible; - height: 100%; - +@media screen and (max-width: 768px) and (orientation: portrait) { + // typographie + header{ + a{ + font-size: 2.5rem; + line-height: 3rem; + } } - nav { - - position: relative; - margin: 0 auto; - text-align: center; + .home{ + p{ + font-size: $txt-figli-t!important; + line-height: $Flhome-t!important; + } } -} - -.overlay-menu { - height: calc(100% - 90px); - overflow-y: scroll; - - & > .tree { - text-align: left; - } -} - - -.treemenu { - - &.treemenu-root { - margin: 1rem; + .other_projets{ + h3{ + font-size: $txt-figli-t; + } } - li { - list-style: none; - margin: 0 0 1px; - padding: 5px 0; - line-height: 1.2rem; - - background: rgba($gray-color-dark,0.1); - - a { - display: block; - margin-left: 1.2rem; - font-size: 1rem; - - &:hover, &:focus, &.active { - color: $primary-color-light !important; - text-decoration: none; + body{ + &:not(.home){ + #start{ + margin-top: 5rem; } } } - ul { - margin: 0 0 0 1rem; - } - - .toggler { - cursor: pointer; - vertical-align: top; - font-size: 1.1rem; - line-height: 1rem; - padding-left: 5px; - float: left; - - &:before { - display: inline-block; margin-right: 2pt; + #item_list{ + .card{ + width: calc( #{$Wi-m} ); + &:nth-child(odd){ + margin-right: 0; + } + .card-header{ + margin-bottom: $marg; + & > * { + margin-right: $marg; + } + } } } - li.tree-empty > .toggler { - opacity: 0.3; cursor: default; - &:before { - content: "\2022"; + +} + +@media screen and (max-width: 812px) and (orientation: landscape) { + // typographie + header{ + a{ + font-size: $txt-figli-m; + line-height: $Flhome-m; + } + } + .home{ + p{ + font-size: $txt-figli-m!important; + line-height: $Flhome-m!important; + } + } + .other_projets{ + h3{ + font-size: $txt-figli-m; } } - li.tree-closed > .toggler:before { - content: "+"; + // mep + header{ + width: calc( #{$Wi-m} - (#{$marg} * 2) ); } - li.tree-opened > .toggler:before { - content: "\2212"; + body{ + #start{ + width: calc( #{$Wi-m} - (#{$marg} * 2) ); + } + &:not(.home){ + #start{ + margin-top: $Flhome; + } + } + .sidebar-right{ + display: none; + } + } + + #item_list{ + .card{ + width: $Wi50; + &:nth-child(odd){ + margin-right: $margI; + } + } + } + + .other_projets{ + .card{ + width: $Wi33; + &:nth-child(-1n+3){ + margin-right: $marg; + } + } } } -.mobile-nav-open { - overflow-y: hidden; +@media screen and (max-width: 910px) and (orientation: portrait) { + header{ + a{ + font-size: 2.5rem; + line-height: 3rem; + } + } + .home{ + p{ + font-size: $txt-figli-t!important; + line-height: $Flhome-t!important; + } + } + .other_projets{ + h3{ + font-size: $txt-figli-t; + } + } + body{ + &:not(.home){ + #start{ + margin-top: 5rem; + } + } + } +} + +@media screen and (max-width: 660px) { + header{ + a{ + font-size: $txt-figli-m; + line-height: $Flhome-m; + } + } + .home{ + p{ + font-size: $txt-figli-m!important; + line-height: $Flhome-m!important; + } + } + .other_projets{ + h3{ + font-size: $txt-figli-m; + } + } + + body{ + &:not(.home){ + #start{ + margin-top: $Flhome; + } + } + } } diff --git a/user/themes/figureslibres/scss/theme/_reset.scss b/user/themes/figureslibres/scss/theme/_reset.scss index 57c8e89..90ee8da 100644 --- a/user/themes/figureslibres/scss/theme/_reset.scss +++ b/user/themes/figureslibres/scss/theme/_reset.scss @@ -13,6 +13,7 @@ html { padding: 0; line-height: 1.15; /* 1 */ -webkit-text-size-adjust: 100%; /* 2 */ + font-size: 16px; } /* Sections @@ -24,7 +25,7 @@ html { body { margin: 0; - padding: 0 50px 0 50px; + padding: 0; } /** @@ -41,7 +42,7 @@ main { */ h1 { - font-size: 2em; + font-size: auto; margin:0; } @@ -76,6 +77,10 @@ pre { /** * Remove the gray background on active links in IE 10. */ +p{ + margin: 0; +} + ul{ list-style: none; } @@ -163,6 +168,7 @@ img { border-style: none; width: 100%; height: 100%; + vertical-align: bottom; } /* Forms diff --git a/user/themes/figureslibres/scss/theme/_sidebar.scss b/user/themes/figureslibres/scss/theme/_sidebar.scss index f5ad8b1..98fc737 100644 --- a/user/themes/figureslibres/scss/theme/_sidebar.scss +++ b/user/themes/figureslibres/scss/theme/_sidebar.scss @@ -2,32 +2,27 @@ position: fixed; width: 20%; height: 100%; - top: 0; right: 0; - display: flex; - ul{ + top: 0; + display: inline-flex; + .list-projets{ margin: auto; - text-align: right; - margin-right: 20px; - a{ - color: grey; - position: relative; - &:hover{ - li{ - position: relative; - &::after{ - content: " "; - top: 7px; - right: -13px; - display: block; - position: absolute; - background-color: grey; - border-radius: 5px; - width: 7px; - height: 7px; + ul{ + &:nth-child(1){ + margin-top: 0; + } + margin: $marg $marg 0px 0; + text-align: right; + li{ + &:hover{ + a{ + color: black; } } } + a{ + color: grey; + } } } } diff --git a/user/themes/figureslibres/scss/theme/_start.scss b/user/themes/figureslibres/scss/theme/_start.scss index a93058f..7a0817d 100644 --- a/user/themes/figureslibres/scss/theme/_start.scss +++ b/user/themes/figureslibres/scss/theme/_start.scss @@ -1,4 +1,76 @@ -#start{ - width: 70%; - margin: auto auto auto 10%; +html, body, header{ + background: #f9f9f9fe; +} + +body{ + #start{ + width: calc( #{$Wi} - #{$marg} ); + margin: $marg auto auto $marg; + #text_figli{ + p { + a{ + position: relative; + &::after{ + display: block; + content: ''; + position: absolute; + top: 0; + left: 0; + transform: translate(-25%,-65%); + z-index: 999; + } + // &:hover{ + // &::after{ + // content: url('/user/themes/figureslibres/images/ovale.svg'); + // width: 100%; + // height: 100%; + // top: 0; + // left: 0; + // } + // } + &.marg{ + margin-right: $marg; + } + } + } + .card{ + width: calc(100% / 4); + height: auto; + overflow: hidden; + display: inline-block; + vertical-align: top; + line-height: 0; + margin-right: $marg; + position: relative; + margin-top: $marg; + .card-header{ + display: none; + & > *{ + font-size: 0.8rem; + line-height: 1rem; + margin-right: $marg; + } + } + &:hover{ + .card-header{ + width: 100%; + background: rgba(255, 255, 255, 0.5); + padding: $marg; + display: inline-flex; + flex-wrap: wrap; + position: absolute; + transform: translateY(-100%); + } + } + &:last-child{ + vertical-align: baseline; + } + } + } + } + &:not(.home){ + #start{ + margin-top: calc( 2rem + #{$Flhome}); + } + } } diff --git a/user/themes/figureslibres/scss/theme/_typography.scss b/user/themes/figureslibres/scss/theme/_typography.scss index a08f419..9e6600b 100644 --- a/user/themes/figureslibres/scss/theme/_typography.scss +++ b/user/themes/figureslibres/scss/theme/_typography.scss @@ -1,24 +1,93 @@ -h1, h2, h3, p, ul, li, a{ - font-family: 'Montserrat-Regular'; - font-weight: normal; +h1, h2, h3, p, ul, li, a, span{ + font-family: $lato; + font-weight: lighter; } -h1{ - font-size: 1.2rem!important; -} - -p{ - font-family: 'Montserrat-Medium'!important; -} - -ul{ - font-size: 0.8rem; - line-height: 1.2rem; +header{ + a{ + font-size: $txt-figli; + line-height: $Flhome; + } } .home{ p{ - font-size: $Fphome; + font-size: $txt-figli; line-height: $Flhome; } + #text_figli{ + strong{ + position: relative; + &::after{ + display: block; + position: absolute; + content: ""; + width: 100%; + height: 1px; + background: black; + bottom: 0; + } + } + a{ + position: relative; + &:nth-child(1){ + } + &:nth-child(2){ + font-family: $playfair; + } + &:nth-child(3){ + font-family: $syne; + } + &:nth-child(4){ + font-family: $avara; + } + } + } +} + +#item{ + .content-title{ + display: flex; + margin: $marg 0; + & > * { + margin-right: $marg; + font-size: 1.15rem; + } + h2{ + margin: 0 $marg 0 0; + } + } +} + +a.publique, span.publique{ + font-family: $playfair; +} + +a.sociale, span.sociale{ + font-family: $syne; +} + +a.culturelle, span.culturelle{ + font-family: $avara; +} + +.sidebar-right{ + ul, a{ + font-size: 0.8rem; + line-height: 1.25rem; + } +} + +.other_projets{ + h3{ + font-size: $txt-figli; + margin: 0; + } +} + +.card{ + h2{ + margin: 0; + font-size: 1rem; + } } diff --git a/user/themes/figureslibres/templates/blog.html.twig b/user/themes/figureslibres/templates/blog.html.twig index 91926ab..9556e5f 100644 --- a/user/themes/figureslibres/templates/blog.html.twig +++ b/user/themes/figureslibres/templates/blog.html.twig @@ -1,49 +1,25 @@ {% extends 'partials/base.html.twig' %} -{% set blog_image = page.media.images[page.header.hero_image] ?: page.media.images|first %} {% set collection = page.collection() %} -{% set blog = page.find(header_var('blog_url')|defined(theme_var('blog-page'))) %} -{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog])|defined(true) %} -{% set show_sidebar = header_var('show_sidebar', [page, blog])|defined(true) %} -{% set show_pagination = header_var('show_pagination', [page, blog])|defined(true) %} -{% block stylesheets %} - {% do assets.addCss('theme://css/bricklayer.css') %} - {{ parent() }} -{% endblock %} - -{% block javascripts %} - {{ parent() }} - {% do assets.add('theme://js/bricklayer.min.js') %} - {% do assets.add('theme://js/scopedQuerySelectorShim.min.js') %} -{% endblock %} - - -{% block hero %} - {% include 'partials/hero.html.twig' with {id: 'blog-hero', content: page.content, hero_image: blog_image} %} +{% block header %} +
+

+ {{site.title}} +

+
{% endblock %} {% block body %} -
- - {% block item %} - -
- {% for child in collection %} - {% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %} - {% endfor %} -
- - {% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %} - - {% endif %} - - {% endblock %} - +
+ {% block item %} + {% for child in collection %} + {% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %} + {% endfor %} + {% endblock %}
- + + {% block aside %} + {% include 'partials/sidebar.html.twig' %} + {% endblock %} + {% endblock %} diff --git a/user/themes/figureslibres/templates/partials/base.html.twig b/user/themes/figureslibres/templates/partials/base.html.twig index bfbd231..02c4520 100644 --- a/user/themes/figureslibres/templates/partials/base.html.twig +++ b/user/themes/figureslibres/templates/partials/base.html.twig @@ -17,32 +17,27 @@ {% block stylesheets %} {% do assets.addCss('theme://css-compiled/theme'~compress) %} - {% do assets.addCss('theme://css/normelize.css') %} {% endblock %} {{ assets.css()|raw }} {% block javascripts %} {% do assets.addJs('jquery', 101) %} {% do assets.addJs('theme://js/script_k.js', {group:'bottom'}) %} - {% endblock %} + {{ assets.js()|raw }} {% endblock head %} - - {% block header %} -
-

{{ site.title }}

-
- - {% endblock %} - + {% block header %}{% endblock %}
{% block body %} -
- {% block content %}{% endblock %} +
+ + {% block content %} + + {% endblock %}
{% block aside %} diff --git a/user/themes/figureslibres/templates/partials/blog-item.html.twig b/user/themes/figureslibres/templates/partials/blog-item.html.twig index ca027de..966933a 100644 --- a/user/themes/figureslibres/templates/partials/blog-item.html.twig +++ b/user/themes/figureslibres/templates/partials/blog-item.html.twig @@ -1,32 +1,15 @@ -
- -{% if not hero_image_name %} -
- {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %} - {% if page.header.subtitle %} -

{{ page.header.subtitle }}

- {% endif %} - {% include 'partials/blog/taxonomy.html.twig' %} -
-{% endif %} - -
- {{ page.content|raw }} -
- -
- {% for image in page.media.images %} - {{ image.html }} - {% endfor %} -
+
+ {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %} + {% include 'partials/blog/taxonomy.html.twig' %} + {% include 'partials/blog/date.html.twig' %}
-

- {% if not page.isLast %} - {{ 'THEME_QUARK.BLOG.ITEM.PREV_POST'|t }} - {% endif %} +

+ {{ page.content|raw }} +
- {% if not page.isFirst %} - {{ 'THEME_QUARK.BLOG.ITEM.NEXT_POST'|t }} - {% endif %} -

+
+{% for image in page.media.images %} + {{ image.html }} +{% endfor %} +
diff --git a/user/themes/figureslibres/templates/partials/blog-list-item.html.twig b/user/themes/figureslibres/templates/partials/blog-list-item.html.twig index f8fed53..4632179 100644 --- a/user/themes/figureslibres/templates/partials/blog-list-item.html.twig +++ b/user/themes/figureslibres/templates/partials/blog-list-item.html.twig @@ -2,15 +2,20 @@ {% set image = page.media.images|first %} {% if image %} - {% endif %} +
+ {% if page.header.title %} + {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %} + {% endif %} -
- {% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %} -
- + {% if page.header.taxonomy.tag %} + {% include 'partials/blog/taxonomy.html.twig' %} + {% endif %} + + {% if page.header.date %} + {% include 'partials/blog/date.html.twig' %} + {% endif %} +
diff --git a/user/themes/figureslibres/templates/partials/blog/date.html.twig b/user/themes/figureslibres/templates/partials/blog/date.html.twig index a134d24..a78caf0 100644 --- a/user/themes/figureslibres/templates/partials/blog/date.html.twig +++ b/user/themes/figureslibres/templates/partials/blog/date.html.twig @@ -1,5 +1,6 @@ + - diff --git a/user/themes/figureslibres/templates/partials/blog/other_projets.html.twig b/user/themes/figureslibres/templates/partials/blog/other_projets.html.twig new file mode 100644 index 0000000..eebe168 --- /dev/null +++ b/user/themes/figureslibres/templates/partials/blog/other_projets.html.twig @@ -0,0 +1,32 @@ +
+

Les autres projets {{page.parent.title|lower}}s

+ {% set collection_random = page.parent.collection|slice(1,3) %} + + {% for item in collection_random %} + {% if item.title == page.title == false %} +
+ +
+ {% if item.header.title %} + {% include 'partials/blog/title.html.twig' with { 'page': item } %} + {% endif %} + {% if item.header.taxonomy.tag %} + + {% include 'partials/blog/taxonomy.html.twig' with { 'page': item } %} + {% endif %} + {% if item.header.date %} + + {% include 'partials/blog/date.html.twig' with { 'page': item } %} + {% endif %} + +
+
+ {% endif %} + {% endfor %} +
diff --git a/user/themes/figureslibres/templates/partials/blog/taxonomy.html.twig b/user/themes/figureslibres/templates/partials/blog/taxonomy.html.twig index 8cab9fc..86858cd 100644 --- a/user/themes/figureslibres/templates/partials/blog/taxonomy.html.twig +++ b/user/themes/figureslibres/templates/partials/blog/taxonomy.html.twig @@ -1,7 +1,8 @@ {% if page.taxonomy.tag %} + {% for tag in page.taxonomy.tag %} - {{ tag }} + {{ tag }} {% endfor %} {% endif %} diff --git a/user/themes/figureslibres/templates/partials/layout.html.twig b/user/themes/figureslibres/templates/partials/layout.html.twig index 38545d0..35e6f23 100644 --- a/user/themes/figureslibres/templates/partials/layout.html.twig +++ b/user/themes/figureslibres/templates/partials/layout.html.twig @@ -1,13 +1,11 @@ -{% set item_col = show_sidebar ? 'col-9 col-md-12' : 'col-12' %} -{% set sidebar_col = show_sidebar ? 'col-3 col-md-12' : 'col-12' %} - -
-
+
{% block item %}{% endblock %}
- {% if show_sidebar %} - - {% endif %} -
+ + {% block footer %} + {% include 'partials/blog/other_projets.html.twig' %} + {% endblock %} + + {% block aside %} + {% include 'partials/sidebar.html.twig' %} + {% endblock %} diff --git a/user/themes/figureslibres/templates/partials/sidebar.html.twig b/user/themes/figureslibres/templates/partials/sidebar.html.twig index 6a42549..e0c707b 100644 --- a/user/themes/figureslibres/templates/partials/sidebar.html.twig +++ b/user/themes/figureslibres/templates/partials/sidebar.html.twig @@ -1,24 +1,5 @@ -{% set feed_url = blog.url == '/' or blog.url == base_url_relative ? (base_url_relative~'/'~blog.slug) : blog.url %} -{% set new_base_url = blog.url == '/' ? '' : blog.url %} - - - diff --git a/user/themes/figureslibres/templates/partials/taxonomylist.html.twig b/user/themes/figureslibres/templates/partials/taxonomylist.html.twig index cdd8a98..7aa4515 100644 --- a/user/themes/figureslibres/templates/partials/taxonomylist.html.twig +++ b/user/themes/figureslibres/templates/partials/taxonomylist.html.twig @@ -1,23 +1,22 @@ {% set taxlist = children_only is defined ? taxonomylist.getChildPagesTags() : taxonomylist.get() %} +{% macro pageLinkName(text) %} + {{ text|lower|replace({' ':'_'}) }} +{% endmacro %} -{% if taxlist %} -
    - {% for tax,value in taxlist[taxonomy] %} - {% set label_class = uri.param(taxonomy) == tax ? 'label-primary' : 'label-secondary' %} +{% import _self as macro %} +{% for tax,value in taxlist[taxonomy] %} +
      + {{ tax }} + + {% set options = { items: {'@taxonomy': {'category': tax} } } %} + {% set my_collection = page.collection(options) %} + + {% for i in my_collection %}
    • - {{ tax }} + {{i.title}}
    • - - {% set options = { items: {'@taxonomy': {'category': tax} } } %} - {% set my_collection = page.collection(options) %} - - {% for i in my_collection %} -
    • {{i.title}}
    • - {% endfor %} - {% endfor %} -
    -{% endif %} +{% endfor %} diff --git a/user/themes/figureslibres/templates/projet.html.twig b/user/themes/figureslibres/templates/projet.html.twig new file mode 100644 index 0000000..6f627ca --- /dev/null +++ b/user/themes/figureslibres/templates/projet.html.twig @@ -0,0 +1,19 @@ +{% extends 'partials/base.html.twig' %} + +{% block header %} +
    +

    + {{site.title}} • {{page.parent.title|lower}} +

    +
    +{% endblock %} + +{% block body %} +
    + {% embed 'partials/layout.html.twig' %} + {% block item %} + {% include 'partials/blog-item.html.twig' %} + {% endblock %} + {% endembed %} +
    +{% endblock %}