Commit 414dc007 authored by Maxime Chaillet's avatar Maxime Chaillet

use bower for bootstrap integration. tested in dev.html. This was not working...

use bower for bootstrap integration. tested in dev.html. This was not working because of a bug described here https://github.com/yeoman/generator-angular/issues/1116
parent 8f6a2d4c
......@@ -27,8 +27,17 @@
"dependencies": {
"jquery": "^3.2.1",
"dustjs-linkedin": "^2.7.5",
"bootstrap": "^3.3.7",
"bootstrap": "^4.0.0",
"dustjs-helpers": "^1.7.3",
"lodash": "^4.17.5"
},
"overrides": {
"bootstrap": {
"main": [
"dist/js/bootstrap.js",
"dist/css/bootstrap.css",
"less/bootstrap.less"
]
}
}
}
......@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>ESRF</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="/min/output.min.css" >
<!-- Using grunt-include-source, the proper js files created by us (not minified) are included below -->
......@@ -21,6 +20,10 @@
<script src="bower_components/lodash/lodash.js"></script>
<!-- endbower -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<!-- endbower -->
<!-- Using grunt-include-source, the proper all dustjs templates files (not minified are included below -->
<script src="min/precompiled.templates.min.js"></script>
......@@ -62,4 +65,4 @@
</div>
</footer>
</body>
</html>
\ No newline at end of file
</html>
......@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>ESRF</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="/min/output.min.css" >
<!-- Using grunt-include-source, the proper js files created by us (not minified) are included below -->
......@@ -14,6 +13,9 @@
<!-- bower:js -->
<!-- endbower -->
<!-- bower:css -->
<!-- endbower -->
<!-- Using grunt-include-source, the proper all dustjs templates files (not minified are included below -->
<!-- include: "type": "js", "files": "min/precompiled.templates.min.js" -->
......@@ -55,4 +57,4 @@
</div>
</footer>
</body>
</html>
\ No newline at end of file
</html>
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment