From 9855a60013e1a1588e4ce704b912885c60469689 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sun, 6 Mar 2016 09:30:32 -0500 Subject: [PATCH 1/3] Fixing the look of select2 components --- panoramix/assets/javascripts/dashboard.js | 2 +- panoramix/assets/javascripts/explore.js | 4 +++- panoramix/assets/javascripts/panoramix_select2.js | 2 ++ panoramix/assets/package.json | 1 + panoramix/assets/visualizations/filter_box.js | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 panoramix/assets/javascripts/panoramix_select2.js diff --git a/panoramix/assets/javascripts/dashboard.js b/panoramix/assets/javascripts/dashboard.js index 8c5b47a65a8e2..20f3432178f1b 100644 --- a/panoramix/assets/javascripts/dashboard.js +++ b/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) { diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js index 8817f6be92cbb..6cd9847bf4256 100644 --- a/panoramix/assets/javascripts/explore.js +++ b/panoramix/assets/javascripts/explore.js @@ -11,7 +11,9 @@ 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'); diff --git a/panoramix/assets/javascripts/panoramix_select2.js b/panoramix/assets/javascripts/panoramix_select2.js new file mode 100644 index 0000000000000..6be060500f022 --- /dev/null +++ b/panoramix/assets/javascripts/panoramix_select2.js @@ -0,0 +1,2 @@ +require('../node_modules/select2-bootstrap-css/select2-bootstrap.min.css'); +require('select2'); diff --git a/panoramix/assets/package.json b/panoramix/assets/package.json index 57595355ba7d0..650140db49cce 100644 --- a/panoramix/assets/package.json +++ b/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" diff --git a/panoramix/assets/visualizations/filter_box.js b/panoramix/assets/visualizations/filter_box.js index 249e8efa57029..a6212ce4dcb0b 100644 --- a/panoramix/assets/visualizations/filter_box.js +++ b/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 = {}; From c0e4aca7e47f80c3aa43539c2e0cdc3b951cd4e0 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sun, 6 Mar 2016 17:48:50 -0500 Subject: [PATCH 2/3] Using dash - instead of _ on filename, making input form-control white --- panoramix/assets/javascripts/dashboard.js | 2 +- panoramix/assets/javascripts/explore.js | 3 +-- .../{panoramix_select2.js => panoramix-select2.js} | 0 panoramix/assets/stylesheets/panoramix.css | 4 ++++ panoramix/assets/visualizations/filter_box.js | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) rename panoramix/assets/javascripts/{panoramix_select2.js => panoramix-select2.js} (100%) diff --git a/panoramix/assets/javascripts/dashboard.js b/panoramix/assets/javascripts/dashboard.js index 20f3432178f1b..1b07df00a239d 100644 --- a/panoramix/assets/javascripts/dashboard.js +++ b/panoramix/assets/javascripts/dashboard.js @@ -8,7 +8,7 @@ var ace = require('brace'); require('brace/mode/css'); require('brace/theme/crimson_editor'); -require('./panoramix_select2.js'); +require('./panoramix-select2.js'); require('../node_modules/gridster/dist/jquery.gridster.min.js'); var Dashboard = function (dashboardData) { diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js index 6cd9847bf4256..b5dc19281be03 100644 --- a/panoramix/assets/javascripts/explore.js +++ b/panoramix/assets/javascripts/explore.js @@ -11,8 +11,7 @@ require('jquery-ui'); $.widget.bridge('uitooltip', $.ui.tooltip); // Shutting down jq-ui tooltips require('bootstrap'); -require('./panoramix_select2.js'); - +require('./panoramix-select2.js'); require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js'); require('../vendor/select2.sortable.js'); diff --git a/panoramix/assets/javascripts/panoramix_select2.js b/panoramix/assets/javascripts/panoramix-select2.js similarity index 100% rename from panoramix/assets/javascripts/panoramix_select2.js rename to panoramix/assets/javascripts/panoramix-select2.js diff --git a/panoramix/assets/stylesheets/panoramix.css b/panoramix/assets/stylesheets/panoramix.css index 21681dbacdb70..6c58a1dd35655 100644 --- a/panoramix/assets/stylesheets/panoramix.css +++ b/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; diff --git a/panoramix/assets/visualizations/filter_box.js b/panoramix/assets/visualizations/filter_box.js index a6212ce4dcb0b..658bd8fc8f612 100644 --- a/panoramix/assets/visualizations/filter_box.js +++ b/panoramix/assets/visualizations/filter_box.js @@ -5,7 +5,7 @@ var d3 = window.d3 || require('d3'); // CSS require('./filter_box.css'); -require('../javascripts/panoramix_select2.js') +require('../javascripts/panoramix-select2.js') function filterBox(slice) { From d6db3a9cf1de4c9a8eb9237f9471f5751d0bfd79 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Mon, 7 Mar 2016 13:46:19 -0500 Subject: [PATCH 3/3] semicolon --- panoramix/assets/visualizations/filter_box.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panoramix/assets/visualizations/filter_box.js b/panoramix/assets/visualizations/filter_box.js index 658bd8fc8f612..dd833a08b4c54 100644 --- a/panoramix/assets/visualizations/filter_box.js +++ b/panoramix/assets/visualizations/filter_box.js @@ -5,7 +5,7 @@ var d3 = window.d3 || require('d3'); // CSS require('./filter_box.css'); -require('../javascripts/panoramix-select2.js') +require('../javascripts/panoramix-select2.js'); function filterBox(slice) {