diff --git a/.gitignore b/.gitignore
index 54da80ec2..2cfcb91c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@
*.sqlite
agendav-built*
+web/public/dist/css/*.css
+web/public/dist/js/*.js
# Configuration file
/web/config/settings*
diff --git a/assets/css/agendav.css b/assets/css/agendav.css
index 527005608..ea5cd9c9a 100644
--- a/assets/css/agendav.css
+++ b/assets/css/agendav.css
@@ -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;
}
diff --git a/assets/less/bootstrap_variables.less b/assets/less/bootstrap_variables.less
index f07c37d41..f30783edc 100644
--- a/assets/less/bootstrap_variables.less
+++ b/assets/less/bootstrap_variables.less
@@ -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.
diff --git a/assets/less/fontawesome_variables.less b/assets/less/fontawesome_variables.less
index 293beb794..3ff1ffae3 100644
--- a/assets/less/fontawesome_variables.less
+++ b/assets/less/fontawesome_variables.less
@@ -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";
diff --git a/package.json b/package.json
index 2b0a89a83..2eb62e9de 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/web/config/dev.php b/web/config/dev.php
index 43ce6e781..83025fd01 100644
--- a/web/config/dev.php
+++ b/web/config/dev.php
@@ -21,5 +21,5 @@
$app['monolog.level'] = 'DEBUG';
$app['scripts'] = [
- 'agendav.js',
+ 'dist/js/agendav.js',
];
diff --git a/web/config/prod.php b/web/config/prod.php
index ccbfd2316..0c63ff1b8 100644
--- a/web/config/prod.php
+++ b/web/config/prod.php
@@ -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
diff --git a/web/public/dist/css/.keep b/web/public/dist/css/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/public/dist/js/.keep b/web/public/dist/js/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/templates/layout.html b/web/templates/layout.html
index 5700c69de..bc1eb4523 100644
--- a/web/templates/layout.html
+++ b/web/templates/layout.html
@@ -6,13 +6,13 @@
{% if stylesheets is defined %}
{% for stylesheet in stylesheets %}
-
+
{% endfor %}
{% endif %}
{% if print_stylesheets is defined %}
{% for stylesheet in print_stylesheets %}
-
+
{% endfor %}
{% endif %}