Skip to content

Commit

Permalink
Cleaning up assets/vendors
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Feb 27, 2016
1 parent 70e1aa3 commit fd0e680
Show file tree
Hide file tree
Showing 20 changed files with 13 additions and 1,463 deletions.
2 changes: 1 addition & 1 deletion panoramix/assets/html/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block head_css %}
{{ super() }}
<link rel="stylesheet" href="{{ url_for('static', filename="assets/vendor/gridster/jquery.gridster.min.css") }}">
<link rel="stylesheet" href="{{ url_for('static', filename="assets/node_modules/gridster/dist/jquery.gridster.min.css") }}">
<style id="user_style" type="text/css">
{{ dashboard.css }}
</style>
Expand Down
3 changes: 2 additions & 1 deletion panoramix/assets/javascripts/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ require('brace/mode/css');
require('brace/theme/crimson_editor');

require('select2');
require('./../node_modules/gridster/dist/jquery.gridster.min.js');
require('../node_modules/gridster/dist/jquery.gridster.min.js');
require('../node_modules/gridster/dist/jquery.gridster.min.js');

var dashboard;

Expand Down
5 changes: 3 additions & 2 deletions panoramix/assets/javascripts/explore.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ var d3 = require('d3');
require('bootstrap');
require('jquery-ui');
require('select2');
require('../vendor/bootstrap-toggle/bootstrap-toggle.min.js');
require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js');
require('../vendor/select2.sortable.js');

// css
require('../vendor/pygments.css');
require('../vendor/bootstrap-toggle/bootstrap-toggle.min.css');
require('../node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css');

function initExploreView() {

function druidify(){
Expand Down
2 changes: 2 additions & 0 deletions panoramix/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"babel-preset-react": "^6.3.13",
"bootstrap": "^3.3.6",
"bootstrap-datepicker": "^1.6.0",
"bootstrap-toggle": "^2.2.1",
"brace": "^0.7.0",
"d3": "^3.5.14",
"d3-cloud": "^1.2.1",
Expand All @@ -53,6 +54,7 @@
"imports-loader": "^0.6.5",
"jquery": "^2.2.1",
"jquery-ui": "^1.10.5",
"nvd3": "1.8.2",
"react": "^0.14.7",
"react-bootstrap": "^0.28.3",
"react-dom": "^0.14.7",
Expand Down
28 changes: 0 additions & 28 deletions panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.css

This file was deleted.

This file was deleted.

Loading

0 comments on commit fd0e680

Please sign in to comment.