Permalink
Browse files

Fixes

  • Loading branch information...
1 parent 03e9955 commit 1791563f1a6f6463aef4c56726e9b0408c14b85a @magefad committed Apr 8, 2013
Showing with 5 additions and 4 deletions.
  1. +1 −0 src/assets/packages.php
  2. +4 −4 src/components/Bootstrap.php
@@ -20,6 +20,7 @@
'responsive' => array(
'baseUrl' => $this->enableCdn ? '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/' : $this->_assetsUrl,
'css' => array(YII_DEBUG ? 'bootstrap-responsive.css' : 'bootstrap-responsive.min.css'),
+ 'depends' => array('bootstrap')
),
'font-awesome' => array(
'baseUrl' => $this->enableCdn ? '//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/' : $this->_assetsUrl,
@@ -155,10 +155,10 @@ public function init()
foreach ($this->packages as $name => $definition)
Yii::app()->getClientScript()->addPackage($name, $definition);
- if ($this->coreCss !== false)
- $this->registerAllCss();
- if ($this->enableJS !== false)
- $this->registerAllScripts();
+ if ($this->coreCss !== false)
+ $this->registerAllCss();
+ if ($this->enableJS !== false)
+ $this->registerAllScripts();
parent::init();
}

0 comments on commit 1791563

Please sign in to comment.