Using dash - instead of _ on filename, making input form-control white

apache · Mar 6, 2016 · c0e4aca · c0e4aca
1 parent 9855a60
commit c0e4aca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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/...x/assets/javascripts/panoramix_select2.js → ...x/assets/javascripts/panoramix-select2.js b/...x/assets/javascripts/panoramix_select2.js → ...x/assets/javascripts/panoramix-select2.js
diff --git 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
@@ -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) {