Skip to content

Commit

Permalink
Added missing icons, changed how jQuery and jQuery-UI is packaged
Browse files Browse the repository at this point in the history
  • Loading branch information
sulkaharo committed Aug 16, 2017
1 parent dda4277 commit 9e055ad
Show file tree
Hide file tree
Showing 11 changed files with 354 additions and 30 deletions.
6 changes: 5 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,17 @@ function create(env, ctx) {
app.use(bundle);
*/

if (process.env.NODE_ENV !== 'development') {

console.log('Production environment detected, enabling Minify');

var minify = require('express-minify');

//app.use(minify());

var myUglifyJS = require('uglify-js');
var myCssmin = require('cssmin');


app.use(minify({
js_match: /\.js/,
css_match: /\.css/,
Expand All @@ -135,6 +138,7 @@ app.use(minify({
onerror: undefined,
}));

}

// if this is dev environment, package scripts on the fly
// if production, rely on postinstall script to run packaging for us
Expand Down
10 changes: 7 additions & 3 deletions bundle/bundle.source.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ import '../node_modules/jquery.tipsy/src/jquery.tipsy.css';

window._ = require('lodash');
window.d3 = require('d3');
window.$ = window.jQuery = require('jquery');

require('webpack-jquery-ui');

// window.$ = window.jQuery = require('jquery');

window.tipsy = require('jquery.tipsy');
require('jquery.tipsy');

window.jqui = require('jquery-ui/ui/core');
// window.jqui = require('jquery-ui/ui/core');
// window.jqui = require('jquery-ui/ui/dialog');

window.Storage = require('js-storage');

Expand Down
292 changes: 292 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
"forever": "^0.15.3",
"git-rev": "git://github.com/bewest/git-rev.git",
"heapdump": "^0.3.9",
"jquery": "^2.2.4",
"jquery-ui": "^1.12.1",
"jquery.tipsy": "^1.0.3",
"js-storage": "^1.0.1",
"jsonwebtoken": "^7.4.2",
Expand All @@ -96,7 +94,8 @@
"sugar": "^1.5.0",
"traverse": "^0.6.6",
"uglify-js": "^3.0.27",
"webpack": "^3.5.4"
"webpack": "^3.5.4",
"webpack-jquery-ui": "^1.0.0"
},
"devDependencies": {
"benv": "3.3.0",
Expand Down
3 changes: 2 additions & 1 deletion static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}

.icon-volume-up:before { content: '\e800'; } /* '' */
.icon-volume:before { content: '\e800'; } /* '' */
.icon-plus:before { content: '\e801'; } /* '' */
.icon-edit:before { content: '\e802'; } /* '' */
.icon-lock:before { content: '\e803'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
.icon-calc:before { content: '\f1ec'; } /* '' */

html, body {
margin: 0;
Expand Down
Binary file modified static/font/nsicons.eot
Binary file not shown.
Loading

0 comments on commit 9e055ad

Please sign in to comment.