Merge pull request ipython#6084 from tomspur/fontawesome4

Update fontawesome to 4.1
cel4 · Jul 28, 2014 · 80344f1 · 80344f1
2 parents c308453 + d2e61f9
commit 80344f1
Show file tree

Hide file tree

Showing 14 changed files with 841 additions and 731 deletions.
diff --git a/IPython/html/static/base/less/page.less b/IPython/html/static/base/less/page.less
@@ -93,3 +93,8 @@ span#login_widget {
     }
 }
 
+// less mixin to be sure to add the right class to get icons with font awesome.
+.icon(@ico){
+    .fa();
+    content: @ico;
+}
diff --git a/IPython/html/static/components b/IPython/html/static/components
diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
@@ -35,7 +35,7 @@ define([
                 {
                     id : 'save_b',
                     label : 'Save and Checkpoint',
-                    icon : 'icon-save',
+                    icon : 'fa-save',
                     callback : function () {
                         that.notebook.save_checkpoint();
                         }
@@ -46,7 +46,7 @@ define([
                 {
                     id : 'insert_below_b',
                     label : 'Insert Cell Below',
-                    icon : 'icon-plus-sign',
+                    icon : 'fa-plus',
                     callback : function () {
                         that.notebook.insert_cell_below('code');
                         that.notebook.select_next();
@@ -59,23 +59,23 @@ define([
                 {
                     id : 'cut_b',
                     label : 'Cut Cell',
-                    icon : 'icon-cut',
+                    icon : 'fa-cut',
                     callback : function () {
                         that.notebook.cut_cell();
                         }
                 },
                 {
                     id : 'copy_b',
                     label : 'Copy Cell',
-                    icon : 'icon-copy',
+                    icon : 'fa-copy',
                     callback : function () {
                         that.notebook.copy_cell();
                         }
                 },
                 {
                     id : 'paste_b',
                     label : 'Paste Cell Below',
-                    icon : 'icon-paste',
+                    icon : 'fa-paste',
                     callback : function () {
                         that.notebook.paste_cell_below();
                         }
@@ -86,15 +86,15 @@ define([
                 {
                     id : 'move_up_b',
                     label : 'Move Cell Up',
-                    icon : 'icon-arrow-up',
+                    icon : 'fa-arrow-up',
                     callback : function () {
                         that.notebook.move_cell_up();
                         }
                 },
                 {
                     id : 'move_down_b',
                     label : 'Move Cell Down',
-                    icon : 'icon-arrow-down',
+                    icon : 'fa-arrow-down',
                     callback : function () {
                         that.notebook.move_cell_down();
                         }
@@ -106,7 +106,7 @@ define([
                 {
                     id : 'run_b',
                     label : 'Run Cell',
-                    icon : 'icon-play',
+                    icon : 'fa-play',
                     callback : function () {
                         // emulate default shift-enter behavior
                         that.notebook.execute_cell_and_select_below();
@@ -115,15 +115,15 @@ define([
                 {
                     id : 'interrupt_b',
                     label : 'Interrupt',
-                    icon : 'icon-stop',
+                    icon : 'fa-stop',
                     callback : function () {
                         that.notebook.session.interrupt_kernel();
                         }
                 },
                 {
                     id : 'repeat_b',
                     label : 'Restart Kernel',
-                    icon : 'icon-repeat',
+                    icon : 'fa-repeat',
                     callback : function () {
                         that.notebook.restart_kernel();
                         }

diff --git a/IPython/html/static/notebook/js/toolbar.js b/IPython/html/static/notebook/js/toolbar.js
@@ -66,7 +66,7 @@ define([
                 .addClass('btn btn-default')
                 .attr("title", el.label)
                 .append(
-                    $("<i/>").addClass(el.icon)
+                    $("<i/>").addClass(el.icon).addClass('fa')
                 );
             var id = el.id;
             if( id !== undefined )

diff --git a/IPython/html/static/notebook/less/notificationarea.less b/IPython/html/static/notebook/less/notificationarea.less
@@ -28,19 +28,19 @@
 }
 
 .edit_mode_icon:before {
-     .icon(@pencil);
+    .icon(@fa-var-pencil)
 }
 
 .command_mode_icon:before {
-     .icon(' ');
+    .icon(' ');
 }
 
 .kernel_idle_icon:before {
-     .icon(@circle-blank);
+    .icon(@fa-var-circle-o);
 }
 
 .kernel_busy_icon:before {
-     .icon(@circle);
+    .icon(@fa-var-circle);
 }
 
 
diff --git a/IPython/html/static/style/style.less b/IPython/html/static/style/style.less
@@ -12,7 +12,7 @@
 *
 */
 @import "../components/font-awesome/less/font-awesome.less";
-@FontAwesomePath:    "../components/font-awesome/font";
+@fa-font-path:    "../components/font-awesome/fonts";
 
 // base
 @import "../base/less/style.less";