Merge pull request #169 from mistercrunch/select2-style

Fixing the look of select2 components

panoramix/assets/javascripts/dashboard.js

@@ -8,7 +8,7 @@ var ace = require('brace');
 require('brace/mode/css');
 require('brace/theme/crimson_editor');
 
-require('select2');
+require('./panoramix-select2.js');
 require('../node_modules/gridster/dist/jquery.gridster.min.js');
 
 var Dashboard = function (dashboardData) {

panoramix/assets/javascripts/explore.js

@@ -11,7 +11,8 @@ require('jquery-ui');
 $.widget.bridge('uitooltip', $.ui.tooltip); // Shutting down jq-ui tooltips
 require('bootstrap');
 
-require('select2');
+require('./panoramix-select2.js');
+
 require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js');
 require('../vendor/select2.sortable.js');
 

panoramix/assets/javascripts/panoramix-select2.js

@@ -0,0 +1,2 @@
+require('../node_modules/select2-bootstrap-css/select2-bootstrap.min.css');
+require('select2');

panoramix/assets/package.json

@@ -64,6 +64,7 @@
     "react-bootstrap": "^0.28.3",
     "react-dom": "^0.14.7",
     "select2": "3.5",
+    "select2-bootstrap-css": "^1.4.6",
     "style-loader": "^0.13.0",
     "topojson": "^1.6.22",
     "webpack": "^1.12.12"

panoramix/assets/stylesheets/panoramix.css

@@ -2,6 +2,10 @@ body {
     margin: 0px !important;
 }
 
+input.form-control {
+    background-color: white;
+}
+
 .col-left-fixed {
     width:350px;
     position: absolute;

panoramix/assets/visualizations/filter_box.js

@@ -5,6 +5,8 @@ var d3 = window.d3 || require('d3');
 
 // CSS
 require('./filter_box.css');
+require('../javascripts/panoramix-select2.js');
+
 
 function filterBox(slice) {
   var filtersObj = {};