Skip to content
Permalink
Browse files

Move all generated assets to the public/dist directory

  • Loading branch information...
adobo committed Jan 16, 2017
1 parent 0032d03 commit 5d3dac3e168e7ff6aa53ae40842eb45690294821
@@ -16,6 +16,8 @@
*.sqlite

agendav-built*
web/public/dist/css/*.css
web/public/dist/js/*.js

# Configuration file
/web/config/settings*
@@ -249,8 +249,8 @@ th {
}
@font-face {
font-family: 'Glyphicons Halflings';
src: url('../font/bootstrap/glyphicons-halflings-regular.eot');
src: url('../font/bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../font/bootstrap/glyphicons-halflings-regular.woff2') format('woff2'), url('../font/bootstrap/glyphicons-halflings-regular.woff') format('woff'), url('../font/bootstrap/glyphicons-halflings-regular.ttf') format('truetype'), url('../font/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
src: url('../../font/bootstrap/glyphicons-halflings-regular.eot');
src: url('../../font/bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../font/bootstrap/glyphicons-halflings-regular.woff2') format('woff2'), url('../../font/bootstrap/glyphicons-halflings-regular.woff') format('woff'), url('../../font/bootstrap/glyphicons-halflings-regular.ttf') format('truetype'), url('../../font/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
.glyphicon {
position: relative;
@@ -6224,8 +6224,8 @@ button.close {
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../font/fa/fontawesome-webfont.eot?v=4.2.0');
src: url('../font/fa/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../font/fa/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../font/fa/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../font/fa/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
src: url('../../font/fa/fontawesome-webfont.eot?v=4.2.0');
src: url('../../font/fa/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../../font/fa/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../../font/fa/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../../font/fa/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -73,7 +73,7 @@
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.

//** Load fonts from this directory.
@icon-font-path: "../font/bootstrap/";
@icon-font-path: "../../font/bootstrap/";
//** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
//** Element ID within SVG icon file.
@@ -1,7 +1,7 @@
// Variables
// --------------------------

@fa-font-path: "../font/fa";
@fa-font-path: "../../font/fa";
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa;
@fa-version: "4.2.0";
@@ -12,9 +12,9 @@
"composer-dev": "cd web && composer install --dev --prefer-source",
"build:templates": "dustc --pwd assets/templates -o assets/templates/templates.js assets/templates/*.dust",
"prebuild:css": "lessc assets/less/agendav.less assets/css/agendav.css",
"build:css": "cat assets/css/*.css | cleancss -o web/public/css/agendav.css && cat assets/print-css/*.css | cleancss -o web/public/css/agendav.print.css",
"build:js": "uglifyjs web/public/js/agendav.js -c -m -o web/public/js/agendav.min.js",
"prebuild:js": "uglifyjs assets/js/core/*.js assets/js/other/*.js assets/js/app/*.js assets/templates/templates.js -b -o web/public/js/agendav.js"
"build:css": "cat assets/css/*.css | cleancss -o web/public/dist/css/agendav.css && cat assets/print-css/*.css | cleancss -o web/public/dist/css/agendav.print.css",
"prebuild:js": "uglifyjs assets/js/core/*.js assets/js/other/*.js assets/js/app/*.js assets/templates/templates.js -b -o web/public/dist/js/agendav.js",
"build:js": "uglifyjs web/public/dist/js/agendav.js -c -m -o web/public/dist/js/agendav.min.js"
},
"repository": {
"type": "git",
@@ -21,5 +21,5 @@
$app['monolog.level'] = 'DEBUG';
$app['scripts'] = [
'agendav.js',
'dist/js/agendav.js',
];
@@ -5,15 +5,15 @@
// Assets
$app['stylesheets'] = [
'agendav.css',
'dist/css/agendav.css',
];
$app['print.stylesheets'] = [
'agendav.print.css',
'dist/css/agendav.print.css',
];
$app['scripts'] = [
'agendav.min.js',
'dist/js/agendav.min.js',
];
// Session parameters
No changes.
No changes.
@@ -6,13 +6,13 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
{% if stylesheets is defined %}
{% for stylesheet in stylesheets %}
<link href="{{ app.request.basepath }}{{ assets_root }}/css/{{ stylesheet }}" rel="stylesheet" type="text/css" />
<link href="{{ app.request.basepath }}{{ assets_root }}/{{ stylesheet }}" rel="stylesheet" type="text/css" />
{% endfor %}
{% endif %}

{% if print_stylesheets is defined %}
{% for stylesheet in print_stylesheets %}
<link href="{{ app.request.basepath }}{{ assets_root }}/css/{{ stylesheet }}" rel="stylesheet" media="print" type="text/css" />
<link href="{{ app.request.basepath }}{{ assets_root }}/{{ stylesheet }}" rel="stylesheet" media="print" type="text/css" />
{% endfor %}
{% endif %}
<!--[if lt IE 9]>
@@ -2,5 +2,5 @@
<div id="popup" class="freeow freeow-top-right"></div>

{% for script in scripts %}
<script language="JavaScript" type="text/javascript" src="{{ app.request.basepath}}{{ assets_root }}/js/{{ script }}"></script>
<script language="JavaScript" type="text/javascript" src="{{ app.request.basepath}}{{ assets_root }}/{{ script }}"></script>
{% endfor %}

0 comments on commit 5d3dac3

Please sign in to comment.
You can’t perform that action at this time.