From c0e4aca7e47f80c3aa43539c2e0cdc3b951cd4e0 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sun, 6 Mar 2016 17:48:50 -0500 Subject: [PATCH] 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 20f343217..1b07df00a 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 6cd9847bf..b5dc19281 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 21681dbac..6c58a1dd3 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 a6212ce4d..658bd8fc8 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) {