Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

js/css files are now built under dist/js and dist/css

Browse source
This commit is contained in:
Anthony Lapenna 2016-06-08 10:09:37 +12:00
parent 9a4115f086
commit 3302c822f1
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gruntFile.js
View file

@ -135,11 +135,11 @@ module.exports = function (grunt) {
process: true process: true
}, },
src: ['<%= src.js %>', '<%= src.jsTpl %>'], src: ['<%= src.js %>', '<%= src.jsTpl %>'],
dest: '<%= distdir %>/<%= pkg.name %>.js' dest: '<%= distdir %>/js/<%= pkg.name %>.js'
}, },
vendor: { vendor: {
src: ['<%= src.jsVendor %>'], src: ['<%= src.jsVendor %>'],
dest: '<%= distdir %>/vendor.js' dest: '<%= distdir %>/js/vendor.js'
}, },
index: { index: {
src: ['index.html'], src: ['index.html'],
@ -158,7 +158,7 @@ module.exports = function (grunt) {
'bower_components/angular-bootstrap/ui-bootstrap-tpls.js', 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
'bower_components/angular-oboe/dist/angular-oboe.js', 'bower_components/angular-oboe/dist/angular-oboe.js',
'bower_components/angular-ui-select/dist/select.js'], 'bower_components/angular-ui-select/dist/select.js'],
dest: '<%= distdir %>/angular.js' dest: '<%= distdir %>/js/angular.js'
} }
}, },
uglify: { uglify: {
@ -167,28 +167,28 @@ module.exports = function (grunt) {
banner: "<%= banner %>" banner: "<%= banner %>"
}, },
src: ['<%= src.js %>', '<%= src.jsTpl %>'], src: ['<%= src.js %>', '<%= src.jsTpl %>'],
dest: '<%= distdir %>/<%= pkg.name %>.js' dest: '<%= distdir %>/js/<%= pkg.name %>.js'
}, },
vendor: { vendor: {
options: { options: {
preserveComments: 'some' // Preserve license comments preserveComments: 'some' // Preserve license comments
}, },
src: ['<%= src.jsVendor %>'], src: ['<%= src.jsVendor %>'],
dest: '<%= distdir %>/vendor.js' dest: '<%= distdir %>/js/vendor.js'
}, },
angular: { angular: {
options: { options: {
preserveComments: 'some' // Preserve license comments preserveComments: 'some' // Preserve license comments
}, },
src: ['<%= concat.angular.src %>'], src: ['<%= concat.angular.src %>'],
dest: '<%= distdir %>/angular.js' dest: '<%= distdir %>/js/angular.js'
} }
}, },
recess: { // TODO: not maintained, unable to preserve license comments, switch out for something better. recess: { // TODO: not maintained, unable to preserve license comments, switch out for something better.
build: { build: {
files: { files: {
'<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'], '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'],
'<%= distdir %>/vendor.css': ['<%= src.cssVendor %>'] '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>']
}, },
options: { options: {
compile: true, compile: true,
@ -197,8 +197,8 @@ module.exports = function (grunt) {
}, },
min: { min: {
files: { files: {
'<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'], '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'],
'<%= distdir %>/vendor.css': ['<%= src.cssVendor %>'] '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>']
}, },
options: { options: {
compile: true, compile: true,

10
index.html
View file

@ -7,17 +7,17 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="<%= pkg.author %>"> <meta name="author" content="<%= pkg.author %>">
<link href="vendor.css" rel="stylesheet"> <link href="css/vendor.css" rel="stylesheet">
<link href="<%= pkg.name %>.css" rel="stylesheet"> <link href="css/<%= pkg.name %>.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<script src="angular.js"></script> <script src="js/angular.js"></script>
<script src="vendor.js"></script> <script src="js/vendor.js"></script>
<script src="<%= pkg.name %>.js"></script> <script src="js/<%= pkg.name %>.js"></script>
<!-- Fav and touch icons --> <!-- Fav and touch icons -->
<link rel="shortcut icon" href="ico/favicon.ico"> <link rel="shortcut icon" href="ico/favicon.ico">