From 39009a2352c6965753c968fd8598da28d45d2120 Mon Sep 17 00:00:00 2001 From: Felix Kopp <felix-source@phorax.com> Date: Mon, 8 Sep 2014 22:17:13 +0200 Subject: [PATCH] [FEATURE] Bring twbs & fontawesome via composer Brings Bootstrap 3.2 and FontAwesome 4.2 dependency for require-dev. Resolves: #61454 Releases: 6.3 Change-Id: I07e9258eecdef509825c6122096ff2f1c5e7fca7 Reviewed-on: http://review.typo3.org/32656 Reviewed-by: Thomas Maroschik <tmaroschik@dfau.de> Tested-by: Thomas Maroschik <tmaroschik@dfau.de> Reviewed-by: Nicole Cordes <typo3@cordes.co> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Markus Klein <klein.t3@reelworx.at> Reviewed-by: Jo Hasenau <info@cybercraft.de> Tested-by: Jo Hasenau <info@cybercraft.de> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cefaea5dc546..2586420084cc 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,9 @@ }, "require-dev": { "mikey179/vfsStream": "1.3.*@dev", - "phpunit/phpunit": "~4.1.0" + "phpunit/phpunit": "~4.1.0", + "twbs/bootstrap": "3.2.*", + "fortawesome/font-awesome": "4.2.*" }, "suggest": { "ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images", -- GitLab