diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 3dc1329..1f49b4d 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -20,7 +20,7 @@ class AppAsset extends AssetBundle public $css = [ 'css/css_header.css', // 'css/comments.css', -// 'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext', + 'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext', ]; public $js = [ diff --git a/frontend/assets/CSSAsset.php b/frontend/assets/CSSAsset.php deleted file mode 100644 index 40a5abb..0000000 --- a/frontend/assets/CSSAsset.php +++ /dev/null @@ -1,30 +0,0 @@ - - * @since 2.0 - */ - class CssAsset extends AssetBundle - { - public $basePath = '@webroot'; - public $baseUrl = '@web'; - public $css = [ - 'css/comments.css', - 'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext', - ]; - } diff --git a/frontend/assets/Css1Asset.php b/frontend/assets/Css1Asset.php new file mode 100644 index 0000000..857d6d7 --- /dev/null +++ b/frontend/assets/Css1Asset.php @@ -0,0 +1,29 @@ + + * @since 2.0 + */ + class Css1Asset extends AssetBundle + { + public $basePath = '@webroot'; + public $baseUrl = '@web'; + public $css = [ + 'css/comments.css', + ]; + } diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index b952dbe..e4ef14f 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -6,6 +6,7 @@ use common\models\Articles; use common\models\Basket; use frontend\assets\AppAsset; + use frontend\assets\Css1Asset; use yii\helpers\Html; use yii\helpers\Url; use yii\web\View; @@ -15,6 +16,7 @@ use frontend\widgets\AssetWidget; AppAsset::register($this); + Css1Asset::register($this); ?> beginPage() ?> @@ -620,24 +622,8 @@ echo AssetWidget::widget( [ 'assets' => [ - 'all', - 'sersid\owlcarousel\Asset', - ], - ] - ); - - echo AssetWidget::widget( - [ - 'assets' => [ - 'all', - 'frontend\assets\CssAsset', - ], - ] - ); - echo AssetWidget::widget( - [ - 'assets' => [ - 'all', + // 'sersid\owlcarousel\Asset', + 'frontend\assets\Css1Asset', 'frontend\assets\FlipclockAsset', ], ] diff --git a/frontend/widgets/AssetWidget.php b/frontend/widgets/AssetWidget.php index 22c136e..0cd4cfb 100644 --- a/frontend/widgets/AssetWidget.php +++ b/frontend/widgets/AssetWidget.php @@ -37,6 +37,13 @@ */ $bundle = $bundles[$asset]; foreach ($bundle->css as $item) { + if(isset((new $asset)->sourcePath)){ + $QQQ = \Yii::$app->assetManager->publish( + (new $asset)->sourcePath."/".$item, + [] + ); + $item = $QQQ[1]; // [0] - full path, [1] - /assets/... + } echo Html::cssFile($item); } $bundle->css = []; -- libgit2 0.21.4