diff --git a/composer.json b/composer.json index 33e6b31..3d9cb88 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "kriswallsmith/assetic": "1.1.2", "leafo/lessphp": "v0.4.0", "michelf/php-markdown": "1.4.0", - "michelf/php-smartypants": "1.6.0-beta1", + "michelf/php-smartypants": "^1.8", "mustache/mustache": "2.5.1", "phpunit/phpunit": "3.7.*", "squizlabs/php_codesniffer": "1.*", @@ -54,9 +54,11 @@ "symfony/config": "v2.3.4", "symfony/console": "v2.3.4", "symfony/yaml": "v2.3.4", - "twig/twig": "v1.13.2" + "twig/twig": "v1.13.2", + "symfony/event-dispatcher": "^4.0@dev", + "leafo/scssphp": "dev-master" }, "bin": [ "bin/md2resume" ] -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index d1daf05..f72d990 100644 --- a/composer.lock +++ b/composer.lock @@ -1,21 +1,22 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" ], - "hash": "5f42fb6da16a9d26eb5a44694e6123a6", + "content-hash": "5f9145e269eeb92355239d6a43ac2445", "packages": [ { "name": "fabpot/php-cs-fixer", "version": "v0.4.0", "source": { "type": "git", - "url": "https://github.com/fabpot/PHP-CS-Fixer.git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "reference": "ff49782b0d87007ec675216f3677644778489d7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/PHP-CS-Fixer/zipball/ff49782b0d87007ec675216f3677644778489d7a", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ff49782b0d87007ec675216f3677644778489d7a", "reference": "ff49782b0d87007ec675216f3677644778489d7a", "shasum": "" }, @@ -51,7 +52,8 @@ } ], "description": "A script to automatically fix Symfony Coding Standard", - "time": "2014-01-07 09:13:46" + "abandoned": "friendsofphp/php-cs-fixer", + "time": "2014-01-07T09:13:46+00:00" }, { "name": "indeyets/pake", @@ -117,7 +119,7 @@ "build", "task" ], - "time": "2013-11-04 08:29:46" + "time": "2013-11-04T08:29:46+00:00" }, { "name": "kriswallsmith/assetic", @@ -188,7 +190,7 @@ "compression", "minification" ], - "time": "2013-07-19 00:03:27" + "time": "2013-07-19T00:03:27+00:00" }, { "name": "leafo/lessphp", @@ -229,7 +231,59 @@ ], "description": "lessphp is a compiler for LESS written in PHP.", "homepage": "http://leafo.net/lessphp/", - "time": "2013-08-09 17:09:19" + "time": "2013-08-09T17:09:19+00:00" + }, + { + "name": "leafo/scssphp", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/leafo/scssphp.git", + "reference": "942c61055d53a893f79a7d34261d609b618a1ced" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/leafo/scssphp/zipball/942c61055d53a893f79a7d34261d609b618a1ced", + "reference": "942c61055d53a893f79a7d34261d609b618a1ced", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "squizlabs/php_codesniffer": "~2.5" + }, + "bin": [ + "bin/pscss" + ], + "type": "library", + "autoload": { + "psr-4": { + "Leafo\\ScssPhp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Leaf Corcoran", + "email": "leafot@gmail.com", + "homepage": "http://leafo.net" + } + ], + "description": "scssphp is a compiler for SCSS written in PHP.", + "homepage": "http://leafo.github.io/scssphp/", + "keywords": [ + "css", + "less", + "sass", + "scss", + "stylesheet" + ], + "time": "2017-08-22 11:20:58" }, { "name": "michelf/php-markdown", @@ -280,31 +334,26 @@ "keywords": [ "markdown" ], - "time": "2013-11-29 17:09:24" + "time": "2013-11-29T17:09:24+00:00" }, { "name": "michelf/php-smartypants", - "version": "1.6.0-beta1", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/michelf/php-smartypants.git", - "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137" + "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/c0465c6d4c5ab853c2fa45df6c10bce7e35cc137", - "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137", + "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", + "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", "shasum": "" }, "require": { "php": ">=5.3.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-lib": "1.6.x-dev" - } - }, "autoload": { "psr-0": { "Michelf": "" @@ -318,16 +367,16 @@ { "name": "Michel Fortin", "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", + "homepage": "https://michelf.ca/", "role": "Developer" }, { "name": "John Gruber", - "homepage": "http://daringfireball.net/" + "homepage": "https://daringfireball.net/" } ], "description": "PHP SmartyPants", - "homepage": "http://michelf.ca/projects/php-smartypants/", + "homepage": "https://michelf.ca/projects/php-smartypants/", "keywords": [ "dashes", "quotes", @@ -335,7 +384,7 @@ "typographer", "typography" ], - "time": "2013-07-31 18:13:10" + "time": "2016-12-13T01:01:17+00:00" }, { "name": "mustache/mustache", @@ -380,7 +429,7 @@ "mustache", "templating" ], - "time": "2014-01-09 00:36:09" + "time": "2014-01-09T00:36:09+00:00" }, { "name": "phpunit/php-code-coverage", @@ -388,19 +437,19 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34" + "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", - "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", + "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", "shasum": "" }, "require": { "php": ">=5.3.3", "phpunit/php-file-iterator": ">=1.3.0@stable", "phpunit/php-text-template": ">=1.2.0@stable", - "phpunit/php-token-stream": ">=1.1.3@stable" + "phpunit/php-token-stream": ">=1.1.3,<1.3.0" }, "require-dev": { "phpunit/phpunit": "3.7.*@dev" @@ -441,35 +490,37 @@ "testing", "xunit" ], - "time": "2014-03-28 10:53:45" + "time": "2014-09-02 10:13:14" }, { "name": "phpunit/php-file-iterator", - "version": "1.3.4", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, "autoload": { "classmap": [ - "File/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -486,20 +537,20 @@ "filesystem", "iterator" ], - "time": "2013-10-10 15:34:57" + "time": "2016-10-03 07:40:28" }, { "name": "phpunit/php-text-template", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { @@ -508,20 +559,17 @@ "type": "library", "autoload": { "classmap": [ - "Text/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -530,35 +578,40 @@ "keywords": [ "template" ], - "time": "2014-01-30 17:20:04" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", - "version": "1.0.5", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + "reference": "d107f347d368dd8a384601398280c7c608390ab7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7", + "reference": "d107f347d368dd8a384601398280c7c608390ab7", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -574,20 +627,20 @@ "keywords": [ "timer" ], - "time": "2013-08-02 07:42:54" + "time": "2017-03-07 15:42:04" }, { "name": "phpunit/php-token-stream", - "version": "dev-master", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "955c24b708f8bfd6a05f303217a8dac3a443d531" + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/955c24b708f8bfd6a05f303217a8dac3a443d531", - "reference": "955c24b708f8bfd6a05f303217a8dac3a443d531", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", "shasum": "" }, "require": { @@ -624,7 +677,7 @@ "keywords": [ "tokenizer" ], - "time": "2014-05-12 05:34:42" + "time": "2014-03-03T05:10:30+00:00" }, { "name": "phpunit/phpunit", @@ -632,12 +685,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc" + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", - "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", "shasum": "" }, "require": { @@ -697,7 +750,7 @@ "testing", "xunit" ], - "time": "2014-04-30 12:24:19" + "time": "2014-10-17 09:04:17" }, { "name": "phpunit/phpunit-mock-objects", @@ -758,16 +811,16 @@ }, { "name": "sebastian/diff", - "version": "dev-master", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "ac84cfdec593945f36f24074d6ea17d296e86f76" + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ac84cfdec593945f36f24074d6ea17d296e86f76", - "reference": "ac84cfdec593945f36f24074d6ea17d296e86f76", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", "shasum": "" }, "require": { @@ -804,20 +857,20 @@ "keywords": [ "diff" ], - "time": "2014-05-12 05:21:40" + "time": "2013-08-03T16:46:33+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "1.5.3", + "version": "1.5.x-dev", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "396178ada8499ec492363587f037125bf7b07fcc" + "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc", - "reference": "396178ada8499ec492363587f037125bf7b07fcc", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6f3e42d311b882b25b4d409d23a289f4d3b803d5", + "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5", "shasum": "" }, "require": { @@ -879,7 +932,7 @@ "phpcs", "standards" ], - "time": "2014-05-01 03:07:07" + "time": "2014-12-04 22:32:15" }, { "name": "sunra/php-simple-html-dom-parser", @@ -922,7 +975,7 @@ "html", "parser" ], - "time": "2013-05-04 14:32:03" + "time": "2013-05-04T14:32:03+00:00" }, { "name": "symfony/config", @@ -930,13 +983,13 @@ "target-dir": "Symfony/Component/Config", "source": { "type": "git", - "url": "https://github.com/symfony/Config.git", - "reference": "65a927c15ca5a911ba2fa277a5457fa8129505b0" + "url": "https://github.com/symfony/config.git", + "reference": "7328240c17a588d9776be503e5d95dfc01c00f0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/65a927c15ca5a911ba2fa277a5457fa8129505b0", - "reference": "65a927c15ca5a911ba2fa277a5457fa8129505b0", + "url": "https://api.github.com/repos/symfony/config/zipball/7328240c17a588d9776be503e5d95dfc01c00f0d", + "reference": "7328240c17a588d9776be503e5d95dfc01c00f0d", "shasum": "" }, "require": { @@ -959,18 +1012,18 @@ "MIT" ], "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2013-08-06 05:49:23" + "time": "2013-08-06T05:49:23+00:00" }, { "name": "symfony/console", @@ -978,12 +1031,12 @@ "target-dir": "Symfony/Component/Console", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", + "url": "https://github.com/symfony/console.git", "reference": "db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3", + "url": "https://api.github.com/repos/symfony/console/zipball/db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3", "reference": "db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3", "shasum": "" }, @@ -1011,6 +1064,69 @@ "license": [ "MIT" ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com", + "time": "2013-08-17T16:34:49+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "65e537f26ab645d14fd7fc4e4e25f0b2ffac6a98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/65e537f26ab645d14fd7fc4e4e25f0b2ffac6a98", + "reference": "65e537f26ab645d14fd7fc4e4e25f0b2ffac6a98", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "authors": [ { "name": "Fabien Potencier", @@ -1018,41 +1134,43 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", - "homepage": "http://symfony.com", - "time": "2013-08-17 16:34:49" + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2017-09-15 10:16:43" }, { "name": "symfony/filesystem", - "version": "dev-master", - "target-dir": "Symfony/Component/Filesystem", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "98e831eac836a0a5911626ce82684155f21d0e4d" + "url": "https://github.com/symfony/filesystem.git", + "reference": "f61591a302ee040551c87a20402f56708a2eae46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/98e831eac836a0a5911626ce82684155f21d0e4d", - "reference": "98e831eac836a0a5911626ce82684155f21d0e4d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/f61591a302ee040551c87a20402f56708a2eae46", + "reference": "f61591a302ee040551c87a20402f56708a2eae46", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Filesystem\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1061,47 +1179,47 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "2014-04-16 10:36:21" + "homepage": "https://symfony.com", + "time": "2017-09-15 09:59:38" }, { "name": "symfony/finder", - "version": "dev-master", - "target-dir": "Symfony/Component/Finder", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Finder.git", - "reference": "1343b576d1401f4a5117cab4e250201ae348143a" + "url": "https://github.com/symfony/finder.git", + "reference": "08e5e22db7955571613a9a3ced2f352752e72615" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/1343b576d1401f4a5117cab4e250201ae348143a", - "reference": "1343b576d1401f4a5117cab4e250201ae348143a", + "url": "https://api.github.com/repos/symfony/finder/zipball/08e5e22db7955571613a9a3ced2f352752e72615", + "reference": "08e5e22db7955571613a9a3ced2f352752e72615", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Finder\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1110,47 +1228,47 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Finder Component", - "homepage": "http://symfony.com", - "time": "2014-05-12 09:28:39" + "homepage": "https://symfony.com", + "time": "2017-09-15 09:59:38" }, { "name": "symfony/process", - "version": "dev-master", - "target-dir": "Symfony/Component/Process", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Process.git", - "reference": "8a3edace8e8aabed8992b993bfc13df3b1e836f2" + "url": "https://github.com/symfony/process.git", + "reference": "2b7d7518fd1ec6ef34da28eb87f30e44daba792d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/8a3edace8e8aabed8992b993bfc13df3b1e836f2", - "reference": "8a3edace8e8aabed8992b993bfc13df3b1e836f2", + "url": "https://api.github.com/repos/symfony/process/zipball/2b7d7518fd1ec6ef34da28eb87f30e44daba792d", + "reference": "2b7d7518fd1ec6ef34da28eb87f30e44daba792d", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Process\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1159,18 +1277,16 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "time": "2014-04-28 05:15:04" + "homepage": "https://symfony.com", + "time": "2017-09-15 09:59:38" }, { "name": "symfony/yaml", @@ -1178,12 +1294,12 @@ "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", + "url": "https://github.com/symfony/yaml.git", "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847", + "url": "https://api.github.com/repos/symfony/yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847", "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847", "shasum": "" }, @@ -1206,30 +1322,30 @@ "MIT" ], "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-08-24 15:26:22" + "time": "2013-08-24T15:26:22+00:00" }, { "name": "twig/twig", "version": "v1.13.2", "source": { "type": "git", - "url": "https://github.com/fabpot/Twig.git", + "url": "https://github.com/twigphp/Twig.git", "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", "shasum": "" }, @@ -1266,23 +1382,18 @@ "keywords": [ "templating" ], - "time": "2013-08-03 15:35:31" + "time": "2013-08-03T15:35:31+00:00" } ], - "packages-dev": [ - - ], - "aliases": [ - - ], + "packages-dev": [], + "aliases": [], "minimum-stability": "dev", - "stability-flags": [ - - ], - "platform": [ - - ], - "platform-dev": [ - - ] + "stability-flags": { + "symfony/event-dispatcher": 20, + "leafo/scssphp": 20 + }, + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] } diff --git a/templates/roboto/css/pdf.css b/templates/roboto/css/pdf.css deleted file mode 100644 index 2abbcb7..0000000 --- a/templates/roboto/css/pdf.css +++ /dev/null @@ -1,114 +0,0 @@ -body.pdf { - color: black; - - a { - text-decoration: none; - color: black; - } - .container { - width: 1000px; - margin: 0 auto; - padding: 0; - background: none; - border: none; - border-width: 8px 0 2px 0; - text-align: left; - } - - .resume { - position:relative; - padding: 40px 80px; - } - - a[href$='.pdf'] { - display: none; - } - - h1 { - letter-spacing: 0; - margin-top: 0; - font-size: 48px; - text-transform: uppercase; - font-weight: normal; - } - h2 { - letter-spacing: 0; - text-transform: uppercase; - font-style: italic; - font-weight: normal; - } - h3 { - float: left; - width: 16%; - font-style: normal; - } - h3+p { - float: left; - width: 84%; - } - - blockquote { - top: 40px; - right: 50px; - position: absolute; - } - - ul { - list-style: none; - } - - ul li { - width: 28%; - float: left; - } - ul dl { - margin: 0; - padding: 0.3em 0 0; - dt { - font-size: 122%; - font-weight: normal; - margin: 0 0 .75em; - } - dd { - padding: 0 4em 0 0; - } - } - - ol { - float: left; - width: 84%; - margin: .7em 0 0; - } - - ol li { - width: 33%; - margin: 0; - } - ol li:nth-child(3n) { - width: 34%; - } - ol li:nth-child(1), ol li:nth-child(2), ol li:nth-child(3) { - border-top: none; - } - - dl { - margin: .7em 0 0; - page-break-inside: avoid !important; - display: block; - width:84%; - float: left; - dt {} - dd { - } - strong { - float: right; - margin-top: -2em; - } - em { - font-size: 130%; - font-style: normal; - } - - } - -} diff --git a/templates/roboto/css/pdf.less b/templates/roboto/css/pdf.less new file mode 100644 index 0000000..65bc234 --- /dev/null +++ b/templates/roboto/css/pdf.less @@ -0,0 +1,96 @@ +body.pdf { + color: black; + + a { + text-decoration: none; + color: black; + + &[href$='.pdf'], + &[href*='github'] { + display: none; + } + } + + .container { + width: 1080px; + margin: 0 auto; + padding: 0; + background: none; + border: 0; + text-align: left; + } + + .resume { + position:relative; + padding: 40px 80px; + } + + h1 { + letter-spacing: 0; + margin-top: 0; + text-transform: uppercase; + font-weight: normal; + } + + h2 { + letter-spacing: 0; + text-transform: uppercase; + font-style: italic; + font-weight: normal; + } + + h3 { + font-style: normal; + + + p { + + } + } + + blockquote { + top: 40px; + right: 50px; + position: absolute; + } + + ul { + } + + ul li { + } + + // ul dl { + // margin: 0; + // padding: 0.3em 0 0; + + // dt { + // font-size: 122%; + // font-weight: normal; + // margin: 0 0 .75em; + // } + + // dd { + // padding: 0 4em 0 0; + // } + // } + + // ol { + // margin: .7em 0 0; + // } + + // ol li { + // margin: 0; + // } + + // dl { + // margin: .7em 0 0; + // page-break-inside: avoid !important; + // display: block; + // // width:90%; + + // em { + // font-size: 130%; + // font-style: normal; + // } + // } +} diff --git a/templates/roboto/css/resume.css b/templates/roboto/css/resume.less similarity index 74% rename from templates/roboto/css/resume.css rename to templates/roboto/css/resume.less index c1c11dd..21d5092 100644 --- a/templates/roboto/css/resume.css +++ b/templates/roboto/css/resume.less @@ -1,5 +1,5 @@ .clearfix { - zoom: 1; + zoom: 1; &:after { display: block; visibility: hidden; @@ -10,12 +10,12 @@ } body { - font: 12px normal 'Hoefler Text', Times New Roman, Times, serif; + /*font: 12px normal 'Hoefler Text', Times New Roman, Times, serif;*/ /*font-family: 'Roboto', sans-serif;*/ color: #444; } h1, h2, h3, h4, ul dl dt { - font-family: Futura, "Century Gothic", AppleGothic, sans-serif; + /*font-family: Futura, "Century Gothic", AppleGothic, sans-serif;*/ } .container { @@ -58,9 +58,9 @@ a[href*='github'] { } } -p { - font-size: 1.2em; -} +/*p { + font-size: 1em; +}*/ blockquote { margin: 0; @@ -80,7 +80,7 @@ hr { margin: 18px auto; width: 100%; clear: both; - border: none; + border: 0; border-top: 1px solid #CCC; font-size: 1px; line-height: 0; @@ -110,13 +110,12 @@ h2 { } h3 { - .drop-shadow(); + border-bottom: 5px solid #000; margin: 0; padding: .25em 0 .25em .3em; font-size: 2em; font-style: italic; font-weight: normal; - border-bottom: 5px solid rgba(0,0,0,.8); } h3+p, @@ -124,8 +123,8 @@ h3~ul { margin: .2em 0 1.2em; padding: 0; display: block; - /*font-size: 1.1em;*/ - line-height: 24px; + font-size: 1em; + line-height: 1.5; } h3~ul { padding-left: 1.5em; @@ -133,28 +132,22 @@ h3~ul { h4 { font-size: 1.5em; -} - -#experience ~ dl { - dt { - float: left; - } - dd { - float: right; - width: 35%; - } + margin: 0; } ul li { margin: 0; padding: 0; - font-size: 1.2em; + /*font-size: 1.2em;*/ } -ul li ul li { - font-size: 1em; - font-style: italic; - margin: 0 0 0 1.5em; +ul, +ol { + li ul li { + font-style: italic; + margin: 0 0 0 1.5em; + width: 80%; + } } ul dl { @@ -162,7 +155,7 @@ ul dl { padding: 0; width: 100%; dt { - font-size: 1em; + /*font-size: 1em;*/ } dd { margin: 0 0 1em; @@ -174,28 +167,29 @@ ul dl { ol { margin: 0; + margin-left: 1em; padding: 0 0 .75em; width: 84%; display: inline-block; } ol li { - margin: 0 0 0 1em; + margin: 0 0 0 .5em; padding: 0; border-top: 1px solid #CCCCCC; width: 100%; /*float: left;*/ - list-style: none; - line-height: 2em; - font-size: 1.1em; + /*list-style: none;*/ + line-height: 1.5em; + font-size: 1em; } ol li:nth-child(1) { - border-top: none; + border-top: 0; } dl { display: inline-block; - width: 90%; + width: 95%; margin: 0; padding: 0; dt { @@ -216,15 +210,41 @@ dl { font-size: 1.2em; margin: .15em 0 .5em; } +} +#experience { + ~ dl { + dt { + float: left; + margin-top: 1em; + } + dd { + float: right; + text-align: right; + width: 45%; + } + } + + ~ p { + width: 85%; + } + + ~ ul { + width: 85%; + } + + ~ ol li { + border: 0; + font-size: 1em; + } } #footer { display: none; -} -#footer + p { - width: 100%; - font-size: 0.8em; - text-align: center; + + p { + width: 100%; + font-size: 0.8em; + text-align: center; + } } diff --git a/templates/roboto/css/screen.css b/templates/roboto/css/screen.css deleted file mode 100644 index 28afff3..0000000 --- a/templates/roboto/css/screen.css +++ /dev/null @@ -1,159 +0,0 @@ - - -/* - Mobile layout - 240–479 px - Zoomed out below 320 px -*/ - -@media screen and (min-width: 15em) { -} - - -/* - Wide mobile layout - 480-767 px - Zoomed in above 480 px -*/ - -@media screen and (min-width: 30em) { -} - - -/* - Tablet layout - 600-911 px - Zoomed in above 600 px -*/ - -@media screen and (min-width: 37.5em) { - body { - padding: 2em 0; - } - blockquote { - top: 10px; - right: 50px; - position: absolute; - } - h1 { /* Open up the top section height so we don't collapse on the blockquote */ - margin-top: .5em; - } - ol { - margin: 0 0 0 1em; - } - ol li { - width: 50%; - margin: 0; - } - ol li:nth-child(1), ol li:nth-child(2) { - border-top: none; - } -} - - -/* - Widescreen layout - 912-1887 px - Zoomed in above 912 px -*/ - -@media screen and (min-width: 57em) { - .container { - width: 912px; - } - .resume { - position:relative; - padding: 40px 50px; - } - blockquote { - top: 40px; - right: 50px; - position: absolute; - } - h1 { - margin-top: 0; - font-size: 48px; - text-transform: uppercase; - letter-spacing: 3px; - font-weight: normal; - } - h2 { - text-transform: uppercase; - font-style: italic; - letter-spacing: 2px; - font-weight: normal; - } - - h3 { - float: left; - width: 16%; - } - - h3+p { - float: left; - width: 84%; - } - - ul li { - width: 28%; - float: left; - } - ul dl { - dt { - font-size: 122%; - font-weight: normal; - margin-bottom: .75em; - } - dd { - padding: 0 4em 0 0; - } - } - - ol { - float: left; - width: 84%; - margin: .6em 0 0; - } - - ol li { - width: 33%; - margin: 0; - } - ol li:nth-child(3n) { - width: 34%; - } - ol li:nth-child(1), ol li:nth-child(2), ol li:nth-child(3) { - border-top: none; - } - - dl { - margin: .5em 0 0; - dt { - } - dd { - } - strong { - float: right; - margin-top: -2em; - } - em { - font-size: 130%; - font-style: normal; - } - - } - - -} - - -/* - Huge-screen layout - 1888-2520 px - Zoomed in above 1920 px -*/ - -@media screen and (min-width: 118em) { - - -} \ No newline at end of file diff --git a/templates/roboto/css/screen.less b/templates/roboto/css/screen.less new file mode 100644 index 0000000..0ca8aa9 --- /dev/null +++ b/templates/roboto/css/screen.less @@ -0,0 +1,159 @@ + + +/* + Mobile layout + 240–479 px + Zoomed out below 320 px +*/ + +@media screen and (min-width: 15em) { +} + + +/* + Wide mobile layout + 480-767 px + Zoomed in above 480 px +*/ + +@media screen and (min-width: 30em) { +} + + +/* + Tablet layout + 600-911 px + Zoomed in above 600 px +*/ + +@media screen and (min-width: 37.5em) { + body { + padding: 2em 0; + } + blockquote { + top: 10px; + right: 50px; + position: absolute; + } + h1 { /* Open up the top section height so we don't collapse on the blockquote */ + margin-top: .5em; + } + ol { + margin: 0 0 0 1em; + } + ol li { + width: 50%; + margin: 0; + } + ol li:nth-child(1), ol li:nth-child(2) { + border-top: none; + } +} + + +/* + Widescreen layout + 912-1887 px + Zoomed in above 912 px +*/ + +/*@media screen and (min-width: 57em) { + .container { + width: 912px; + } + .resume { + position:relative; + padding: 40px 50px; + } + blockquote { + top: 40px; + right: 50px; + position: absolute; + } + h1 { + margin-top: 0; + font-size: 48px; + text-transform: uppercase; + letter-spacing: 3px; + font-weight: normal; + } + h2 { + text-transform: uppercase; + font-style: italic; + letter-spacing: 2px; + font-weight: normal; + } + + h3 { + float: left; + width: 16%; + } + + h3+p { + float: left; + width: 84%; + } + + ul li { + width: 28%; + float: left; + } + ul dl { + dt { + font-size: 122%; + font-weight: normal; + margin-bottom: .75em; + } + dd { + padding: 0 4em 0 0; + } + } + + ol { + float: left; + width: 84%; + margin: .6em 0 0; + } + + ol li { + width: 33%; + margin: 0; + } + ol li:nth-child(3n) { + width: 34%; + } + ol li:nth-child(1), ol li:nth-child(2), ol li:nth-child(3) { + border-top: none; + } + + dl { + margin: .5em 0 0; + dt { + } + dd { + } + strong { + float: right; + margin-top: -2em; + } + em { + font-size: 130%; + font-style: normal; + } + + } + + +}*/ + + +/* + Huge-screen layout + 1888-2520 px + Zoomed in above 1920 px +*/ + +@media screen and (min-width: 118em) { + + +} \ No newline at end of file