From 4cd994a1dffca808d7fd9fee708fc7f4c45e9864 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 3 Nov 2013 01:04:05 -0400 Subject: [PATCH] using external bootstrap assets. --- extensions/bootstrap/BootstrapAsset.php | 2 +- extensions/bootstrap/BootstrapPluginAsset.php | 2 +- extensions/bootstrap/BootstrapThemeAsset.php | 2 +- extensions/bootstrap/composer.json | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/bootstrap/BootstrapAsset.php b/extensions/bootstrap/BootstrapAsset.php index 05601c6..4a8fda5 100644 --- a/extensions/bootstrap/BootstrapAsset.php +++ b/extensions/bootstrap/BootstrapAsset.php @@ -15,7 +15,7 @@ use yii\web\AssetBundle; */ class BootstrapAsset extends AssetBundle { - public $sourcePath = '@yii/bootstrap/assets'; + public $sourcePath = '@vendor/twitter/bootstrap/dist'; public $css = [ 'css/bootstrap.css', ]; diff --git a/extensions/bootstrap/BootstrapPluginAsset.php b/extensions/bootstrap/BootstrapPluginAsset.php index e291ac0..0026e8e 100644 --- a/extensions/bootstrap/BootstrapPluginAsset.php +++ b/extensions/bootstrap/BootstrapPluginAsset.php @@ -16,7 +16,7 @@ use yii\web\AssetBundle; */ class BootstrapPluginAsset extends AssetBundle { - public $sourcePath = '@yii/bootstrap/assets'; + public $sourcePath = '@vendor/twitter/bootstrap/dist'; public $js = [ 'js/bootstrap.js', ]; diff --git a/extensions/bootstrap/BootstrapThemeAsset.php b/extensions/bootstrap/BootstrapThemeAsset.php index 81cc921..1837c54 100644 --- a/extensions/bootstrap/BootstrapThemeAsset.php +++ b/extensions/bootstrap/BootstrapThemeAsset.php @@ -17,7 +17,7 @@ use yii\web\AssetBundle; */ class BootstrapThemeAsset extends AssetBundle { - public $sourcePath = '@yii/bootstrap/assets'; + public $sourcePath = '@vendor/twitter/bootstrap/dist'; public $css = [ 'css/bootstrap-theme.css', ]; diff --git a/extensions/bootstrap/composer.json b/extensions/bootstrap/composer.json index 2d75482..88d8fe8 100644 --- a/extensions/bootstrap/composer.json +++ b/extensions/bootstrap/composer.json @@ -13,7 +13,8 @@ }, "minimum-stability": "dev", "require": { - "yiisoft/yii2": "*" + "yiisoft/yii2": "*", + "twitter/bootstrap": "3.0.*" }, "autoload": { "psr-0": { "yii\\bootstrap\\": "" }