Fixes for compatibility with IPython 2.3.

jdavidheiser · Oct 6, 2014 · 094b5bc · 094b5bc
1 parent 43b2774
commit 094b5bc
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 37 deletions.
diff --git a/qgrid/qgridjs/qgrid.css b/qgrid/qgridjs/qgrid.css
@@ -193,7 +193,7 @@
   font-size: 13px;
 }
 
-.q-grid-container .grid-filter i.fa-times {
+.q-grid-container .grid-filter i.close-button {
   position: absolute;
   right: 11px;
   top: 7px;
@@ -202,7 +202,7 @@
   cursor: pointer;
 }
 
-.q-grid-container .grid-filter i.fa-times:hover {
+.q-grid-container .grid-filter i.close-button:hover {
   color: #777777;
 }
 

diff --git a/qgrid/qgridjs/qgrid.datefilter.js b/qgrid/qgridjs/qgrid.datefilter.js
@@ -17,7 +17,7 @@ define([
       "<div class='date-range-filter grid-filter dropdown-menu {{type}}-filter'>" +
         "<h3 class='popover-title'>" +
           "<div class='dropdown-title'>Filter by {{name}}</div>" +
-          "<i class='fa fa-times'/>" +
+          "<i class='fa fa-times icon-remove close-button'/>" +
         "</h3>" +
         "<div class='dropdown-body'>" +
           "<input class='datepicker ignore start-date'/>" +

diff --git a/qgrid/qgridjs/qgrid.filterbase.js b/qgrid/qgridjs/qgrid.filterbase.js
@@ -14,7 +14,7 @@ define([
 
     this.column_header_elem = column_header_elem;
     this.slick_grid = slick_grid;
-    this.filter_btn = $("<div class='fa fa-filter filter-button'>");
+    this.filter_btn = $("<div class='fa fa-filter icon-filter filter-button'>");
     this.filter_btn.appendTo(this.column_header_elem);
     this.filter_btn.click($.proxy(this.handle_filter_button_clicked, this));
     this.update_filter_button_disabled();
@@ -126,7 +126,7 @@ define([
     this.filter_elem.find("a.reset-link").click($.proxy(this.handle_reset_filter_clicked, this));
 
     var self = this;
-    this.filter_elem.find("i.fa-times").click(function(e){
+    this.filter_elem.find("i.close-button").click(function(e){
       self.hide_filter();
       return false;
     });

diff --git a/qgrid/qgridjs/qgrid.sliderfilter.js b/qgrid/qgridjs/qgrid.sliderfilter.js
@@ -17,7 +17,7 @@ define([
       "<div class='numerical-filter grid-filter dropdown-menu {{type}}-filter'>" +
         "<h3 class='popover-title'>" +
           "<div class='dropdown-title'>Filter by {{name}}</div>" +
-          "<i class='fa fa-times'/>" +
+          "<i class='fa fa-times icon-remove close-button'/>" +
         "</h3>" +
         "<div class='dropdown-body'>" +
           "<div class='slider-range'/>" +

diff --git a/qgrid_demo.ipynb b/qgrid_demo.ipynb