mirror of
https://github.com/ToxicCrack/PrintABrick.git
synced 2025-05-15 20:00:08 -07:00
Load assets with bower
This commit is contained in:
parent
9c53bcc77a
commit
d6513c28d7
@ -6,7 +6,7 @@
|
||||
<meta name="description" content="{{ 'meta.description' | trans | striptags('sup') }}">
|
||||
<title>{% block title %}{{ name }} - {{ 'meta.description' | trans | striptags('sup') }}{% endblock %}</title>
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ fileTimestamp(asset('resources/css/main.css')) }}">
|
||||
<link rel="stylesheet" href="{{ fileTimestamp(asset('resources/css/style.css')) }}">
|
||||
{% endblock %}
|
||||
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('apple-touch-icon.png') }}">
|
||||
@ -23,7 +23,7 @@
|
||||
{% block javascripts %}
|
||||
<script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/three.js')) }}"></script>
|
||||
<script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/OrbitControls.js')) }}"></script>
|
||||
<script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/main.js')) }}"></script>
|
||||
<script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/style.js')) }}"></script>
|
||||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
@ -21,6 +21,8 @@
|
||||
"select2": "^4.0.3",
|
||||
"three.js": "threejs#*",
|
||||
"jqueryui-touch-punch": "*",
|
||||
"jquery-address": "*"
|
||||
"jquery-address": "*",
|
||||
"semantic": "semantic-ui#^2.2.10",
|
||||
"lightbox2": "lightbox#^2.9.0"
|
||||
}
|
||||
}
|
||||
|
18
gulpfile.js
18
gulpfile.js
@ -3,15 +3,15 @@ var gulp = require('gulp'),
|
||||
|
||||
gulp.task('css', function() {
|
||||
return gulp.src([
|
||||
'node_modules/semantic-ui/dist/semantic.css',
|
||||
'node_modules/lightbox2/dist/css/lightbox.css',
|
||||
'bower_components/semantic/dist/semantic.css',
|
||||
'bower_components/lightbox2/dist/css/lightbox.css',
|
||||
'bower_components/jquery-ui/themes/base/jquery-ui.css',
|
||||
'bower_components/jQuery-ui-Slider-Pips/dist/jquery-ui-slider-pips.css',
|
||||
'bower_components/select2/dist/css/select2.css',
|
||||
'app/Resources/assets/style/style.scss',
|
||||
])
|
||||
.pipe(plugins.sass().on('error', plugins.sass.logError))
|
||||
.pipe(plugins.concat('main.css', {newLine: ' '}))
|
||||
.pipe(plugins.concat('style.css', {newLine: ' '}))
|
||||
.pipe(plugins.environments.production(plugins.cssmin()))
|
||||
.pipe(gulp.dest('web/resources/css'));
|
||||
});
|
||||
@ -43,25 +43,25 @@ gulp.task('js', function() {
|
||||
'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js',
|
||||
'bower_components/select2/dist/js/select2.full.js',
|
||||
'bower_components/jquery-address/src/jquery.address.js',
|
||||
'node_modules/semantic-ui/dist/semantic.js',
|
||||
'node_modules/lightbox2/dist/js/lightbox.js',
|
||||
'bower_components/semantic/dist/semantic.js',
|
||||
'bower_components/lightbox2/dist/js/lightbox.js',
|
||||
'app/Resources/assets/js/**.js',
|
||||
])
|
||||
.pipe(plugins.concat('main.js'))
|
||||
.pipe(plugins.concat('style.js'))
|
||||
.pipe(plugins.environments.production(plugins.uglify()))
|
||||
.pipe(gulp.dest('web/resources/js'));
|
||||
});
|
||||
|
||||
gulp.task('files:semantic', function () {
|
||||
return gulp.src(
|
||||
'node_modules/semantic-ui/dist/themes/**'
|
||||
'bower_components/semantic/dist/themes/**'
|
||||
)
|
||||
.pipe(gulp.dest('web/resources/css/themes'));
|
||||
.pipe(gulp.dest('web/resources/css/semantic-ui'));
|
||||
});
|
||||
|
||||
gulp.task('files:images', function () {
|
||||
return gulp.src([
|
||||
'node_modules/lightbox2/dist/images/**',
|
||||
'bower_components/lightbox2/dist/images/**',
|
||||
'app/Resources/assets/images/**'
|
||||
])
|
||||
.pipe(gulp.dest('web/resources/images'));
|
||||
|
@ -13,9 +13,6 @@
|
||||
"gulp-sourcemaps": "^2.6.0",
|
||||
"gulp-uglify": "^3.0.0",
|
||||
"gulp-watch": "^4.3.11",
|
||||
"jquery": "^3.2.1",
|
||||
"lightbox2": "^2.9.0",
|
||||
"semantic-ui": "^2.2.9",
|
||||
"gulp-environments": "^0.1.2"
|
||||
},
|
||||
"devDependencies": {},
|
||||
|
Loading…
x
Reference in New Issue
Block a user