Commit a3c00620ef7c44f19b6616c6bc558370f069b930
1 parent
de0f3d55
discard
Showing
3 changed files
with
1 additions
and
44 deletions
Show diff stats
frontend/assets/AppAsset.php
| @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | ||
| 19 | public $baseUrl = '@web'; | 19 | public $baseUrl = '@web'; |
| 20 | public $css = [ | 20 | public $css = [ |
| 21 | 'css/css_header.css', | 21 | 'css/css_header.css', |
| 22 | -// 'css/comments.css', | 22 | + 'css/comments.css', |
| 23 | 'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext', | 23 | 'http://fonts.googleapis.com/css?family=Roboto:400,300,700&subset=latin,cyrillic-ext', |
| 24 | ]; | 24 | ]; |
| 25 | public $js = [ | 25 | public $js = [ |
frontend/assets/Css1Asset.php deleted
| 1 | -<?php | ||
| 2 | - /** | ||
| 3 | - * Created by PhpStorm. | ||
| 4 | - * User: timur | ||
| 5 | - * Date: 19.06.17 | ||
| 6 | - * Time: 14:39 | ||
| 7 | - */ | ||
| 8 | - | ||
| 9 | - /** | ||
| 10 | - * @link http://www.yiiframework.com/ | ||
| 11 | - * @copyright Copyright (c) 2008 Yii Software LLC | ||
| 12 | - * @license http://www.yiiframework.com/license/ | ||
| 13 | - */ | ||
| 14 | - | ||
| 15 | - namespace frontend\assets; | ||
| 16 | - | ||
| 17 | - use yii\web\AssetBundle; | ||
| 18 | - /** | ||
| 19 | - * @author Qiang Xue <qiang.xue@gmail.com> | ||
| 20 | - * @since 2.0 | ||
| 21 | - */ | ||
| 22 | - class Css1Asset extends AssetBundle | ||
| 23 | - { | ||
| 24 | - public $basePath = '@webroot'; | ||
| 25 | - public $baseUrl = '@web'; | ||
| 26 | - public $css = [ | ||
| 27 | - 'css/comments.css', | ||
| 28 | - ]; | ||
| 29 | - } |
frontend/views/layouts/main.php
| @@ -6,7 +6,6 @@ | @@ -6,7 +6,6 @@ | ||
| 6 | use common\models\Articles; | 6 | use common\models\Articles; |
| 7 | use common\models\Basket; | 7 | use common\models\Basket; |
| 8 | use frontend\assets\AppAsset; | 8 | use frontend\assets\AppAsset; |
| 9 | - use frontend\assets\Css1Asset; | ||
| 10 | use yii\helpers\Html; | 9 | use yii\helpers\Html; |
| 11 | use yii\helpers\Url; | 10 | use yii\helpers\Url; |
| 12 | use yii\web\View; | 11 | use yii\web\View; |
| @@ -16,7 +15,6 @@ | @@ -16,7 +15,6 @@ | ||
| 16 | use frontend\widgets\AssetWidget; | 15 | use frontend\widgets\AssetWidget; |
| 17 | 16 | ||
| 18 | AppAsset::register($this); | 17 | AppAsset::register($this); |
| 19 | - Css1Asset::register($this); | ||
| 20 | ?> | 18 | ?> |
| 21 | 19 | ||
| 22 | <?php $this->beginPage() ?> | 20 | <?php $this->beginPage() ?> |
| @@ -617,18 +615,6 @@ | @@ -617,18 +615,6 @@ | ||
| 617 | <img height="1" width="1" style="border-style:none;" alt="" src="//googleads.g.doubleclick.net/pagead/viewthroughconversion/928178078/?guid=ON&script=0"/> | 615 | <img height="1" width="1" style="border-style:none;" alt="" src="//googleads.g.doubleclick.net/pagead/viewthroughconversion/928178078/?guid=ON&script=0"/> |
| 618 | </div> | 616 | </div> |
| 619 | </noscript> | 617 | </noscript> |
| 620 | - | ||
| 621 | - <?php | ||
| 622 | - echo AssetWidget::widget( | ||
| 623 | - [ | ||
| 624 | - 'assets' => [ | ||
| 625 | - 'sersid\owlcarousel\Asset', | ||
| 626 | - 'frontend\assets\Css1Asset', | ||
| 627 | - 'frontend\assets\FlipclockAsset', | ||
| 628 | - ], | ||
| 629 | - ] | ||
| 630 | - ); | ||
| 631 | - ?> | ||
| 632 | 618 | ||
| 633 | <?php $this->endBody() ?> | 619 | <?php $this->endBody() ?> |
| 634 | </body> | 620 | </body> |