p6micgy9w
/
monkeyking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6084 from tomspur/fontawesome4

Browse Source 
Update fontawesome to 4.1
pull/37/head
Min RK 12 years ago
parent c9631845fa 36e3f20d5e
commit c007debe3a
12 changed files with 838 additions and 728 deletions
Show Stats Download Patch File Download Diff File

5
IPython/html/static/base/less/page.less
Unescape View File

@ -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;
}

20
IPython/html/static/notebook/js/maintoolbar.js
Unescape View File

@ -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,7 +59,7 @@ define([
{
id : 'cut_b',
label : 'Cut Cell',
icon : 'icon-cut',
icon : 'fa-cut',
callback : function () {
that.notebook.cut_cell();
}
@ -67,7 +67,7 @@ define([
{
id : 'copy_b',
label : 'Copy Cell',
icon : 'icon-copy',
icon : 'fa-copy',
callback : function () {
that.notebook.copy_cell();
}
@ -75,7 +75,7 @@ define([
{
id : 'paste_b',
label : 'Paste Cell Below',
icon : 'icon-paste',
icon : 'fa-paste',
callback : function () {
that.notebook.paste_cell_below();
}
@ -86,7 +86,7 @@ define([
{
id : 'move_up_b',
label : 'Move Cell Up',
icon : 'icon-arrow-up',
icon : 'fa-arrow-up',
callback : function () {
that.notebook.move_cell_up();
}
@ -94,7 +94,7 @@ define([
{
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,7 +115,7 @@ define([
{
id : 'interrupt_b',
label : 'Interrupt',
icon : 'icon-stop',
icon : 'fa-stop',
callback : function () {
that.notebook.session.interrupt_kernel();
}
@ -123,7 +123,7 @@ define([
{
id : 'repeat_b',
label : 'Restart Kernel',
icon : 'icon-repeat',
icon : 'fa-repeat',
callback : function () {
that.notebook.restart_kernel();
}

2
IPython/html/static/notebook/js/toolbar.js
Unescape View File

@ -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 )

8
IPython/html/static/notebook/less/notificationarea.less
Unescape View File

@ -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);
}

2
IPython/html/static/style/style.less
Unescape View File

@ -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";

1495
IPython/html/static/style/style.min.css vendored
View File

File diff suppressed because it is too large Load Diff

4
IPython/html/static/tree/less/tree.less
Unescape View File

@ -141,9 +141,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)
}

12
IPython/html/static/widgets/js/widget_container.js
Unescape View File

@ -88,7 +88,7 @@ define([
that.bring_to_front();
});
this.$close = $('<button />')
.addClass('close icon-remove')
.addClass('close fa fa-remove')
.css('margin-left', '5px')
.appendTo(this.$title_bar)
.click(function(){
@ -96,14 +96,14 @@ define([
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')
@ -116,8 +116,8 @@ define([
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')

2
IPython/html/templates/notebook.html
Unescape View File

@ -258,7 +258,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 %}

8
IPython/html/templates/tree.html
Unescape View File

@ -42,7 +42,7 @@ data-notebook-path="{{notebook_path}}"
<div class="col-sm-4 no-padding tree-buttons">
<span id="notebook_buttons" class="pull-right">
<button id="new_notebook" title="Create new notebook" class="btn btn-default btn-xs">New Notebook</button>
<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="icon-refresh"></i></button>
<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><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 list_header">
<div id="project_name">
<ul class="breadcrumb">
<li><a href="{{breadcrumbs[0][0]}}"><i class="icon-home"></i></a></li>
<li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>
{% for crumb in breadcrumbs[1:] %}
<li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
{% endfor %}
@ -69,7 +69,7 @@ data-notebook-path="{{notebook_path}}"
</div>
<div class="col-sm-4 no-padding tree-buttons">
<span id="running_buttons" class="pull-right">
<button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="icon-refresh"></i></button>
<button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
</span>
</div>
</div>
@ -89,7 +89,7 @@ data-notebook-path="{{notebook_path}}"
</div>
<div class="col-xs-4 no-padding tree-buttons">
<span id="cluster_buttons" class="pull-right">
<button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="icon-refresh"></i></button>
<button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
</span>
</div>
</div>

6
examples/Notebook/Running Code.ipynb
Unescape View File

@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
"signature": "sha256:344aa301a0ce679ebf87e2d1dd206cf3784854cde5fedc34109f38710aef680c"
"signature": "sha256:a52ac3735e5881fe8fe68f88d0113c3b1dca40cb809955db692fedb89b66a7fa"
},
"nbformat": 3,
"nbformat_minor": 0,
@ -46,7 +46,7 @@
"};\n",
"</script>\n",
"\n",
"Run a code cell using `shift-enter` or pressing the <button><i class=\"icon-play\"></i></button> button in the <a href=\"#\" onMouseover=\"hl('#maintoolbar-container', 1)\" onMouseout=\"hl('#maintoolbar-container', 0)\">toolbar</a> above:"
"Run a code cell using `shift-enter` or pressing the <button class='btn btn-default btn-xs'><i class=\"icon-play fa fa-play\"></i></button> button in the <a href=\"#\" onMouseover=\"hl('#maintoolbar-container', 1)\" onMouseout=\"hl('#maintoolbar-container', 0)\">toolbar</a> above:"
]
},
{
@ -91,7 +91,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Code is run in a separate process called the IPython Kernel. The Kernel can be interrupted or restarted. Try running the following cell and then hit the <button><i class='icon-stop'></i></button> button in the <a href=\"#\" onMouseover=\"hl('#maintoolbar-container', 1)\" onMouseout=\"hl('#maintoolbar-container', 0)\">toolbar</a> above."
"Code is run in a separate process called the IPython Kernel. The Kernel can be interrupted or restarted. Try running the following cell and then hit the <button class='btn btn-default btn-xs'><i class='icon-stop fa fa-stop'></i></button> button in the <a href=\"#\" onMouseover=\"hl('#maintoolbar-container', 1)\" onMouseout=\"hl('#maintoolbar-container', 0)\">toolbar</a> above."
]
},
{

2
setupbase.py
Unescape View File

@ -150,7 +150,7 @@ def find_package_data():
pjoin(components, "bootstrap", "js", "bootstrap.min.js"),
pjoin(components, "bootstrap-tour", "build", "css", "bootstrap-tour.min.css"),
pjoin(components, "bootstrap-tour", "build", "js", "bootstrap-tour.min.js"),
pjoin(components, "font-awesome", "font", "*.*"),
pjoin(components, "font-awesome", "fonts", "*.*"),
pjoin(components, "google-caja", "html-css-sanitizer-minified.js"),
pjoin(components, "highlight.js", "build", "highlight.pack.js"),
pjoin(components, "jquery", "jquery.min.js"),

Write Preview
Loading…
Cancel
Save