diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6af65..614d2c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# v1.5.7 +## 01/25/2018 + +1. [](#new) + * Support for AWS Cloudfront forwarded scheme header [#2297](https://github.com/getgrav/grav/pull/2297) +1. [](#improved) + * Set homepage with `https://` protocol [#2299](https://github.com/getgrav/grav/pull/2299) + * Preserve accents in fields containing Twig expr. using unicode [#2279](https://github.com/getgrav/grav/pull/2279) + * Updated vendor libraries +1. [](#bugfix) + * Support spaces with filenames in responsive images [#2300](https://github.com/getgrav/grav/pull/2300) + # v1.5.6 ## 12/14/2018 diff --git a/composer.json b/composer.json index 5a5c6a8..d56945e 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "project", "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS", "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"], - "homepage": "http://getgrav.org", + "homepage": "https://getgrav.org", "license": "MIT", "require": { "php": ">=5.6.4", diff --git a/composer.lock b/composer.lock index e54c23b..75a232d 100644 --- a/composer.lock +++ b/composer.lock @@ -52,16 +52,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660", + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660", "shasum": "" }, "require": { @@ -104,7 +104,7 @@ "ssl", "tls" ], - "time": "2018-08-08T08:57:40+00:00" + "time": "2018-10-18T06:09:13+00:00" }, { "name": "doctrine/cache", @@ -245,16 +245,16 @@ }, { "name": "donatj/phpuseragentparser", - "version": "v0.10.0", + "version": "v0.11.1", "source": { "type": "git", "url": "https://github.com/donatj/PhpUserAgent.git", - "reference": "9de58cc2a3e986bfee7f4cea3365c830b765cf65" + "reference": "0eab93a89a1a73a087e795abc96d5777c3d48b64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/9de58cc2a3e986bfee7f4cea3365c830b765cf65", - "reference": "9de58cc2a3e986bfee7f4cea3365c830b765cf65", + "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/0eab93a89a1a73a087e795abc96d5777c3d48b64", + "reference": "0eab93a89a1a73a087e795abc96d5777c3d48b64", "shasum": "" }, "require": { @@ -283,7 +283,7 @@ "role": "Developer" } ], - "description": "Simple, streamlined PHP user-agent parser", + "description": "Lightning fast, minimalist PHP UserAgent string parser.", "homepage": "http://donatstudios.com/PHP-Parser-HTTP_USER_AGENT", "keywords": [ "browser", @@ -292,7 +292,7 @@ "user agent", "useragent" ], - "time": "2018-06-21T15:54:46+00:00" + "time": "2018-10-25T20:22:53+00:00" }, { "name": "erusev/parsedown", @@ -385,16 +385,16 @@ }, { "name": "filp/whoops", - "version": "2.2.1", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311" + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311", - "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311", + "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", "shasum": "" }, "require": { @@ -442,7 +442,7 @@ "throwable", "whoops" ], - "time": "2018-06-30T13:14:06+00:00" + "time": "2018-10-23T09:00:00+00:00" }, { "name": "gregwar/cache", @@ -489,17 +489,17 @@ }, { "name": "gregwar/image", - "version": "v2.0.22", + "version": "v2.0.23", "target-dir": "Gregwar/Image", "source": { "type": "git", "url": "https://github.com/Gregwar/Image.git", - "reference": "c506d57d7fb5e67961d4eea6540ae8e23dffd406" + "reference": "25fbb91a95d41d44587ee7ca8923745b66221a7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Gregwar/Image/zipball/c506d57d7fb5e67961d4eea6540ae8e23dffd406", - "reference": "c506d57d7fb5e67961d4eea6540ae8e23dffd406", + "url": "https://api.github.com/repos/Gregwar/Image/zipball/25fbb91a95d41d44587ee7ca8923745b66221a7d", + "reference": "25fbb91a95d41d44587ee7ca8923745b66221a7d", "shasum": "" }, "require": { @@ -537,36 +537,37 @@ "gd", "image" ], - "time": "2018-01-31T17:40:17+00:00" + "time": "2018-10-25T17:12:13+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "9f83dded91781a01c63574e387eaa769be769115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", + "reference": "9f83dded91781a01c63574e387eaa769be769115", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -596,13 +597,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2018-12-04T20:46:45+00:00" }, { "name": "league/climate", @@ -667,16 +669,16 @@ }, { "name": "matthiasmullie/minify", - "version": "1.3.60", + "version": "1.3.61", "source": { "type": "git", "url": "https://github.com/matthiasmullie/minify.git", - "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90" + "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/ab7fea80ce5ce6549baaf272bc8bd926a7e08f90", - "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90", + "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751", + "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751", "shasum": "" }, "require": { @@ -723,20 +725,20 @@ "minifier", "minify" ], - "time": "2018-04-18T08:50:35+00:00" + "time": "2018-11-26T23:10:39+00:00" }, { "name": "matthiasmullie/path-converter", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/matthiasmullie/path-converter.git", - "reference": "3082a6838be02b930239a97d38b5c9da4d693aca" + "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/3082a6838be02b930239a97d38b5c9da4d693aca", - "reference": "3082a6838be02b930239a97d38b5c9da4d693aca", + "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/5e4b121c8b9f97c80835c1d878b0812ba1d607c9", + "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9", "shasum": "" }, "require": { @@ -772,7 +774,7 @@ "paths", "relative" ], - "time": "2018-02-02T11:30:10+00:00" + "time": "2018-10-25T15:19:41+00:00" }, { "name": "maximebf/debugbar", @@ -892,16 +894,16 @@ }, { "name": "monolog/monolog", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -966,7 +968,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "pimple/pimple", @@ -1119,16 +1121,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -1162,7 +1164,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psr/simple-cache", @@ -1212,6 +1214,46 @@ ], "time": "2017-10-23T01:57:42+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2016-02-11T07:05:27+00:00" + }, { "name": "rockettheme/toolbox", "version": "1.4.2", @@ -1311,16 +1353,16 @@ }, { "name": "symfony/console", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b" + "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b", - "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b", + "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a", + "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a", "shasum": "" }, "require": { @@ -1376,20 +1418,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:33:53+00:00" + "time": "2019-01-04T04:42:43+00:00" }, { "name": "symfony/debug", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6" + "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6", - "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6", + "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", + "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", "shasum": "" }, "require": { @@ -1432,20 +1474,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:33:53+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb" + "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", - "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2", + "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2", "shasum": "" }, "require": { @@ -1495,11 +1537,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:06:28+00:00" + "time": "2019-01-01T18:08:36+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1557,16 +1599,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2" + "reference": "97001cfc283484c9691769f51cdf25259037eba2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2", - "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/97001cfc283484c9691769f51cdf25259037eba2", + "reference": "97001cfc283484c9691769f51cdf25259037eba2", "shasum": "" }, "require": { @@ -1612,20 +1654,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -1671,20 +1713,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181" + "reference": "a5f39641bb62e8b74e343467b145331273f615a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ff8ac19e97e5c7c3979236b584719a1190f84181", - "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5f39641bb62e8b74e343467b145331273f615a2", + "reference": "a5f39641bb62e8b74e343467b145331273f615a2", "shasum": "" }, "require": { @@ -1740,20 +1782,20 @@ "debug", "dump" ], - "time": "2018-10-02T16:33:53+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f" + "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f", - "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f", + "url": "https://api.github.com/repos/symfony/yaml/zipball/554a59a1ccbaac238a89b19c8e551a556fd0e2ea", + "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea", "shasum": "" }, "require": { @@ -1799,35 +1841,35 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:33:53+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "twig/twig", - "version": "v1.35.4", + "version": "v1.37.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a" + "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", - "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62", + "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.4.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.3" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.35-dev" + "dev-master": "1.37-dev" } }, "autoload": { @@ -1865,22 +1907,22 @@ "keywords": [ "templating" ], - "time": "2018-07-13T07:12:17+00:00" + "time": "2019-01-14T14:59:29+00:00" } ], "packages-dev": [ { "name": "behat/gherkin", - "version": "v4.5.1", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a" + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", - "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07", + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07", "shasum": "" }, "require": { @@ -1888,8 +1930,8 @@ }, "require-dev": { "phpunit/phpunit": "~4.5|~5", - "symfony/phpunit-bridge": "~2.7|~3", - "symfony/yaml": "~2.3|~3" + "symfony/phpunit-bridge": "~2.7|~3|~4", + "symfony/yaml": "~2.3|~3|~4" }, "suggest": { "symfony/yaml": "If you want to parse features, represented in YAML files" @@ -1926,20 +1968,20 @@ "gherkin", "parser" ], - "time": "2017-08-30T11:04:43+00:00" + "time": "2019-01-16T14:22:17+00:00" }, { "name": "codeception/codeception", - "version": "2.5.0", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "dee493561daf644134c95cf176fd2c25aff59ea9" + "reference": "4f89de32929fef53ca6d83b159fe329b6d484c1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/dee493561daf644134c95cf176fd2c25aff59ea9", - "reference": "dee493561daf644134c95cf176fd2c25aff59ea9", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/4f89de32929fef53ca6d83b159fe329b6d484c1c", + "reference": "4f89de32929fef53ca6d83b159fe329b6d484c1c", "shasum": "" }, "require": { @@ -2018,7 +2060,7 @@ "functional testing", "unit testing" ], - "time": "2018-09-24T09:33:01+00:00" + "time": "2019-01-02T10:28:51+00:00" }, { "name": "codeception/phpunit-wrapper", @@ -3335,16 +3377,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0" + "reference": "6d98fb221a263c66b1311203fe4eed154035f508" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f6668d1a6182d5a8dec65a1c863a4c1d963816c0", - "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6d98fb221a263c66b1311203fe4eed154035f508", + "reference": "6d98fb221a263c66b1311203fe4eed154035f508", "shasum": "" }, "require": { @@ -3388,20 +3430,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:06:28+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb" + "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb", - "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/12f86295c46c36af9896cf21db6b6b8a1465315d", + "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d", "shasum": "" }, "require": { @@ -3441,20 +3483,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:33:53+00:00" + "time": "2019-01-02T09:30:52+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722" + "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c705bee03ade5b47c087807dd9ffaaec8dda2722", - "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/311f666d85d1075b0a294ba1f3de4ae9307d8180", + "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180", "shasum": "" }, "require": { @@ -3498,20 +3540,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:28:39+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "symfony/finder", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d" + "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/54ba444dddc5bd5708a34bd095ea67c6eb54644d", - "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d", + "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", + "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", "shasum": "" }, "require": { @@ -3547,20 +3589,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:46:40+00:00" + "time": "2019-01-01T13:45:19+00:00" }, { "name": "symfony/process", - "version": "v3.4.17", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e" + "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1dc2977afa7d70f90f3fefbcd84152813558910e", - "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e", + "url": "https://api.github.com/repos/symfony/process/zipball/0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c", + "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c", "shasum": "" }, "require": { @@ -3596,7 +3638,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:28:39+00:00" + "time": "2019-01-02T21:24:08+00:00" }, { "name": "victorjonsson/markdowndocs", @@ -3646,20 +3688,21 @@ }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -3692,7 +3735,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], diff --git a/system/defines.php b/system/defines.php index 9357ae6..516c2b6 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.5.6'); +define('GRAV_VERSION', '1.5.7'); define('GRAV_TESTING', false); define('DS', '/'); diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php index 2f1f176..72f23b4 100644 --- a/system/src/Grav/Common/Page/Medium/ImageMedium.php +++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php @@ -223,7 +223,7 @@ class ImageMedium extends Medium foreach ($this->alternatives as $ratio => $medium) { $srcset[] = $medium->url($reset) . ' ' . $medium->get('width') . 'w'; } - $srcset[] = $this->url($reset) . ' ' . $this->get('width') . 'w'; + $srcset[] = str_replace(' ', '%20', $this->url($reset)) . ' ' . $this->get('width') . 'w'; return implode(', ', $srcset); } diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 3024cc3..0e57b03 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -168,7 +168,7 @@ class Page implements PageInterface unset($process_fields[$field]); } } - $text_header = Grav::instance()['twig']->processString(json_encode($process_fields), ['page' => $this]); + $text_header = Grav::instance()['twig']->processString(json_encode($process_fields, JSON_UNESCAPED_UNICODE), ['page' => $this]); $this->header((object)(json_decode($text_header, true) + $ignored_fields)); } } diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php index 9ce2d42..f1a46f8 100644 --- a/system/src/Grav/Common/Uri.php +++ b/system/src/Grav/Common/Uri.php @@ -1140,6 +1140,8 @@ class Uri $this->scheme = $env['HTTP_X_FORWARDED_PROTO']; } elseif (isset($env['X-FORWARDED-PROTO'])) { $this->scheme = $env['X-FORWARDED-PROTO']; + } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) { + $this->scheme = $env['HTTP_CLOUDFRONT_FORWARDED_PROTO']; } elseif (isset($env['REQUEST_SCHEME'])) { $this->scheme = $env['REQUEST_SCHEME']; } else { @@ -1168,6 +1170,10 @@ class Uri $this->port = (int)$env['HTTP_X_FORWARDED_PORT']; } elseif (isset($env['X-FORWARDED-PORT'])) { $this->port = (int)$env['X-FORWARDED-PORT']; + } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) { + // Since AWS Cloudfront does not provide a forwarded port header, + // we have to build the port using the scheme. + $this->port = $this->port(); } elseif (isset($env['SERVER_PORT'])) { $this->port = (int)$env['SERVER_PORT']; } else { diff --git a/user/pages/01.home/default.md b/user/pages/01.home/default.md index 51225fc..c2a67ee 100644 --- a/user/pages/01.home/default.md +++ b/user/pages/01.home/default.md @@ -3,4 +3,5 @@ title: Home body_classes: 'title-center title-h1h2' --- -Nous sommes un collectif né de la rencontre de deux démarches citoyennes qui animent chacun de ses membres : porter les messages de commanditaires d'utilité publique, [sociale]() et [culturelle](); Œuvrer sur logiciels libres pour créer sans consommer, libérer l'information, interagir et s'enrichir ensemble. +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 diff --git a/user/pages/02.projets/blog.md b/user/pages/02.projets/blog.md index 9e9d590..7a3cfea 100644 --- a/user/pages/02.projets/blog.md +++ b/user/pages/02.projets/blog.md @@ -3,10 +3,11 @@ title: Projets content: items: - '@self.children' - limit: 10 + limit: 0 order: by: date dir: desc pagination: true url_taxonomy_filters: true --- + diff --git a/user/pages/02.projets/nom-du-projets/OSC_3084.jpg b/user/pages/02.projets/nom-du-projets/OSC_3084.jpg new file mode 100644 index 0000000..9e2564c Binary files /dev/null and b/user/pages/02.projets/nom-du-projets/OSC_3084.jpg differ diff --git a/user/pages/02.projets/nom-du-projets/item.md b/user/pages/02.projets/nom-du-projets/item.md new file mode 100644 index 0000000..2f78819 --- /dev/null +++ b/user/pages/02.projets/nom-du-projets/item.md @@ -0,0 +1,11 @@ +--- +title: 'Nom du projets' +taxonomy: + category: + - social +--- + +blablablablabla +blablablabla +blablabla +blablabla \ No newline at end of file diff --git a/user/pages/02.projets/tous-des-sang-meles-2/item.md b/user/pages/02.projets/tous-des-sang-meles-2/item.md index 9308416..4ff32ea 100644 --- a/user/pages/02.projets/tous-des-sang-meles-2/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-2/item.md @@ -1,6 +1,9 @@ --- 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' +taxonomy: + tag: + - sociale --- Collection « Petit guide » outils de vulgarisation diff --git a/user/pages/02.projets/tous-des-sang-meles-3/item.md b/user/pages/02.projets/tous-des-sang-meles-3/item.md index 17af038..7b50d98 100644 --- a/user/pages/02.projets/tous-des-sang-meles-3/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-3/item.md @@ -1,5 +1,8 @@ --- title: 'L’Encyclopédie de la Parole' +taxonomy: + tag: + - culturelle --- Refonte du siite internet diff --git a/user/pages/02.projets/tous-des-sang-meles-4/item.md b/user/pages/02.projets/tous-des-sang-meles-4/item.md index 363e3cd..61cefc8 100644 --- a/user/pages/02.projets/tous-des-sang-meles-4/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-4/item.md @@ -1,6 +1,9 @@ --- title: 'Les spectacles de l’Encyclopédie' media_order: '1.jpg,2.jpg,3.jpg,4.jpg' +taxonomy: + tag: + - culturelle --- Dépliant de présentation 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 index ab7b7ce..faadc72 100644 --- a/user/pages/02.projets/tous-des-sang-meles-5/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-5/item.md @@ -1,5 +1,8 @@ --- title: 'Nos terres valent plus que du carbone' +taxonomy: + tag: + - sociale --- CCFD-Terre Solidaire diff --git a/user/pages/02.projets/tous-des-sang-meles-6/item.md b/user/pages/02.projets/tous-des-sang-meles-6/item.md index 1eae9ee..420ac5f 100644 --- a/user/pages/02.projets/tous-des-sang-meles-6/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-6/item.md @@ -1,6 +1,9 @@ --- 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: + tag: + - sociale --- POPSU / PUCA (Ministère de la transition écologique et solidaire /Ministère de la cohésion des territoires / Ministère de la culture) diff --git a/user/pages/02.projets/tous-des-sang-meles/item.md b/user/pages/02.projets/tous-des-sang-meles/item.md index 8feba6e..f13b7a6 100644 --- a/user/pages/02.projets/tous-des-sang-meles/item.md +++ b/user/pages/02.projets/tous-des-sang-meles/item.md @@ -1,6 +1,9 @@ --- 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: + tag: + - culturelle --- Catalogue d’exposition diff --git a/user/pages/03.collectif/bachir/item.md b/user/pages/03.collectif/bachir/item.md new file mode 100644 index 0000000..58f6b8a --- /dev/null +++ b/user/pages/03.collectif/bachir/item.md @@ -0,0 +1,6 @@ +--- +title: Bachir +--- + +Salut, +Je m'apelle Bachir \ No newline at end of file diff --git a/user/pages/03.collectif/blog.md b/user/pages/03.collectif/blog.md new file mode 100644 index 0000000..0af03df --- /dev/null +++ b/user/pages/03.collectif/blog.md @@ -0,0 +1,13 @@ +--- +title: Collectif +content: + items: + - '@self.children' + limit: 0 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/03.collectif/kevin/item.md b/user/pages/03.collectif/kevin/item.md new file mode 100644 index 0000000..2f8e751 --- /dev/null +++ b/user/pages/03.collectif/kevin/item.md @@ -0,0 +1,6 @@ +--- +title: Kevin +--- + +Salut, +Je m'apelle Kevin \ No newline at end of file diff --git a/user/pages/03.collectif/maud/item.md b/user/pages/03.collectif/maud/item.md new file mode 100644 index 0000000..4f66708 --- /dev/null +++ b/user/pages/03.collectif/maud/item.md @@ -0,0 +1,6 @@ +--- +title: Maud +--- + +Salut, +Je m'apelle maud \ No newline at end of file diff --git a/user/pages/03.collectif/ouidade/item.md b/user/pages/03.collectif/ouidade/item.md new file mode 100644 index 0000000..cdf23b0 --- /dev/null +++ b/user/pages/03.collectif/ouidade/item.md @@ -0,0 +1,6 @@ +--- +title: Ouidade +--- + +Salut, +Je m'apelle Ouidade \ No newline at end of file diff --git a/user/pages/03.collectif/sandrine/item.md b/user/pages/03.collectif/sandrine/item.md new file mode 100644 index 0000000..d45d9b2 --- /dev/null +++ b/user/pages/03.collectif/sandrine/item.md @@ -0,0 +1,6 @@ +--- +title: Sandrine +--- + +Salut, +je m'apelle sandrine \ No newline at end of file diff --git a/user/pages/04.logiciels-libres/blog.md b/user/pages/04.logiciels-libres/blog.md new file mode 100644 index 0000000..a727107 --- /dev/null +++ b/user/pages/04.logiciels-libres/blog.md @@ -0,0 +1,19 @@ +--- +title: 'logiciels libres' +taxonomy: + tag: + - 'logiciels libres' +content: + items: + - '@self.children' + limit: 5 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + +Iam in altera philosophiae parte. quae est quaerendi ac disserendi, quae logikh dicitur, iste vester plane, ut mihi quidem videtur, inermis ac nudus est. tollit definitiones, nihil de dividendo ac partiendo docet, non quo modo efficiatur concludaturque ratio tradit, non qua via captiosa solvantur ambigua distinguantur ostendit; iudicia rerum in sensibus ponit, quibus si semel aliquid falsi pro vero probatum sit, sublatum esse omne iudicium veri et falsi putat. + +Et quoniam apud eos ut in capite mundi morborum acerbitates celsius dominantur, ad quos vel sedandos omnis professio medendi torpescit, excogitatum est adminiculum sospitale nequi amicum perferentem similia videat, additumque est cautionibus paucis remedium aliud satis validum, ut famulos percontatum missos quem ad modum valeant noti hac aegritudine colligati, non ante recipiant domum quam lavacro purgaverint corpus. ita etiam alienis oculis visa metuitur labes. \ No newline at end of file diff --git a/user/pages/05.commanditaires/blog.md b/user/pages/05.commanditaires/blog.md new file mode 100644 index 0000000..79ed393 --- /dev/null +++ b/user/pages/05.commanditaires/blog.md @@ -0,0 +1,13 @@ +--- +title: commanditaires +content: + items: + - '@self.children' + limit: 5 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/05.commanditaires/commanditaires-n-1/item.md b/user/pages/05.commanditaires/commanditaires-n-1/item.md new file mode 100644 index 0000000..1fdc3c3 --- /dev/null +++ b/user/pages/05.commanditaires/commanditaires-n-1/item.md @@ -0,0 +1,4 @@ +--- +title: 'commanditaires n°1' +--- + diff --git a/user/pages/05.commanditaires/commanditaires-n-2/item.md b/user/pages/05.commanditaires/commanditaires-n-2/item.md new file mode 100644 index 0000000..5f11cdb --- /dev/null +++ b/user/pages/05.commanditaires/commanditaires-n-2/item.md @@ -0,0 +1,4 @@ +--- +title: 'commanditaires n°2' +--- + diff --git a/user/pages/06.nos-outils/blog.md b/user/pages/06.nos-outils/blog.md new file mode 100644 index 0000000..80054c5 --- /dev/null +++ b/user/pages/06.nos-outils/blog.md @@ -0,0 +1,13 @@ +--- +title: 'Nos outils' +content: + items: + - '@self.children' + limit: 5 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + diff --git a/user/pages/06.nos-outils/outils-n-1/item.md b/user/pages/06.nos-outils/outils-n-1/item.md new file mode 100644 index 0000000..f0d415b --- /dev/null +++ b/user/pages/06.nos-outils/outils-n-1/item.md @@ -0,0 +1,4 @@ +--- +title: 'Outils N°1' +--- + diff --git a/user/pages/07.contact/blog.md b/user/pages/07.contact/blog.md new file mode 100644 index 0000000..32af108 --- /dev/null +++ b/user/pages/07.contact/blog.md @@ -0,0 +1,17 @@ +--- +title: Contact +content: + items: + - '@self.children' + limit: 5 + order: + by: date + dir: desc + pagination: true + url_taxonomy_filters: true +--- + +Numéros tel +E-mail +Reseaux sociaux +etc... \ No newline at end of file diff --git a/user/themes/figureslibres/css-compiled/theme.css b/user/themes/figureslibres/css-compiled/theme.css index b4971ce..b8dde73 100644 --- a/user/themes/figureslibres/css-compiled/theme.css +++ b/user/themes/figureslibres/css-compiled/theme.css @@ -1,10 +1,12 @@ @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"); } + h1, h2, h3, p, ul, li, a { font-family: 'Montserrat-Regular'; font-weight: normal; } h1 { font-size: 1.2rem !important; } -p { font-size: 8rem; line-height: 8rem; } +p { font-family: "Montserrat-Medium" !important; font-size: 8rem; line-height: 8rem; } ul { font-size: 0.8rem; line-height: 1.2rem; } @@ -12,14 +14,16 @@ Header { position: fixed; top: 0; } Header h1 { margin: 30px 0 0 30px; } -#start { width: 70%; margin: auto; } +#start { width: 70%; margin: auto auto auto 10%; } .sidebar-right { position: fixed; width: 20%; height: 100%; top: 0; right: 0; display: -ms-flexbox; display: flex; } .sidebar-right ul { margin: auto; text-align: right; margin-right: 20px; } -.sidebar-right ul a { color: grey; } +.sidebar-right ul a { color: grey; position: relative; } -.sidebar-right ul a:hover::after { content: "D"; } +.sidebar-right ul a:hover li { position: relative; } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGhlbWUuY3NzIiwic291cmNlcyI6WyJ0aGVtZS5zY3NzIiwibWl4aW5zL19mb250cy5zY3NzIiwibWl4aW5zL192YXJpYWJsZS5zY3NzIiwidGhlbWUvX3R5cG9ncmFwaHkuc2NzcyIsInRoZW1lL19oZWFkZXIuc2NzcyIsInRoZW1lL19zdGFydC5zY3NzIiwidGhlbWUvX3NpZGViYXIuc2NzcyJdLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3JlIHZhcmlhYmxlcyBhbmQgbWl4aW5zXG5AaW1wb3J0ICdtaXhpbnMvX2ZvbnRzJztcbkBpbXBvcnQgJ21peGlucy9fdmFyaWFibGUnO1xuXG5AaW1wb3J0ICd0aGVtZS90eXBvZ3JhcGh5JztcblxuQGltcG9ydCAndGhlbWUvaGVhZGVyJztcbkBpbXBvcnQgJ3RoZW1lL3N0YXJ0JztcbkBpbXBvcnQgJ3RoZW1lL3NpZGViYXInO1xuLy8gQGltcG9ydCAndGhlbWUvbWVudSc7XG4vLyBAaW1wb3J0ICd0aGVtZS9mb290ZXInO1xuLy9cbi8vIC8vIEV4dHJhIFNrZWxldG9uIFN0eWxpbmdcbi8vIEBpbXBvcnQgJ3RoZW1lL2Jsb2cnO1xuLy8gQGltcG9ydCAndGhlbWUvb25lcGFnZSc7XG4iLCIvLyBGb250IEZhbWlseVxuJGZvbnQtZmFtaWx5LWRlZmF1bHQ6ICBcdFx0XHRcIlJhbGV3YXlcIiwgXCJIZWx2ZXRpY2FcIiwgXCJUYWhvbWFcIiwgXCJHZW5ldmFcIiwgXCJBcmlhbFwiLCBzYW5zLXNlcmlmO1xuJGZvbnQtZmFtaWx5LWhlYWRlcjogIFx0XHRcdFwiTW9udHNlcnJhdFwiLCBcIkhlbHZldGljYVwiLCBcIlRhaG9tYVwiLCBcIkdlbmV2YVwiLCBcIkFyaWFsXCIsIHNhbnMtc2VyaWY7XG4kZm9udC1mYW1pbHktbW9ubzogXHRcdFx0XHRcIkluY29uc29sYXRhXCIsIG1vbm9zcGFjZTtcbiRmb250LWZhbWlseS1zZXJpZjpcdFx0XHRcdFwiR2VvcmdpYVwiLCBcIlRpbWVzXCIsIFwiVGltZXMgTmV3IFJvbWFuXCIsIHNlcmlmO1xuLy8gQGZvbnQtZmFjZVxuXG4kUmVndWxhcjogXCJNb250c2VycmF0LVJlZ3VsYXJcIjtcbiRmYW1pbHk6IFwibW9udHNlcnJhdFwiO1xuJGZpbGUtcmVndWxhcjogXCJNb250c2VycmF0LVJlZ3VsYXJcIjtcbiRjYXRlZ29yeTogXCJzYW5zLXNlcmlmXCI7XG5cbkBtaXhpbiBmb250LWZhY2UoJFJlZ3VsYXIsICRmaWxlLXJlZ3VsYXIsICRmYW1pbHksICRjYXRlZ29yeTpcIlwiKSB7XG4gICAgJGZpbGVwYXRoOiBcIi4uL2ZvbnRzL1wiICsgJGZhbWlseSArIFwiL1wiICsgJGZpbGUtcmVndWxhcjtcbiAgICBAZm9udC1mYWNlIHtcbiAgICAgICAgZm9udC1mYW1pbHk6IFwiI3skUmVndWxhcn1cIjtcbiAgICAgICAgc3JjOiB1cmwoJGZpbGVwYXRoICsgXCIuZW90XCIpO1xuICAgICAgICBzcmM6IHVybCgkZmlsZXBhdGggKyBcIi5lb3Q/I2llZml4XCIpIGZvcm1hdCgnZW1iZWRkZWQtb3BlbnR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLndvZmZcIikgZm9ybWF0KCd3b2ZmJyksXG4gICAgICAgICAgICAgIHVybCgkZmlsZXBhdGggKyBcIi50dGZcIikgIGZvcm1hdCgndHJ1ZXR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLnN2ZyNcIiArICRSZWd1bGFyICsgXCJcIikgZm9ybWF0KCdzdmcnKTtcbiAgICB9XG5cbiAgICAlI3skUmVndWxhcn0ge1xuICAgICAgICBmb250OiB7XG4gICAgICAgICAgICBAaWYgJGNhdGVnb3J5ICE9IFwiXCIge1xuICAgICAgICAgICAgICAgIGZhbWlseTogXCIjeyRSZWd1bGFyfVwiLCAjeyRjYXRlZ29yeX07XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBAZWxzZSB7XG4gICAgICAgICAgICAgICAgZmFtaWx5OiBcIiN7JFJlZ3VsYXJ9XCI7XG4gICAgICAgICAgICAgICAgd2VpZ2h0OiBub3JtYWw7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICB9XG59XG4iLCJAaW5jbHVkZSBmb250LWZhY2UoJFJlZ3VsYXIsICRmaWxlLXJlZ3VsYXIsICRmYW1pbHksICRjYXRlZ29yeSk7Ly8xXG4iLCJoMSwgaDIsIGgzLCBwLCB1bCwgbGksIGF7XG4gIGZvbnQtZmFtaWx5OiAnTW9udHNlcnJhdC1SZWd1bGFyJztcbiAgZm9udC13ZWlnaHQ6IG5vcm1hbDtcbn1cblxuaDF7XG4gIGZvbnQtc2l6ZTogMS4ycmVtIWltcG9ydGFudDtcbn1cblxucHtcbiAgZm9udC1zaXplOiA4cmVtO1xuICBsaW5lLWhlaWdodDogOHJlbTtcbn1cblxudWx7XG4gIGZvbnQtc2l6ZTogMC44cmVtO1xuICBsaW5lLWhlaWdodDogMS4ycmVtO1xufVxuIiwiSGVhZGVye1xuICBwb3NpdGlvbjogZml4ZWQ7XG4gIHRvcDogMDtcbiAgaDF7XG4gICAgbWFyZ2luOiAzMHB4IDAgMCAzMHB4O1xuICB9XG59XG4iLCIjc3RhcnR7XG4gIHdpZHRoOiA3MCU7XG4gIG1hcmdpbjogYXV0bztcbn1cbiIsIi5zaWRlYmFyLXJpZ2h0e1xuICBwb3NpdGlvbjogZml4ZWQ7XG4gIHdpZHRoOiAyMCU7XG4gIGhlaWdodDogMTAwJTtcbiAgdG9wOiAwO1xuICByaWdodDogMDtcbiAgZGlzcGxheTogZmxleDtcbiAgdWx7XG4gICAgbWFyZ2luOiBhdXRvO1xuICAgIHRleHQtYWxpZ246IHJpZ2h0O1xuICAgIG1hcmdpbi1yaWdodDogMjBweDtcbiAgICBhe1xuICAgICAgY29sb3I6IGdyZXk7XG4gICAgICAmOmhvdmVye1xuICAgICAgICAmOjphZnRlcntcbiAgICAgICAgICBjb250ZW50OiBcIkRcIjtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfVxufVxuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQ2NJLFVBQVUsR0FDTixXQUFXLEVBQUUsb0JBQWEsRUFDMUIsR0FBRyxFQUFFLGlEQUF1QixFQUM1QixHQUFHLEVBQUUsd0RBQThCLENBQUMsMkJBQTJCLEVBQ3pELGtEQUF3QixDQUFDLGNBQWMsRUFDdkMsaURBQXVCLENBQUUsa0JBQWtCLEVBQzNDLG9FQUF3QyxDQUFDLGFBQWE7O0FFcEJwRSxBQUFBLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQSxFQUN0QixXQUFXLEVBQUUsb0JBQW9CLEVBQ2pDLFdBQVcsRUFBRSxNQUFNLEdBQ3BCOztBQUVELEFBQUEsRUFBRSxDQUFBLEVBQ0EsU0FBUyxFQUFFLE1BQU0sQ0FBQSxVQUFVLEdBQzVCOztBQUVELEFBQUEsQ0FBQyxDQUFBLEVBQ0MsU0FBUyxFQUFFLElBQUksRUFDZixXQUFXLEVBQUUsSUFBSSxHQUNsQjs7QUFFRCxBQUFBLEVBQUUsQ0FBQSxFQUNBLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFdBQVcsRUFBRSxNQUFNLEdBQ3BCOztBQ2pCRCxBQUFBLE1BQU0sQ0FBQSxFQUNKLFFBQVEsRUFBRSxLQUFLLEVBQ2YsR0FBRyxFQUFFLENBQUMsR0FJUDs7QUFORCxBQUdFLE1BSEksQ0FHSixFQUFFLENBQUEsRUFDQSxNQUFNLEVBQUUsYUFBYSxHQUN0Qjs7QUNMSCxBQUFBLE1BQU0sQ0FBQSxFQUNKLEtBQUssRUFBRSxHQUFHLEVBQ1YsTUFBTSxFQUFFLElBQUksR0FDYjs7QUNIRCxBQUFBLGNBQWMsQ0FBQSxFQUNaLFFBQVEsRUFBRSxLQUFLLEVBQ2YsS0FBSyxFQUFFLEdBQUcsRUFDVixNQUFNLEVBQUUsSUFBSSxFQUNaLEdBQUcsRUFBRSxDQUFDLEVBQ04sS0FBSyxFQUFFLENBQUMsRUFDUixPQUFPLEVBQUUsSUFBSSxHQWNkOztBQXBCRCxBQU9FLGNBUFksQ0FPWixFQUFFLENBQUEsRUFDQSxNQUFNLEVBQUUsSUFBSSxFQUNaLFVBQVUsRUFBRSxLQUFLLEVBQ2pCLFlBQVksRUFBRSxJQUFJLEdBU25COztBQW5CSCxBQVdJLGNBWFUsQ0FPWixFQUFFLENBSUEsQ0FBQyxDQUFBLEVBQ0MsS0FBSyxFQUFFLElBQUksR0FNWjs7QUFsQkwsQUFjUSxjQWRNLENBT1osRUFBRSxDQUlBLENBQUMsQUFFRSxNQUFNLEFBQ0osT0FBTyxDQUFBLEVBQ04sT0FBTyxFQUFFLEdBQUcsR0FDYiJ9 */ +.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; } + +/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGhlbWUuY3NzIiwic291cmNlcyI6WyJ0aGVtZS5zY3NzIiwibWl4aW5zL19mb250cy5zY3NzIiwibWl4aW5zL192YXJpYWJsZS5zY3NzIiwidGhlbWUvX3R5cG9ncmFwaHkuc2NzcyIsInRoZW1lL19oZWFkZXIuc2NzcyIsInRoZW1lL19zdGFydC5zY3NzIiwidGhlbWUvX3NpZGViYXIuc2NzcyJdLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3JlIHZhcmlhYmxlcyBhbmQgbWl4aW5zXG5AaW1wb3J0ICdtaXhpbnMvX2ZvbnRzJztcbkBpbXBvcnQgJ21peGlucy9fdmFyaWFibGUnO1xuXG5AaW1wb3J0ICd0aGVtZS90eXBvZ3JhcGh5JztcblxuQGltcG9ydCAndGhlbWUvaGVhZGVyJztcbkBpbXBvcnQgJ3RoZW1lL3N0YXJ0JztcbkBpbXBvcnQgJ3RoZW1lL3NpZGViYXInO1xuLy8gQGltcG9ydCAndGhlbWUvbWVudSc7XG4vLyBAaW1wb3J0ICd0aGVtZS9mb290ZXInO1xuLy9cbi8vIC8vIEV4dHJhIFNrZWxldG9uIFN0eWxpbmdcbi8vIEBpbXBvcnQgJ3RoZW1lL2Jsb2cnO1xuLy8gQGltcG9ydCAndGhlbWUvb25lcGFnZSc7XG4iLCIvLyBGb250IEZhbWlseVxuJGZvbnQtZmFtaWx5LWRlZmF1bHQ6ICBcdFx0XHRcIlJhbGV3YXlcIiwgXCJIZWx2ZXRpY2FcIiwgXCJUYWhvbWFcIiwgXCJHZW5ldmFcIiwgXCJBcmlhbFwiLCBzYW5zLXNlcmlmO1xuJGZvbnQtZmFtaWx5LWhlYWRlcjogIFx0XHRcdFwiTW9udHNlcnJhdFwiLCBcIkhlbHZldGljYVwiLCBcIlRhaG9tYVwiLCBcIkdlbmV2YVwiLCBcIkFyaWFsXCIsIHNhbnMtc2VyaWY7XG4kZm9udC1mYW1pbHktbW9ubzogXHRcdFx0XHRcIkluY29uc29sYXRhXCIsIG1vbm9zcGFjZTtcbiRmb250LWZhbWlseS1zZXJpZjpcdFx0XHRcdFwiR2VvcmdpYVwiLCBcIlRpbWVzXCIsIFwiVGltZXMgTmV3IFJvbWFuXCIsIHNlcmlmO1xuLy8gQGZvbnQtZmFjZVxuXG4kUmVndWxhcjogXCJNb250c2VycmF0LVJlZ3VsYXJcIjtcbiRmYW1pbHk6IFwibW9udHNlcnJhdFwiO1xuJGZpbGUtcmVndWxhcjogXCJNb250c2VycmF0LVJlZ3VsYXJcIjtcbiRjYXRlZ29yeTogXCJzYW5zLXNlcmlmXCI7XG5cbkBtaXhpbiBmb250LWZhY2UoJFJlZ3VsYXIsICRmaWxlLXJlZ3VsYXIsICRmYW1pbHksICRjYXRlZ29yeTpcIlwiKSB7XG4gICAgJGZpbGVwYXRoOiBcIi4uL2ZvbnRzL1wiICsgJGZhbWlseSArIFwiL1wiICsgJGZpbGUtcmVndWxhcjtcbiAgICBAZm9udC1mYWNlIHtcbiAgICAgICAgZm9udC1mYW1pbHk6IFwiI3skUmVndWxhcn1cIjtcbiAgICAgICAgc3JjOiB1cmwoJGZpbGVwYXRoICsgXCIuZW90XCIpO1xuICAgICAgICBzcmM6IHVybCgkZmlsZXBhdGggKyBcIi5lb3Q/I2llZml4XCIpIGZvcm1hdCgnZW1iZWRkZWQtb3BlbnR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLndvZmZcIikgZm9ybWF0KCd3b2ZmJyksXG4gICAgICAgICAgICAgIHVybCgkZmlsZXBhdGggKyBcIi50dGZcIikgIGZvcm1hdCgndHJ1ZXR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLnN2ZyNcIiArICRSZWd1bGFyICsgXCJcIikgZm9ybWF0KCdzdmcnKTtcbiAgICB9XG5cbiAgICAlI3skUmVndWxhcn0ge1xuICAgICAgICBmb250OiB7XG4gICAgICAgICAgICBAaWYgJGNhdGVnb3J5ICE9IFwiXCIge1xuICAgICAgICAgICAgICAgIGZhbWlseTogXCIjeyRSZWd1bGFyfVwiLCAjeyRjYXRlZ29yeX07XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBAZWxzZSB7XG4gICAgICAgICAgICAgICAgZmFtaWx5OiBcIiN7JFJlZ3VsYXJ9XCI7XG4gICAgICAgICAgICAgICAgd2VpZ2h0OiBub3JtYWw7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICB9XG59XG5cbiRNZWRpdW06IFwiTW9udHNlcnJhdC1tZWRpdW1cIjtcbiRmaWxlLU1lZGl1bTogXCJNb250c2VycmF0LU1lZGl1bVwiO1xuXG5AbWl4aW4gZm9udC1mYWNlKCRNZWRpdW0sICRmaWxlLU1lZGl1bSwgJGZhbWlseSwgJGNhdGVnb3J5OlwiXCIpIHtcbiAgICAkZmlsZXBhdGg6IFwiLi4vZm9udHMvXCIgKyAkZmFtaWx5ICsgXCIvXCIgKyAkZmlsZS1NZWRpdW07XG4gICAgQGZvbnQtZmFjZSB7XG4gICAgICAgIGZvbnQtZmFtaWx5OiBcIiN7JE1lZGl1bX1cIjtcbiAgICAgICAgc3JjOiB1cmwoJGZpbGVwYXRoICsgXCIuZW90XCIpO1xuICAgICAgICBzcmM6IHVybCgkZmlsZXBhdGggKyBcIi5lb3Q/I2llZml4XCIpIGZvcm1hdCgnZW1iZWRkZWQtb3BlbnR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLndvZmZcIikgZm9ybWF0KCd3b2ZmJyksXG4gICAgICAgICAgICAgIHVybCgkZmlsZXBhdGggKyBcIi50dGZcIikgIGZvcm1hdCgndHJ1ZXR5cGUnKSxcbiAgICAgICAgICAgICAgdXJsKCRmaWxlcGF0aCArIFwiLnN2ZyNcIiArICRNZWRpdW0gKyBcIlwiKSBmb3JtYXQoJ3N2ZycpO1xuICAgIH1cblxuICAgICUjeyRNZWRpdW19IHtcbiAgICAgICAgZm9udDoge1xuICAgICAgICAgICAgQGlmICRjYXRlZ29yeSAhPSBcIlwiIHtcbiAgICAgICAgICAgICAgICBmYW1pbHk6IFwiI3skTWVkaXVtfVwiLCAjeyRjYXRlZ29yeX07XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBAZWxzZSB7XG4gICAgICAgICAgICAgICAgZmFtaWx5OiBcIiN7JE1lZGl1bX1cIjtcbiAgICAgICAgICAgICAgICB3ZWlnaHQ6IG5vcm1hbDtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgIH1cbn1cbiIsIkBpbmNsdWRlIGZvbnQtZmFjZSgkUmVndWxhciwgJGZpbGUtcmVndWxhciwgJGZhbWlseSwgJGNhdGVnb3J5KTsvLzFcbkBpbmNsdWRlIGZvbnQtZmFjZSgkTWVkaXVtLCAkZmlsZS1NZWRpdW0sICRmYW1pbHksICRjYXRlZ29yeSk7Ly8xXG4iLCJoMSwgaDIsIGgzLCBwLCB1bCwgbGksIGF7XG4gIGZvbnQtZmFtaWx5OiAnTW9udHNlcnJhdC1SZWd1bGFyJztcbiAgZm9udC13ZWlnaHQ6IG5vcm1hbDtcbn1cblxuaDF7XG4gIGZvbnQtc2l6ZTogMS4ycmVtIWltcG9ydGFudDtcbn1cblxucHtcbiAgZm9udC1mYW1pbHk6ICdNb250c2VycmF0LU1lZGl1bSchaW1wb3J0YW50O1xuICBmb250LXNpemU6IDhyZW07XG4gIGxpbmUtaGVpZ2h0OiA4cmVtO1xufVxuXG51bHtcbiAgZm9udC1zaXplOiAwLjhyZW07XG4gIGxpbmUtaGVpZ2h0OiAxLjJyZW07XG59XG4iLCJIZWFkZXJ7XG4gIHBvc2l0aW9uOiBmaXhlZDtcbiAgdG9wOiAwO1xuICBoMXtcbiAgICBtYXJnaW46IDMwcHggMCAwIDMwcHg7XG4gIH1cbn1cbiIsIiNzdGFydHtcbiAgd2lkdGg6IDcwJTtcbiAgbWFyZ2luOiBhdXRvIGF1dG8gYXV0byAxMCU7XG59XG4iLCIuc2lkZWJhci1yaWdodHtcbiAgcG9zaXRpb246IGZpeGVkO1xuICB3aWR0aDogMjAlO1xuICBoZWlnaHQ6IDEwMCU7XG4gIHRvcDogMDtcbiAgcmlnaHQ6IDA7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIHVse1xuICAgIG1hcmdpbjogYXV0bztcbiAgICB0ZXh0LWFsaWduOiByaWdodDtcbiAgICBtYXJnaW4tcmlnaHQ6IDIwcHg7XG4gICAgYXtcbiAgICAgIGNvbG9yOiBncmV5O1xuICAgICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgICAgJjpob3ZlcntcbiAgICAgICAgbGl7XG4gICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgICAgICAgICY6OmFmdGVye1xuICAgICAgICAgICAgY29udGVudDogXCIgXCI7XG4gICAgICAgICAgICB0b3A6IDdweDtcbiAgICAgICAgICAgIHJpZ2h0OiAtMTNweDtcbiAgICAgICAgICAgIGRpc3BsYXk6IGJsb2NrO1xuICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlO1xuICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JleTtcbiAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6IDVweDtcbiAgICAgICAgICAgIHdpZHRoOiA3cHg7XG4gICAgICAgICAgICBoZWlnaHQ6IDdweDtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH1cbn1cbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUN5Q0ksVUFBVSxHQUNOLFdBQVcsRUFBRSxvQkFBWSxFQUN6QixHQUFHLEVBQUUsaURBQXVCLEVBQzVCLEdBQUcsRUFBRSx3REFBOEIsQ0FBQywyQkFBMkIsRUFDekQsa0RBQXdCLENBQUMsY0FBYyxFQUN2QyxpREFBdUIsQ0FBRSxrQkFBa0IsRUFDM0Msb0VBQXVDLENBQUMsYUFBYTs7QUFOL0QsVUFBVSxHQUNOLFdBQVcsRUFBRSxtQkFBWSxFQUN6QixHQUFHLEVBQUUsZ0RBQXVCLEVBQzVCLEdBQUcsRUFBRSx1REFBOEIsQ0FBQywyQkFBMkIsRUFDekQsaURBQXdCLENBQUMsY0FBYyxFQUN2QyxnREFBdUIsQ0FBRSxrQkFBa0IsRUFDM0Msa0VBQXVDLENBQUMsYUFBYTs7QUUvQ25FLEFBQUEsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBLEVBQ3RCLFdBQVcsRUFBRSxvQkFBb0IsRUFDakMsV0FBVyxFQUFFLE1BQU0sR0FDcEI7O0FBRUQsQUFBQSxFQUFFLENBQUEsRUFDQSxTQUFTLEVBQUUsTUFBTSxDQUFBLFVBQVUsR0FDNUI7O0FBRUQsQUFBQSxDQUFDLENBQUEsRUFDQyxXQUFXLEVBQUUsbUJBQW1CLENBQUEsVUFBVSxFQUMxQyxTQUFTLEVBQUUsSUFBSSxFQUNmLFdBQVcsRUFBRSxJQUFJLEdBQ2xCOztBQUVELEFBQUEsRUFBRSxDQUFBLEVBQ0EsU0FBUyxFQUFFLE1BQU0sRUFDakIsV0FBVyxFQUFFLE1BQU0sR0FDcEI7O0FDbEJELEFBQUEsTUFBTSxDQUFBLEVBQ0osUUFBUSxFQUFFLEtBQUssRUFDZixHQUFHLEVBQUUsQ0FBQyxHQUlQOztBQU5ELEFBR0UsTUFISSxDQUdKLEVBQUUsQ0FBQSxFQUNBLE1BQU0sRUFBRSxhQUFhLEdBQ3RCOztBQ0xILEFBQUEsTUFBTSxDQUFBLEVBQ0osS0FBSyxFQUFFLEdBQUcsRUFDVixNQUFNLEVBQUUsa0JBQWtCLEdBQzNCOztBQ0hELEFBQUEsY0FBYyxDQUFBLEVBQ1osUUFBUSxFQUFFLEtBQUssRUFDZixLQUFLLEVBQUUsR0FBRyxFQUNWLE1BQU0sRUFBRSxJQUFJLEVBQ1osR0FBRyxFQUFFLENBQUMsRUFDTixLQUFLLEVBQUUsQ0FBQyxFQUNSLE9BQU8sRUFBRSxJQUFJLEdBMEJkOztBQWhDRCxBQU9FLGNBUFksQ0FPWixFQUFFLENBQUEsRUFDQSxNQUFNLEVBQUUsSUFBSSxFQUNaLFVBQVUsRUFBRSxLQUFLLEVBQ2pCLFlBQVksRUFBRSxJQUFJLEdBcUJuQjs7QUEvQkgsQUFXSSxjQVhVLENBT1osRUFBRSxDQUlBLENBQUMsQ0FBQSxFQUNDLEtBQUssRUFBRSxJQUFJLEVBQ1gsUUFBUSxFQUFFLFFBQVEsR0FpQm5COztBQTlCTCxBQWVRLGNBZk0sQ0FPWixFQUFFLENBSUEsQ0FBQyxBQUdFLE1BQU0sQ0FDTCxFQUFFLENBQUEsRUFDQSxRQUFRLEVBQUUsUUFBUSxHQVluQjs7QUE1QlQsQUFpQlUsY0FqQkksQ0FPWixFQUFFLENBSUEsQ0FBQyxBQUdFLE1BQU0sQ0FDTCxFQUFFLEFBRUMsT0FBTyxDQUFBLEVBQ04sT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsR0FBRyxFQUNSLEtBQUssRUFBRSxLQUFLLEVBQ1osT0FBTyxFQUFFLEtBQUssRUFDZCxRQUFRLEVBQUUsUUFBUSxFQUNsQixnQkFBZ0IsRUFBRSxJQUFJLEVBQ3RCLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLEtBQUssRUFBRSxHQUFHLEVBQ1YsTUFBTSxFQUFFLEdBQUcsR0FDWiJ9 */ diff --git a/user/themes/figureslibres/css-compiled/theme.min.css b/user/themes/figureslibres/css-compiled/theme.min.css index 5450b04..d94ae13 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')}a,h1,h2,h3,li,p,ul{font-family:Montserrat-Regular;font-weight:400}h1{font-size:1.2rem!important}p{font-size:8rem;line-height:8rem}ul{font-size:.8rem;line-height:1.2rem}header{position:fixed;top:0}header h1{margin:30px 0 0 30px}#start{width:70%;margin:auto}.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{color:grey}.sidebar-right ul a:hover::after{content:'D'} \ No newline at end of file +@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')}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;font-size:8rem;line-height:8rem}ul{font-size:.8rem;line-height:1.2rem}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 diff --git a/user/themes/figureslibres/js/script_k.js b/user/themes/figureslibres/js/script_k.js new file mode 100644 index 0000000..4084c05 --- /dev/null +++ b/user/themes/figureslibres/js/script_k.js @@ -0,0 +1,14 @@ +var $Sba = $('.sidebar-right a'); +var $Sbsvg = $('.sidebar-right svg'); + +function addclass() { + $Sba.hover(function() { + $(this).addClass("hover"); + }, function() { + $(this).removeClass("hover"); + }); +} + +jQuery(document).ready(function($){ + addclass(); +}); diff --git a/user/themes/figureslibres/scss/mixins/_fonts.scss b/user/themes/figureslibres/scss/mixins/_fonts.scss index e4525b1..e16fce6 100644 --- a/user/themes/figureslibres/scss/mixins/_fonts.scss +++ b/user/themes/figureslibres/scss/mixins/_fonts.scss @@ -33,3 +33,30 @@ $category: "sans-serif"; } } } + +$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 index 3abb99d..6e04c76 100644 --- a/user/themes/figureslibres/scss/mixins/_variable.scss +++ b/user/themes/figureslibres/scss/mixins/_variable.scss @@ -1 +1,2 @@ @include font-face($Regular, $file-regular, $family, $category);//1 +@include font-face($Medium, $file-Medium, $family, $category);//1 diff --git a/user/themes/figureslibres/scss/theme/_sidebar.scss b/user/themes/figureslibres/scss/theme/_sidebar.scss index e5db03f..f5ad8b1 100644 --- a/user/themes/figureslibres/scss/theme/_sidebar.scss +++ b/user/themes/figureslibres/scss/theme/_sidebar.scss @@ -11,9 +11,21 @@ margin-right: 20px; a{ color: grey; + position: relative; &:hover{ - &::after{ - content: "D"; + li{ + position: relative; + &::after{ + content: " "; + top: 7px; + right: -13px; + display: block; + position: absolute; + background-color: grey; + border-radius: 5px; + width: 7px; + height: 7px; + } } } } diff --git a/user/themes/figureslibres/scss/theme/_start.scss b/user/themes/figureslibres/scss/theme/_start.scss index 534dd91..a93058f 100644 --- a/user/themes/figureslibres/scss/theme/_start.scss +++ b/user/themes/figureslibres/scss/theme/_start.scss @@ -1,4 +1,4 @@ #start{ width: 70%; - margin: auto; + margin: auto auto auto 10%; } diff --git a/user/themes/figureslibres/scss/theme/_typography.scss b/user/themes/figureslibres/scss/theme/_typography.scss index 2dbd5da..24f8d39 100644 --- a/user/themes/figureslibres/scss/theme/_typography.scss +++ b/user/themes/figureslibres/scss/theme/_typography.scss @@ -8,6 +8,7 @@ h1{ } p{ + font-family: 'Montserrat-Medium'!important; font-size: 8rem; line-height: 8rem; } diff --git a/user/themes/figureslibres/templates/blog.html.twig b/user/themes/figureslibres/templates/blog.html.twig index 0f649ac..91926ab 100644 --- a/user/themes/figureslibres/templates/blog.html.twig +++ b/user/themes/figureslibres/templates/blog.html.twig @@ -23,10 +23,8 @@ {% endblock %} {% block body %} -
-
+
- {% embed 'partials/layout.html.twig' with {blog: page} %} {% block item %}
@@ -43,9 +41,6 @@ {% endblock %} - - {% endembed %} -