diff --git a/styleguide/composer.json b/styleguide/composer.json index a655b429d..c67ddc351 100644 --- a/styleguide/composer.json +++ b/styleguide/composer.json @@ -13,6 +13,8 @@ "role": "Lead Developer" } ], + "minimum-stability": "dev", + "prefer-stable": false, "support": { "issues": "https://github.com/pattern-lab/patternlab-php/issues", "wiki": "http://patternlab.io/docs/", @@ -25,9 +27,13 @@ }, "require": { "php": ">=5.4", - "pattern-lab/core": "^2.0.0", - "pattern-lab/patternengine-twig": "^2.0.0", - "pattern-lab/styleguidekit-twig-default": "^3.0.0" + "pattern-lab/core": "dev-dev#c976fa4cbffac7a67c41df43f47899d09a965a49", + "pattern-lab/patternengine-twig": "dev-dev", + "pattern-lab/styleguidekit-twig-default": "dev-dev" + }, + "repository": { + "type": "vcs", + "url": "https://github.com/pattern-lab/patternlab-php-core/commit/c976fa4cbffac7a67c41df43f47899d09a965a49" }, "scripts": { "post-install-cmd": [ diff --git a/styleguide/composer.lock b/styleguide/composer.lock index 628cef7a2..26d72940b 100644 --- a/styleguide/composer.lock +++ b/styleguide/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2db9c997c50187f5fbfbaf9ced529d63", - "content-hash": "8af9120786d6781ebb176d6aa67e0a02", + "content-hash": "13c6bb01cca22ad46a2367a4f7b06b56", "packages": [ { "name": "alchemy/zippy", @@ -67,32 +66,33 @@ "tar", "zip" ], - "time": "2016-02-15 22:46:40" + "time": "2016-02-15T22:46:40+00:00" }, { "name": "doctrine/collections", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "doctrine/coding-standard": "~0.1@dev", + "phpunit/phpunit": "^5.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -133,7 +133,7 @@ "collections", "iterator" ], - "time": "2015-04-14 22:21:58" + "time": "2017-01-03T10:49:41+00:00" }, { "name": "kevinlebrun/colors.php", @@ -184,7 +184,7 @@ "console", "shell" ], - "time": "2016-04-12 20:58:34" + "time": "2016-04-12T20:58:34+00:00" }, { "name": "michelf/php-markdown", @@ -235,20 +235,20 @@ "keywords": [ "markdown" ], - "time": "2016-10-29 18:58:20" + "time": "2016-10-29T18:58:20+00:00" }, { "name": "pattern-lab/core", - "version": "v2.7.0", + "version": "dev-dev", "source": { "type": "git", "url": "https://github.com/pattern-lab/patternlab-php-core.git", - "reference": "e1c0509f06bf959b242c5807c2c624833693c7ee" + "reference": "c976fa4cbffac7a67c41df43f47899d09a965a49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pattern-lab/patternlab-php-core/zipball/e1c0509f06bf959b242c5807c2c624833693c7ee", - "reference": "e1c0509f06bf959b242c5807c2c624833693c7ee", + "url": "https://api.github.com/repos/pattern-lab/patternlab-php-core/zipball/c976fa4cbffac7a67c41df43f47899d09a965a49", + "reference": "c976fa4cbffac7a67c41df43f47899d09a965a49", "shasum": "" }, "require": { @@ -296,24 +296,24 @@ "style guide", "styleguide" ], - "time": "2016-07-22 03:00:05" + "time": "2016-07-28 21:12:01" }, { "name": "pattern-lab/patternengine-twig", - "version": "v2.1.2", + "version": "dev-dev", "source": { "type": "git", "url": "https://github.com/pattern-lab/patternengine-php-twig.git", - "reference": "65324c72d2fb3a10cb25bbd65ce08a89fefc5896" + "reference": "4490358bc354a4201f00982fedda641aa507e94a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pattern-lab/patternengine-php-twig/zipball/65324c72d2fb3a10cb25bbd65ce08a89fefc5896", - "reference": "65324c72d2fb3a10cb25bbd65ce08a89fefc5896", + "url": "https://api.github.com/repos/pattern-lab/patternengine-php-twig/zipball/4490358bc354a4201f00982fedda641aa507e94a", + "reference": "4490358bc354a4201f00982fedda641aa507e94a", "shasum": "" }, "require": { - "pattern-lab/core": "^2.0.0", + "pattern-lab/core": "dev-dev", "twig/twig": "~1.0" }, "type": "patternlab-patternengine", @@ -359,20 +359,20 @@ "pattern lab", "twig" ], - "time": "2016-10-12 21:51:54" + "time": "2016-05-19 03:09:58" }, { "name": "pattern-lab/styleguidekit-assets-default", - "version": "v3.3.1", + "version": "dev-dev", "source": { "type": "git", "url": "https://github.com/pattern-lab/styleguidekit-assets-default.git", - "reference": "3a07281ffef6abf8632227c58edbc0b17aaf1a82" + "reference": "f49ad46ded4d01976b4784dfef83fbc47ebfcbe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pattern-lab/styleguidekit-assets-default/zipball/3a07281ffef6abf8632227c58edbc0b17aaf1a82", - "reference": "3a07281ffef6abf8632227c58edbc0b17aaf1a82", + "url": "https://api.github.com/repos/pattern-lab/styleguidekit-assets-default/zipball/f49ad46ded4d01976b4784dfef83fbc47ebfcbe8", + "reference": "f49ad46ded4d01976b4784dfef83fbc47ebfcbe8", "shasum": "" }, "type": "patternlab-styleguidekit", @@ -418,24 +418,24 @@ "pattern lab", "styleguide" ], - "time": "2016-08-26 13:55:13" + "time": "2016-12-22 15:56:00" }, { "name": "pattern-lab/styleguidekit-twig-default", - "version": "v3.0.0", + "version": "dev-dev", "source": { "type": "git", "url": "https://github.com/pattern-lab/styleguidekit-twig-default.git", - "reference": "7b38bfe2fb60cde3850cfe8f4f948cdc206d7188" + "reference": "b7b56ef93aaf5b2b746a3cba4fbf4b5b86ea6309" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pattern-lab/styleguidekit-twig-default/zipball/7b38bfe2fb60cde3850cfe8f4f948cdc206d7188", - "reference": "7b38bfe2fb60cde3850cfe8f4f948cdc206d7188", + "url": "https://api.github.com/repos/pattern-lab/styleguidekit-twig-default/zipball/b7b56ef93aaf5b2b746a3cba4fbf4b5b86ea6309", + "reference": "b7b56ef93aaf5b2b746a3cba4fbf4b5b86ea6309", "shasum": "" }, "require": { - "pattern-lab/styleguidekit-assets-default": "^3.0.0" + "pattern-lab/styleguidekit-assets-default": "dev-dev" }, "type": "patternlab-styleguidekit", "notification-url": "https://packagist.org/downloads/", @@ -462,7 +462,7 @@ "styleguide", "twig" ], - "time": "2016-07-04 01:24:27" + "time": "2016-07-04 00:47:12" }, { "name": "seld/jsonlint", @@ -508,7 +508,7 @@ "parser", "validator" ], - "time": "2016-11-14 17:59:58" + "time": "2016-11-14T17:59:58+00:00" }, { "name": "shudrum/array-finder", @@ -548,29 +548,32 @@ ], "description": "ArrayFinder component", "homepage": "https://github.com/Shudrum/ArrayFinder", - "time": "2016-02-01 12:23:32" + "time": "2016-02-01T12:23:32+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc" + "reference": "a96f2ef967287e19d294c27c4aea7b2dc8d55371" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/28b0832b2553ffb80cabef6a7a812ff1e670c0bc", - "reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a96f2ef967287e19d294c27c4aea7b2dc8d55371", + "reference": "a96f2ef967287e19d294c27c4aea7b2dc8d55371", "shasum": "" }, "require": { "php": ">=5.5.9" }, + "conflict": { + "symfony/dependency-injection": "<3.3" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/stopwatch": "~2.8|~3.0" }, @@ -581,7 +584,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -608,20 +611,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-10-13 06:28:43" + "time": "2017-02-21 10:07:34" }, { "name": "symfony/filesystem", - "version": "v3.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0565b61bf098cb4dc09f4f103f033138ae4f42c6" + "reference": "5755830b51f2c2f4d9e0b5957b26436f3b507dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0565b61bf098cb4dc09f4f103f033138ae4f42c6", - "reference": "0565b61bf098cb4dc09f4f103f033138ae4f42c6", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/5755830b51f2c2f4d9e0b5957b26436f3b507dce", + "reference": "5755830b51f2c2f4d9e0b5957b26436f3b507dce", "shasum": "" }, "require": { @@ -630,7 +633,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -657,20 +660,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-10-18 04:30:12" + "time": "2017-02-18 17:35:19" }, { "name": "symfony/finder", - "version": "v3.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f" + "reference": "1558dea3daea8ddca57ef2c95745f863ce4b2a1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f", - "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f", + "url": "https://api.github.com/repos/symfony/finder/zipball/1558dea3daea8ddca57ef2c95745f863ce4b2a1e", + "reference": "1558dea3daea8ddca57ef2c95745f863ce4b2a1e", "shasum": "" }, "require": { @@ -679,7 +682,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -706,20 +709,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-09-28 00:11:12" + "time": "2017-02-21 10:07:34" }, { "name": "symfony/process", - "version": "v3.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "66de154ae86b1a07001da9fbffd620206e4faf94" + "reference": "3108b29c21e91d11a0d3f0231ac546f052d25a84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/66de154ae86b1a07001da9fbffd620206e4faf94", - "reference": "66de154ae86b1a07001da9fbffd620206e4faf94", + "url": "https://api.github.com/repos/symfony/process/zipball/3108b29c21e91d11a0d3f0231ac546f052d25a84", + "reference": "3108b29c21e91d11a0d3f0231ac546f052d25a84", "shasum": "" }, "require": { @@ -728,7 +731,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -755,29 +758,35 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-09-29 14:13:09" + "time": "2017-02-21 10:07:34" }, { "name": "symfony/yaml", - "version": "v3.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27" + "reference": "372979f85d2831630f12e794413902f07bce7031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7ff51b06c6c3d5cc6686df69004a42c69df09e27", - "reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27", + "url": "https://api.github.com/repos/symfony/yaml/zipball/372979f85d2831630f12e794413902f07bce7031", + "reference": "372979f85d2831630f12e794413902f07bce7031", "shasum": "" }, "require": { "php": ">=5.5.9" }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -804,33 +813,34 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-10-24 18:41:13" + "time": "2017-02-21 14:51:50" }, { "name": "twig/twig", - "version": "v1.28.1", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "fff80c4a7ae1d47a81dfec10c76cbcb939170b45" + "reference": "bb3f4d61830c3b0bb5aeaefb9a74b56b2f8da74b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/fff80c4a7ae1d47a81dfec10c76cbcb939170b45", - "reference": "fff80c4a7ae1d47a81dfec10c76cbcb939170b45", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/bb3f4d61830c3b0bb5aeaefb9a74b56b2f8da74b", + "reference": "bb3f4d61830c3b0bb5aeaefb9a74b56b2f8da74b", "shasum": "" }, "require": { "php": ">=5.2.7" }, "require-dev": { + "psr/container": "^1.0", "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.28-dev" + "dev-master": "1.32-dev" } }, "autoload": { @@ -865,13 +875,17 @@ "keywords": [ "templating" ], - "time": "2016-11-19 05:52:49" + "time": "2017-02-21 15:46:47" } ], "packages-dev": [], "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], + "minimum-stability": "dev", + "stability-flags": { + "pattern-lab/core": 20, + "pattern-lab/patternengine-twig": 20, + "pattern-lab/styleguidekit-twig-default": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/styleguide/source/assets/js/init.js b/styleguide/source/assets/js/init.js index 363bb5671..239ddbe7a 100755 --- a/styleguide/source/assets/js/init.js +++ b/styleguide/source/assets/js/init.js @@ -5,7 +5,7 @@ $(w).resize(function(){ //Update dimensions on resize sw = document.body.clientWidth; sh = document.body.clientHeight; - + //updateAds(); }); @@ -15,11 +15,11 @@ $(this).toggleClass('active'); $('.nav').toggleClass('active'); }); - + //Navigation toggle $('.nav-toggle-search').click(function(e) { e.preventDefault(); $(this).toggleClass('active'); $('.header .search-form').toggleClass('active'); }); -})(this); \ No newline at end of file +})(this); diff --git a/styleguide/source/assets/js/nav-primary.js b/styleguide/source/assets/js/nav-primary.js index 6df2a8b03..4995a131c 100644 --- a/styleguide/source/assets/js/nav-primary.js +++ b/styleguide/source/assets/js/nav-primary.js @@ -4,7 +4,8 @@ * Copyright 2017 Palantir.net, Inc. */ -$(document).ready(function() { +jQuery.noConflict(); +(function($) { // Mobile Primary navigation functionality. $('.nav-primary_button-menu').click(function () { @@ -12,4 +13,4 @@ $(document).ready(function() { $('.nav-primary').toggleClass('open'); }); -}); \ No newline at end of file +})(jQuery); \ No newline at end of file diff --git a/styleguide/source/assets/js/nav.js b/styleguide/source/assets/js/nav.js index c08ae472c..d5a3ac103 100644 --- a/styleguide/source/assets/js/nav.js +++ b/styleguide/source/assets/js/nav.js @@ -1,4 +1,5 @@ -$(document).ready(function() { +jQuery.noConflict(); +(function($) { // Search // When a user clicks on the ribbon trigger (main) @@ -35,5 +36,4 @@ $(document).ready(function() { $('.ribbon_dropdown_trigger').removeClass('is-active'); $('.ribbon_dropdown_nav').removeClass('is-active').slideUp(300); }); - -}); +})(jQuery); diff --git a/styleguide/source/assets/js/search.js b/styleguide/source/assets/js/search.js index d2b6664e6..2cf15a714 100644 --- a/styleguide/source/assets/js/search.js +++ b/styleguide/source/assets/js/search.js @@ -1,4 +1,5 @@ -$(document).ready(function() { +jQuery.noConflict(); +(function($) { // Search // Check when a user is typing in search @@ -15,4 +16,4 @@ $(document).ready(function() { $(this).siblings('#search-field').removeClass('is-active'); $('#search-field').focus(); }); -}); \ No newline at end of file +})(jQuery); \ No newline at end of file diff --git a/styleguide/source/assets/js/tabs-audience-selector.js b/styleguide/source/assets/js/tabs-audience-selector.js index 778175383..1470393c9 100644 --- a/styleguide/source/assets/js/tabs-audience-selector.js +++ b/styleguide/source/assets/js/tabs-audience-selector.js @@ -1,4 +1,5 @@ -$(document).ready(function() { +jQuery.noConflict(); +(function($) { // Mobile Audience Selector tabs $('.tabs-audience_selector_list').click(function () { @@ -6,4 +7,4 @@ $(document).ready(function() { $(this).toggleClass('open'); }); -}); \ No newline at end of file +})(jQuery); \ No newline at end of file