diff -up ipython-2.4.1/IPython/html/static/base/less/page.less.fontawesome4 ipython-2.4.1/IPython/html/static/base/less/page.less
--- ipython-2.4.1/IPython/html/static/base/less/page.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/base/less/page.less 2015-07-13 16:41:01.717487964 -0600
@@ -95,3 +95,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 -up ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js
--- ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js 2015-07-13 16:41:01.717487964 -0600
@@ -27,7 +27,7 @@ var IPython = (function (IPython) {
{
id : 'save_b',
label : 'Save and Checkpoint',
- icon : 'icon-save',
+ icon : 'fa fa-save',
callback : function () {
IPython.notebook.save_checkpoint();
}
@@ -38,7 +38,7 @@ var IPython = (function (IPython) {
{
id : 'insert_below_b',
label : 'Insert Cell Below',
- icon : 'icon-plus-sign',
+ icon : 'fa fa-plus',
callback : function () {
IPython.notebook.insert_cell_below('code');
IPython.notebook.select_next();
@@ -51,7 +51,7 @@ var IPython = (function (IPython) {
{
id : 'cut_b',
label : 'Cut Cell',
- icon : 'icon-cut',
+ icon : 'fa fa-cut',
callback : function () {
IPython.notebook.cut_cell();
}
@@ -59,7 +59,7 @@ var IPython = (function (IPython) {
{
id : 'copy_b',
label : 'Copy Cell',
- icon : 'icon-copy',
+ icon : 'fa fa-copy',
callback : function () {
IPython.notebook.copy_cell();
}
@@ -67,7 +67,7 @@ var IPython = (function (IPython) {
{
id : 'paste_b',
label : 'Paste Cell Below',
- icon : 'icon-paste',
+ icon : 'fa fa-paste',
callback : function () {
IPython.notebook.paste_cell_below();
}
@@ -78,7 +78,7 @@ var IPython = (function (IPython) {
{
id : 'move_up_b',
label : 'Move Cell Up',
- icon : 'icon-arrow-up',
+ icon : 'fa fa-arrow-up',
callback : function () {
IPython.notebook.move_cell_up();
}
@@ -86,7 +86,7 @@ var IPython = (function (IPython) {
{
id : 'move_down_b',
label : 'Move Cell Down',
- icon : 'icon-arrow-down',
+ icon : 'fa fa-arrow-down',
callback : function () {
IPython.notebook.move_cell_down();
}
@@ -98,7 +98,7 @@ var IPython = (function (IPython) {
{
id : 'run_b',
label : 'Run Cell',
- icon : 'icon-play',
+ icon : 'fa fa-play',
callback : function () {
// emulate default shift-enter behavior
IPython.notebook.execute_cell_and_select_below();
@@ -107,7 +107,7 @@ var IPython = (function (IPython) {
{
id : 'interrupt_b',
label : 'Interrupt',
- icon : 'icon-stop',
+ icon : 'fa fa-stop',
callback : function () {
IPython.notebook.session.interrupt_kernel();
}
@@ -115,7 +115,7 @@ var IPython = (function (IPython) {
{
id : 'repeat_b',
label : 'Restart Kernel',
- icon : 'icon-repeat',
+ icon : 'fa fa-repeat',
callback : function () {
IPython.notebook.restart_kernel();
}
diff -up ipython-2.4.1/IPython/html/static/notebook/js/toolbar.js.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/js/toolbar.js
--- ipython-2.4.1/IPython/html/static/notebook/js/toolbar.js.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/notebook/js/toolbar.js 2015-07-13 16:41:01.717487964 -0600
@@ -75,7 +75,7 @@ var IPython = (function (IPython) {
.addClass('btn')
.attr("title", el.label)
.append(
- $("<i/>").addClass(el.icon)
+ $("<i/>").addClass(el.icon).addClass('fa')
);
var id = el.id;
if( id !== undefined )
diff -up ipython-2.4.1/IPython/html/static/notebook/js/tour.js.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/js/tour.js
--- ipython-2.4.1/IPython/html/static/notebook/js/tour.js.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/notebook/js/tour.js 2015-07-13 16:41:01.718487959 -0600
@@ -89,7 +89,7 @@ var tour_steps = [
onShow: function(tour) { $([IPython.events]).trigger('status_busy.Kernel'); },
content: "The Kernel indicator looks like this when the Kernel is busy.",
}, {
- element: ".icon-stop",
+ element: ".fa-stop",
placement: 'bottom',
title: "Interrupting the Kernel",
onHide: function(tour) { $([IPython.events]).trigger('status_idle.Kernel'); },
@@ -97,7 +97,7 @@ var tour_steps = [
}, {
element: "#notification_kernel",
placement: 'bottom',
- onShow: function(tour) { $('.icon-stop').click(); },
+ onShow: function(tour) { $('.fa-stop').click(); },
title: "Notification Area",
content: "Messages in response to user actions (Save, Interrupt, etc) appear here."
}, {
@@ -112,18 +112,18 @@ var tour_steps = [
var tour_style = "<div class='popover tour' style='position:relative'>\
<div class='arrow'></div>\
<div style='position:absolute; top:7px; right:7px'>\
- <button class='btn btn-sm icon-remove' data-role='end'></button></div>\
+ <button class='btn btn-sm fa fa-times' data-role='end'></button></div>\
<h3 class='popover-title'></h3>\
<div class='popover-content'></div>\
<div class='popover-navigation'>\
- <button class='btn btn-default icon-step-backward' data-role='prev'></button>\
- <button class='btn btn-default icon-step-forward pull-right' data-role='next'></button>\
- <button id='tour-pause' class='btn btn-sm btn-default icon-pause' data-resume-text='' data-pause-text='' data-role='pause-resume'></button>\
+ <button class='btn btn-default fa fa-step-backward' data-role='prev'></button>\
+ <button class='btn btn-default fa fa-step-forward pull-right' data-role='next'></button>\
+ <button id='tour-pause' class='btn btn-sm btn-default fa fa-pause' data-resume-text='' data-pause-text='' data-role='pause-resume'></button>\
</div>\
</div>";
var command_icon_hack = function() {$('#modal_indicator').css('min-height', 20);}
-var toggle_pause_play = function () { $('#tour-pause').toggleClass('icon-pause icon-play'); };
+var toggle_pause_play = function () { $('#tour-pause').toggleClass('fa-pause fa-play'); };
var edit_mode = function() {
IPython.notebook.focus_cell();
IPython.notebook.edit_mode();
diff -up ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less
--- ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less 2015-07-13 16:41:01.718487959 -0600
@@ -17,7 +17,7 @@
}
.edit_mode_icon:before {
- .icon(@pencil);
+ .icon(@fa-var-pencil);
}
.command_mode_icon:before {
@@ -25,11 +25,11 @@
}
.kernel_idle_icon:before {
- .icon(@circle-blank);
+ .icon(@fa-var-circle-o);
}
.kernel_busy_icon:before {
- .icon(@circle);
+ .icon(@fa-var-circle);
}
diff -up ipython-2.4.1/IPython/html/static/style/style.less.fontawesome4 ipython-2.4.1/IPython/html/static/style/style.less
--- ipython-2.4.1/IPython/html/static/style/style.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/style/style.less 2015-07-13 16:41:01.718487959 -0600
@@ -4,7 +4,7 @@
// Font-Awesome
@import "../components/font-awesome/less/font-awesome.less";
-@FontAwesomePath: "../components/font-awesome/font";
+@fa-font-path: "../components/font-awesome/font";
// base
@import "../base/less/style.less";
diff -up ipython-2.4.1/IPython/html/static/tree/less/tree.less.fontawesome4 ipython-2.4.1/IPython/html/static/tree/less/tree.less
--- ipython-2.4.1/IPython/html/static/tree/less/tree.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/tree/less/tree.less 2015-07-13 16:41:01.718487959 -0600
@@ -26,7 +26,7 @@ ul.breadcrumb {
a:focus, a:hover {
text-decoration: none;
}
- i.icon-home {
+ i.fa-home {
font-size: 16px;
margin-right: 4px;
}
@@ -128,9 +128,9 @@ input.engine_num_input {
}
.folder_icon:before {
- .icon(@folder-close-alt)
+ .icon(@fa-var-folder-o)
}
.notebook_icon:before {
- .icon(@book)
+ .icon(@fa-var-book)
}
diff -up ipython-2.4.1/IPython/html/static/widgets/js/widget_container.js.fontawesome4 ipython-2.4.1/IPython/html/static/widgets/js/widget_container.js
--- ipython-2.4.1/IPython/html/static/widgets/js/widget_container.js.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/static/widgets/js/widget_container.js 2015-07-13 16:41:01.718487959 -0600
@@ -90,7 +90,7 @@ define(["widgets/js/widget"], function(W
that.bring_to_front();
});
this.$close = $('<button />')
- .addClass('close icon-remove')
+ .addClass('close fa fa-times')
.css('margin-left', '5px')
.appendTo(this.$title_bar)
.click(function(){
@@ -98,14 +98,14 @@ define(["widgets/js/widget"], function(W
event.stopPropagation();
});
this.$minimize = $('<button />')
- .addClass('close icon-arrow-down')
+ .addClass('close fa fa-arrow-down')
.appendTo(this.$title_bar)
.click(function(){
that.popped_out = !that.popped_out;
if (!that.popped_out) {
that.$minimize
- .removeClass('icon-arrow-down')
- .addClass('icon-arrow-up');
+ .removeClass('fa fa-arrow-down')
+ .addClass('fa fa-arrow-up');
that.$window
.draggable('destroy')
@@ -118,8 +118,8 @@ define(["widgets/js/widget"], function(W
that.$close.hide();
} else {
that.$minimize
- .addClass('icon-arrow-down')
- .removeClass('icon-arrow-up');
+ .addClass('fa fa-arrow-down')
+ .removeClass('fa fa-arrow-up');
that.$window
.removeClass('docked-widget-modal')
diff -up ipython-2.4.1/IPython/html/templates/notebook.html.fontawesome4 ipython-2.4.1/IPython/html/templates/notebook.html
--- ipython-2.4.1/IPython/html/templates/notebook.html.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/templates/notebook.html 2015-07-13 16:41:01.719487955 -0600
@@ -242,7 +242,7 @@ class="notebook_app"
{% for helplinks in sections %}
{% for link in helplinks %}
<li><a href="{{link[0]}}" {{'target="_blank" title="Opens in a new window"' if link[2]}}>
- {{'<i class="icon-external-link menu-icon pull-right"></i>' if link[2]}}
+ {{'<i class="fa fa-external-link menu-icon pull-right"></i>' if link[2]}}
{{link[1]}}
</a></li>
{% endfor %}
diff -up ipython-2.4.1/IPython/html/templates/tree.html.fontawesome4 ipython-2.4.1/IPython/html/templates/tree.html
--- ipython-2.4.1/IPython/html/templates/tree.html.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/html/templates/tree.html 2015-07-13 16:41:01.719487955 -0600
@@ -42,7 +42,7 @@ data-notebook-path="{{notebook_path}}"
<div class="span4 clearfix">
<span id="notebook_buttons" class="pull-right">
<button id="new_notebook" title="Create new notebook" class="btn btn-small">New Notebook</button>
- <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-small"><i class="icon-refresh"></i></button>
+ <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-small"><i class="fa fa-refresh"></i></button>
</span>
</div>
</div>
@@ -51,7 +51,7 @@ data-notebook-path="{{notebook_path}}"
<div id="notebook_list_header" class="row-fluid list_header">
<div id="project_name">
<ul class="breadcrumb">
- <li><a href="{{breadcrumbs[0][0]}}"><i class="icon-home"></i></a><span>/</span></li>
+ <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a><span>/</span></li>
{% for crumb in breadcrumbs[1:] %}
<li><a href="{{crumb[0]}}">{{crumb[1]}}</a> <span>/</span></li>
{% endfor %}
@@ -69,7 +69,7 @@ data-notebook-path="{{notebook_path}}"
</div>
<div class="span4" class="clearfix">
<span id="running_buttons" class="pull-right">
- <button id="refresh_running_list" title="Refresh running list" class="btn btn-small"><i class="icon-refresh"></i></button>
+ <button id="refresh_running_list" title="Refresh running list" class="btn btn-small"><i class="fa fa-refresh"></i></button>
</span>
</div>
</div>
@@ -89,7 +89,7 @@ data-notebook-path="{{notebook_path}}"
</div>
<div class="span4" class="clearfix">
<span id="cluster_buttons" class="pull-right">
- <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-small"><i class="icon-refresh"></i></button>
+ <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-small"><i class="fa fa-refresh"></i></button>
</span>
</div>
</div>
diff -up ipython-2.4.1/IPython/nbconvert/templates/html/slides_reveal.tpl.fontawesome4 ipython-2.4.1/IPython/nbconvert/templates/html/slides_reveal.tpl
--- ipython-2.4.1/IPython/nbconvert/templates/html/slides_reveal.tpl.fontawesome4 2015-02-09 15:59:57.000000000 -0700
+++ ipython-2.4.1/IPython/nbconvert/templates/html/slides_reveal.tpl 2015-07-13 16:41:01.719487955 -0600
@@ -72,7 +72,7 @@ if( window.location.search.match( /print
<![endif]-->
<!-- Get Font-awesome from cdn -->
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css">
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css">
{% for css in resources.inlining.css -%}
<style type="text/css">
@@ -195,4 +195,4 @@ Reveal.addEventListener( 'slidechanged',
{% block footer %}
</html>
-{% endblock footer %}
\ No newline at end of file
+{% endblock footer %}
diff -up ipython-2.4.1/setupbase.py.fontawesome4 ipython-2.4.1/setupbase.py