Skip to content

Commit

Permalink
remove pre-compiled bootstrap themes, use npm/wepack to compile from …
Browse files Browse the repository at this point in the history
…less variables instead. also fix a few css style bugs.
  • Loading branch information
williaster committed Mar 5, 2016
1 parent 1782d8f commit d3f7bbd
Show file tree
Hide file tree
Showing 14 changed files with 1,544 additions and 6,550 deletions.
1 change: 1 addition & 0 deletions panoramix/assets/javascripts/css-theme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('../stylesheets/less/index.less');
2 changes: 1 addition & 1 deletion panoramix/assets/javascripts/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var Dashboard = function (dashboardData) {
initDashboardView: function () {
dashboard = this;
var gridster = $(".gridster ul").gridster({
widget_margins: [5, 5],
widget_margins: [10, 10],
widget_base_dimensions: [100, 100],
draggable: {
handle: '.drag'
Expand Down
7 changes: 5 additions & 2 deletions panoramix/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"bootstrap-datepicker": "^1.6.0",
"bootstrap-toggle": "^2.2.1",
"brace": "^0.7.0",
"css-loader": "^0.23.1",
"d3": "^3.5.14",
"d3-cloud": "^1.2.1",
"d3-sankey": "^0.2.1",
Expand All @@ -57,17 +58,19 @@
"imports-loader": "^0.6.5",
"jquery": "^2.2.1",
"jquery-ui": "^1.10.5",
"less-loader": "^2.2.2",
"nvd3": "1.8.2",
"react": "^0.14.7",
"react-bootstrap": "^0.28.3",
"react-dom": "^0.14.7",
"select2": "3.5",
"style-loader": "^0.13.0",
"topojson": "^1.6.22",
"webpack": "^1.12.12"
},
"devDependencies": {
"css-loader": "^0.23.1",
"eslint": "^2.2.0",
"style-loader": "^0.13.0"
"file-loader": "^0.8.5",
"url-loader": "^0.5.7"
}
}
Loading

0 comments on commit d3f7bbd

Please sign in to comment.