From d2bf5d3d51bfe9e6553e018b5287ccd1cf187c56 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 6 Oct 2015 21:39:38 +0100 Subject: [PATCH] Updated the bootstrap component --- sculpin.json | 3 +- sculpin.lock | 104 ++++++++++++++------------------------------------- 2 files changed, 30 insertions(+), 77 deletions(-) diff --git a/sculpin.json b/sculpin.json index 67f2096f..76996c31 100644 --- a/sculpin.json +++ b/sculpin.json @@ -1,10 +1,9 @@ { "require": { - "components/bootstrap": "~2.3.1", + "components/bootstrap": "3.3.5", "components/highlightjs": "~7.3.0", "components/jquery": "~1.9.1", "components/font-awesome": "@stable", - "thomaspark/bootswatch": "@dev", "tsphethean/sculpin-related-posts-bundle": "~0.1.0" }, "config": { diff --git a/sculpin.lock b/sculpin.lock index 8f650372..18096ba6 100644 --- a/sculpin.lock +++ b/sculpin.lock @@ -4,24 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a1dfc1795b5e431b88df331c013308b2", + "hash": "bc137ec0deb008f05a991eea8e785a8c", "packages": [ { "name": "components/bootstrap", - "version": "2.3.2", + "version": "3.3.5", "source": { "type": "git", "url": "https://github.com/components/bootstrap.git", - "reference": "4e517c991623b3bd913e2becd44831b2c9b0be90" + "reference": "d71c2a234c61f53f1109a26ba8155902a51f8ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/components/bootstrap/zipball/4e517c991623b3bd913e2becd44831b2c9b0be90", - "reference": "4e517c991623b3bd913e2becd44831b2c9b0be90", + "url": "https://api.github.com/repos/components/bootstrap/zipball/d71c2a234c61f53f1109a26ba8155902a51f8ca5", + "reference": "d71c2a234c61f53f1109a26ba8155902a51f8ca5", "shasum": "" }, "require": { - "components/jquery": "*" + "components/jquery": ">=1.9.1 <3.0" }, "suggest": { "components/bootstrap-default": "Provide a theme for Bootstrap as components/bootstrap only provides the CSS as file assets" @@ -33,9 +33,12 @@ "js/bootstrap.js" ], "files": [ - "js/bootstrap.min.js", + "js/*.js", "css/*.css", - "img/*.png" + "css/*.map", + "fonts/*", + "less/mixins/*.less", + "less/*.less" ], "shim": { "deps": [ @@ -46,20 +49,30 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ { - "name": "Twitter, Inc" + "name": "Jacob Thornton", + "email": "jacobthornton@gmail.com" + }, + { + "name": "Mark Otto", + "email": "markdotto@gmail.com" } ], - "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", - "homepage": "http://twitter.github.com/bootstrap/", + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "homepage": "http://getbootstrap.com", "keywords": [ - "bootstrap", - "css" + "css", + "framework", + "front-end", + "less", + "mobile-first", + "responsive", + "web" ], - "time": "2013-07-18 20:01:48" + "time": "2015-06-17 06:08:09" }, { "name": "components/font-awesome", @@ -314,64 +327,6 @@ "description": "Allows installation of Components via Composer.", "time": "2015-08-10 12:35:38" }, - { - "name": "thomaspark/bootswatch", - "version": "v3.3.5+3", - "source": { - "type": "git", - "url": "https://github.com/thomaspark/bootswatch.git", - "reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thomaspark/bootswatch/zipball/913f54b9483b99fa12c7feccfa18ee5cc0206043", - "reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043", - "shasum": "" - }, - "suggest": { - "robloach/component-installer": "Allows installation of Components via Composer" - }, - "type": "component", - "extra": { - "component": { - "name": "bootswatch", - "files": [ - "README.md", - "LICENSE", - "amelia/*", - "cerulean/*", - "cosmo/*", - "cyborg/*", - "darkly/*", - "flatly/*", - "fonts/*", - "journal/*", - "lumen/*", - "paper/*", - "readable/*", - "sandstone/*", - "simplex/*", - "slate/*", - "spacelab/*", - "superhero/*", - "united/*", - "yeti/*" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "thomaspark", - "email": "thomas@bootswatch.com" - } - ], - "description": "Themes for Bootstrap", - "time": "2015-09-03 20:39:50" - }, { "name": "tsphethean/sculpin-related-posts-bundle", "version": "0.1.0", @@ -422,8 +377,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "components/font-awesome": 0, - "thomaspark/bootswatch": 20 + "components/font-awesome": 0 }, "prefer-stable": false, "prefer-lowest": false,