Added bootstrap bundles.

apps/bootstrap/composer.json

@@ -15,9 +15,6 @@
 	"config": {
 		"vendor-dir": "vendor"
 	},
-	"bin": [
-		"yii"
-	],
 	"minimum-stability": "dev",
 	"repositories": [
 		{

apps/bootstrap/config/assets.php

@@ -5,8 +5,6 @@ return array(
 		'basePath' => '@wwwroot',
 		'baseUrl' => '@www',
 		'css' => array(
-			'css/bootstrap.min.css',
-			'css/bootstrap-responsive.min.css',
 			'css/site.css',
 		),
 		'js' => array(
@@ -14,6 +12,7 @@ return array(
 		),
 		'depends' => array(
 			'yii',
+			'twitter/bootstrap-responsive',
 		),
 	),
 );

yii/assets.php

@@ -42,6 +42,23 @@ return array(
 		),
 		'depends' => array('yii'),
 	),
+	'twitter/bootstrap' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'css' => array(
+			'bootstrap/css/bootstrap.css',
+		),
+		'js' => array(
+			'bootstrap/js/bootstrap.js',
+		),
+		'depends' => array('jquery'),
+	),
+	'twitter/bootstrap-responsive' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'css' => array(
+			'bootstrap/css/bootstrap-responsive.css',
+		),
+		'depends' => array('bootstrap'),
+	),
 	'punycode' => array(
 		'sourcePath' => __DIR__ . '/vendor/bestiejs/punycode.js',
 		'js' => array(