Skip to content

Commit

Permalink
copying glyphicons into fonts folder of dist build
Browse files Browse the repository at this point in the history
  • Loading branch information
raphywink committed Oct 10, 2014
1 parent aba420b commit 6b43e39
Show file tree
Hide file tree
Showing 8 changed files with 263 additions and 897 deletions.
46 changes: 27 additions & 19 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ module.exports = function (grunt) {

// Define the configuration for all the tasks
grunt.initConfig({

// read package.json to have version nrs
pkg: grunt.file.readJSON('package.json'),

// Project settings
yeoman: appConfig,

Expand Down Expand Up @@ -355,7 +355,7 @@ module.exports = function (grunt) {
'background.js',
'manifest.json',
'assets/icon.png',
'styles/external/bootstrap-combined.min.css',
// 'styles/external/bootstrap-combined.min.css',
'styles/images/rightSideMenuBtn.png'
]
}, {
Expand All @@ -365,6 +365,14 @@ module.exports = function (grunt) {
src: [
'generated/*'
]
}, {
expand: true,
flatten: true,
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/fonts',
src: [
'bower_components/bootstrap/dist/fonts/*.*'
]
}]
},
styles: {
Expand Down Expand Up @@ -392,27 +400,27 @@ module.exports = function (grunt) {
},

// Test settings

karma: {
continuous: {
configFile: 'karma.conf.js',
singleRun: false
},
unit: {
configFile: 'karma.conf.js',
singleRun: true,
browsers: ['PhantomJS']
}
},
continuous: {
configFile: 'karma.conf.js',
singleRun: false
},
unit: {
configFile: 'karma.conf.js',
singleRun: true,
browsers: ['PhantomJS']
}
},


protractor: {
options: {
keepAlive: true,
configFile: 'protractor.conf.js'
},
run: {}
},
},

// auto generate manifest.appcache file with all files of app
appcache: {
Expand Down Expand Up @@ -503,7 +511,7 @@ module.exports = function (grunt) {
'connect:test',
'karma:continuous'
]);


grunt.registerTask('e2e', [
'clean:server',
Expand All @@ -512,7 +520,7 @@ module.exports = function (grunt) {
'connect:test',
'karma:unit',
'protractor:run'
]);
]);

grunt.registerTask('build', [
'clean:dist',
Expand Down
Binary file added dist/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
229 changes: 229 additions & 0 deletions dist/fonts/glyphicons-halflings-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file added dist/fonts/glyphicons-halflings-regular.woff
Binary file not shown.
7 changes: 5 additions & 2 deletions dist/manifest.appcache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# rev 1 - 2014-10-10T12:28:27.919Z
# rev 1 - 2014-10-10T13:25:11.352Z

CACHE:
404.html
Expand All @@ -22,6 +22,10 @@ demoDBs/epgdorsal/JDR11_bndl.json
demoDBs/epgdorsal/epgdorsal_DBconfig.json
demoDBs/epgdorsal/epgdorsal_bundleList.json
favicon.ico
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
img/aboutBtn.png
img/deleteBtn.png
img/glyphicons-halflings-white.png
Expand Down Expand Up @@ -49,7 +53,6 @@ scripts/workers/textGridParserWorker.js
scripts/workers/wavParserWorker.js
styles/47963319.emuwebApp.min.css
styles/62316d80.emuwebAppExternal.min.css
styles/external/a4e7cc3c.bootstrap-combined.min.css
styles/images/rightSideMenuBtn.png
views/SelectLabelModal.html
views/SelectThresholdModal.html
Expand Down
874 changes: 0 additions & 874 deletions dist/styles/external/a4e7cc3c.bootstrap-combined.min.css

This file was deleted.

4 changes: 2 additions & 2 deletions dist/views/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ <h3 id="modalHeading">EMU-webApp</h3>
</div>
<div class="modal-body">
<h4 style="text-align:center">Version: 0.0.7</h4>
<h5 style="font-size:8pt; text-align:center">Build time stamp: Fri Oct 10 2014 14:28:28</h5>
<h5 style="font-size:8pt; text-align:center">Build GIT SHA-1: 03f76b9cb505ba67126becfab3ea903dba5642f3 - master</h5>
<h5 style="font-size:8pt; text-align:center">Build time stamp: Fri Oct 10 2014 15:25:11</h5>
<h5 style="font-size:8pt; text-align:center">Build GIT SHA-1: aba420bb88a2b7c7b1cc34c0bc07ca5d3e312fca - master</h5>
<div class="alert alert-danger"><b>Warning!</b> This webApp is still in ALPHA and is not meant to be used in production. So please use with caution! If you have any issues or you find a bug please create an issue on the GitHub project page.</div>

<hr class="emuwebapp-aboutHr">
Expand Down

0 comments on commit 6b43e39

Please sign in to comment.