diff options
| -rw-r--r-- | app/Template/layout.php | 9 | ||||
| -rw-r--r-- | assets/css/chosen-sprite.png (renamed from assets/img/chosen-sprite.png) | bin | 538 -> 538 bytes | |||
| -rw-r--r-- | assets/css/chosen-sprite@2x.png (renamed from assets/img/chosen-sprite@2x.png) | bin | 738 -> 738 bytes | |||
| -rw-r--r-- | gulpfile.js | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/app/Template/layout.php b/app/Template/layout.php index 811da9db..a80fc288 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -18,6 +18,11 @@ <?= $this->asset->css('assets/css/print.min.css', true, 'print') ?> <?= $this->asset->customCss() ?> + <?php if (! isset($not_editable)): ?> + <?= $this->asset->js('assets/js/vendor.min.js') ?> + <?= $this->asset->js('assets/js/app.min.js') ?> + <?php endif ?> + <?= $this->hook->asset('css', 'template:layout:css') ?> <?= $this->hook->asset('js', 'template:layout:js') ?> @@ -60,9 +65,5 @@ </section> <?= $this->hook->render('template:layout:bottom') ?> <?php endif ?> - <?php if (! isset($not_editable)): ?> - <?= $this->asset->js('assets/js/vendor.min.js') ?> - <?= $this->asset->js('assets/js/app.min.js') ?> - <?php endif ?> </body> </html> diff --git a/assets/img/chosen-sprite.png b/assets/css/chosen-sprite.png Binary files differindex c57da70b..c57da70b 100644 --- a/assets/img/chosen-sprite.png +++ b/assets/css/chosen-sprite.png diff --git a/assets/img/chosen-sprite@2x.png b/assets/css/chosen-sprite@2x.png Binary files differindex 6b505452..6b505452 100644 --- a/assets/img/chosen-sprite@2x.png +++ b/assets/css/chosen-sprite@2x.png diff --git a/gulpfile.js b/gulpfile.js index 2f96cb36..97c61fbe 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -123,7 +123,7 @@ gulp.task('vendor', function() { .pipe(gulp.dest(dist.css + 'images/')); gulp.src('bower_components/chosen/*.png') - .pipe(gulp.dest(dist.img + '')); + .pipe(gulp.dest(dist.css + '')); }); gulp.task('js', function() { |
