Merge pull request #6084 from tomspur/fontawesome4

Update fontawesome to 4.1

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

IPython/html/static/components

@@ -1,1 +1,1
-Subproject commit 7c07f705d4f068828fb76f74ac7d4d355aea06f9
+Subproject commit a80ac7a2f6d045e3903d3c9e189a10cc96255b05

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,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();
                         }

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 )

IPython/html/static/notebook/less/notificationarea.less

@@ -28,7 +28,7
 }
 
 .edit_mode_icon:before {
-     .icon(@pencil);
+    .icon(@fa-var-pencil)
 }
 
 .command_mode_icon:before {
@@ -36,11 +36,11
 }
 
 .kernel_idle_icon:before {
-     .icon(@circle-blank);
+    .icon(@fa-var-circle-o);
 }
 
 .kernel_busy_icon:before {
-     .icon(@circle);
+    .icon(@fa-var-circle);
 }
 
 

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

IPython/html/static/style/style.min.css

@@ -5785,147 +5785,71 button.close {
 *
 */
 /*!
- *  Font Awesome 3.2.1
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: [e-mail]
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ *  Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../components/font-awesome/font/fontawesome-webfont.eot?v=3.2.1');
-  src: url('../components/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../components/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../components/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../components/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: url('../components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0');
+  src: url('../components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('../components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('../components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('../components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
-/* FONT AWESOME CORE
- * -------------------------- */
-[class^="icon-"],
-[class*=" icon-"] {
+.fa {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
-}
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-  text-decoration: inherit;
-  display: inline-block;
-  speak: none;
+  -moz-osx-font-smoothing: grayscale;
 }
 /* makes the font 33% larger relative to the icon container */
-.icon-large:before {
-  vertical-align: -10%;
+.fa-lg {
   font-size: 1.33333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
 }
-/* makes sure icons active on rollover in links */
-a [class^="icon-"],
-a [class*=" icon-"] {
-  display: inline;
+.fa-2x {
+  font-size: 2em;
 }
-/* increased font size for icon-large */
-[class^="icon-"].icon-fixed-width,
-[class*=" icon-"].icon-fixed-width {
-  display: inline-block;
-  width: 1.14285714em;
-  text-align: right;
-  padding-right: 0.28571429em;
+.fa-3x {
+  font-size: 3em;
+}
+.fa-4x {
+  font-size: 4em;
 }
-[class^="icon-"].icon-fixed-width.icon-large,
-[class*=" icon-"].icon-fixed-width.icon-large {
-  width: 1.42857143em;
+.fa-5x {
+  font-size: 5em;
 }
-.icons-ul {
+.fa-fw {
+  width: 1.28571429em;
+  text-align: center;
+}
+.fa-ul {
+  padding-left: 0;
   margin-left: 2.14285714em;
   list-style-type: none;
 }
-.icons-ul > li {
+.fa-ul > li {
   position: relative;
 }
-.icons-ul .icon-li {
+.fa-li {
   position: absolute;
   left: -2.14285714em;
   width: 2.14285714em;
+  top: 0.14285714em;
   text-align: center;
-  line-height: inherit;
 }
-[class^="icon-"].hide,
-[class*=" icon-"].hide {
-  display: none;
+.fa-li.fa-lg {
+  left: -1.85714286em;
 }
-.icon-muted {
-  color: #eeeeee;
-}
-.icon-light {
-  color: #ffffff;
-}
-.icon-dark {
-  color: #333333;
-}
-.icon-border {
-  border: solid 1px #eeeeee;
+.fa-border {
   padding: .2em .25em .15em;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.icon-2x {
-  font-size: 2em;
-}
-.icon-2x.icon-border {
-  border-width: 2px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.icon-3x {
-  font-size: 3em;
-}
-.icon-3x.icon-border {
-  border-width: 3px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.icon-4x {
-  font-size: 4em;
-}
-.icon-4x.icon-border {
-  border-width: 4px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-}
-.icon-5x {
-  font-size: 5em;
-}
-.icon-5x.icon-border {
-  border-width: 5px;
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
+  border: solid 0.08em #eeeeee;
+  border-radius: .1em;
 }
 .pull-right {
   float: right;
@@ -5933,147 +5857,18 a [class*=" icon-"] {
 .pull-left {
   float: left;
 }
-[class^="icon-"].pull-left,
-[class*=" icon-"].pull-left {
+.fa.pull-left {
   margin-right: .3em;
 }
-[class^="icon-"].pull-right,
-[class*=" icon-"].pull-right {
+.fa.pull-right {
   margin-left: .3em;
 }
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline;
-  width: auto;
-  height: auto;
-  line-height: normal;
-  vertical-align: baseline;
-  background-image: none;
-  background-position: 0% 0%;
-  background-repeat: repeat;
-  margin-top: 0;
-}
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: none;
-}
-/* keeps Bootstrap styles with and without icons the same */
-.btn [class^="icon-"].icon-large,
-.nav [class^="icon-"].icon-large,
-.btn [class*=" icon-"].icon-large,
-.nav [class*=" icon-"].icon-large {
-  line-height: .9em;
-}
-.btn [class^="icon-"].icon-spin,
-.nav [class^="icon-"].icon-spin,
-.btn [class*=" icon-"].icon-spin,
-.nav [class*=" icon-"].icon-spin {
-  display: inline-block;
-}
-.nav-tabs [class^="icon-"],
-.nav-pills [class^="icon-"],
-.nav-tabs [class*=" icon-"],
-.nav-pills [class*=" icon-"],
-.nav-tabs [class^="icon-"].icon-large,
-.nav-pills [class^="icon-"].icon-large,
-.nav-tabs [class*=" icon-"].icon-large,
-.nav-pills [class*=" icon-"].icon-large {
-  line-height: .9em;
-}
-.btn [class^="icon-"].pull-left.icon-2x,
-.btn [class*=" icon-"].pull-left.icon-2x,
-.btn [class^="icon-"].pull-right.icon-2x,
-.btn [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .18em;
-}
-.btn [class^="icon-"].icon-spin.icon-large,
-.btn [class*=" icon-"].icon-spin.icon-large {
-  line-height: .8em;
-}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-small [class^="icon-"].pull-right.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .25em;
-}
-.btn.btn-large [class^="icon-"],
-.btn.btn-large [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .05em;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
-  margin-right: .2em;
-}
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
-  margin-left: .2em;
-}
-/* Fixes alignment in nav lists */
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  line-height: inherit;
-}
-/* EXTRAS
- * -------------------------- */
-/* Stacked and layered icon */
-.icon-stack {
-  position: relative;
-  display: inline-block;
-  width: 2em;
-  height: 2em;
-  line-height: 2em;
-  vertical-align: -35%;
-}
-.icon-stack [class^="icon-"],
-.icon-stack [class*=" icon-"] {
-  display: block;
-  text-align: center;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  font-size: 1em;
-  line-height: inherit;
-  *line-height: 2em;
-}
-.icon-stack .icon-stack-base {
-  font-size: 2em;
-  *line-height: 1em;
-}
-/* Animated rotating icon */
-.icon-spin {
-  display: inline-block;
+.fa-spin {
+  -webkit-animation: spin 2s infinite linear;
   -moz-animation: spin 2s infinite linear;
   -o-animation: spin 2s infinite linear;
-  -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
-/* Prevent stack and spinners from being taken inline when inside a link */
-a .icon-stack,
-a .icon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
 @-moz-keyframes spin {
   0% {
     -moz-transform: rotate(0deg);
@@ -6098,1171 +5893,1463 a .icon-spin {
     -o-transform: rotate(359deg);
   }
 }
-@-ms-keyframes spin {
-  0% {
-    -ms-transform: rotate(0deg);
-  }
-  100% {
-    -ms-transform: rotate(359deg);
-  }
-}
 @keyframes spin {
   0% {
+    -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
   }
   100% {
+    -webkit-transform: rotate(359deg);
     transform: rotate(359deg);
   }
 }
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
+.fa-rotate-90 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
   -webkit-transform: rotate(90deg);
   -moz-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   -o-transform: rotate(90deg);
   transform: rotate(90deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
 }
-.icon-rotate-180:before {
+.fa-rotate-180 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
   -webkit-transform: rotate(180deg);
   -moz-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
 }
-.icon-rotate-270:before {
+.fa-rotate-270 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
   -webkit-transform: rotate(270deg);
   -moz-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   -o-transform: rotate(270deg);
   transform: rotate(270deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
 }
-.icon-flip-horizontal:before {
+.fa-flip-horizontal {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
   -webkit-transform: scale(-1, 1);
   -moz-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   -o-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
-.icon-flip-vertical:before {
+.fa-flip-vertical {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
   -webkit-transform: scale(1, -1);
   -moz-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   -o-transform: scale(1, -1);
   transform: scale(1, -1);
 }
-/* ensure rotation occurs inside anchor tags */
-a .icon-rotate-90:before,
-a .icon-rotate-180:before,
-a .icon-rotate-270:before,
-a .icon-flip-horizontal:before,
-a .icon-flip-vertical:before {
+.fa-stack {
+  position: relative;
   display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.fa-inverse {
+  color: #ffffff;
 }
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
-.icon-glass:before {
+.fa-glass:before {
   content: "\f000";
 }
-.icon-music:before {
+.fa-music:before {
   content: "\f001";
 }
-.icon-search:before {
+.fa-search:before {
   content: "\f002";
 }
-.icon-envelope-alt:before {
+.fa-envelope-o:before {
   content: "\f003";
 }
-.icon-heart:before {
+.fa-heart:before {
   content: "\f004";
 }
-.icon-star:before {
+.fa-star:before {
   content: "\f005";
 }
-.icon-star-empty:before {
+.fa-star-o:before {
   content: "\f006";
 }
-.icon-user:before {
+.fa-user:before {
   content: "\f007";
 }
-.icon-film:before {
+.fa-film:before {
   content: "\f008";
 }
-.icon-th-large:before {
+.fa-th-large:before {
   content: "\f009";
 }
-.icon-th:before {
+.fa-th:before {
   content: "\f00a";
 }
-.icon-th-list:before {
+.fa-th-list:before {
   content: "\f00b";
 }
-.icon-ok:before {
+.fa-check:before {
   content: "\f00c";
 }
-.icon-remove:before {
+.fa-times:before {
   content: "\f00d";
 }
-.icon-zoom-in:before {
+.fa-search-plus:before {
   content: "\f00e";
 }
-.icon-zoom-out:before {
+.fa-search-minus:before {
   content: "\f010";
 }
-.icon-power-off:before,
-.icon-off:before {
+.fa-power-off:before {
   content: "\f011";
 }
-.icon-signal:before {
+.fa-signal:before {
   content: "\f012";
 }
-.icon-gear:before,
-.icon-cog:before {
+.fa-gear:before,
+.fa-cog:before {
   content: "\f013";
 }
-.icon-trash:before {
+.fa-trash-o:before {
   content: "\f014";
 }
-.icon-home:before {
+.fa-home:before {
   content: "\f015";
 }
-.icon-file-alt:before {
+.fa-file-o:before {
   content: "\f016";
 }
-.icon-time:before {
+.fa-clock-o:before {
   content: "\f017";
 }
-.icon-road:before {
+.fa-road:before {
   content: "\f018";
 }
-.icon-download-alt:before {
+.fa-download:before {
   content: "\f019";
 }
-.icon-download:before {
+.fa-arrow-circle-o-down:before {
   content: "\f01a";
 }
-.icon-upload:before {
+.fa-arrow-circle-o-up:before {
   content: "\f01b";
 }
-.icon-inbox:before {
+.fa-inbox:before {
   content: "\f01c";
 }
-.icon-play-circle:before {
+.fa-play-circle-o:before {
   content: "\f01d";
 }
-.icon-rotate-right:before,
-.icon-repeat:before {
+.fa-rotate-right:before,
+.fa-repeat:before {
   content: "\f01e";
 }
-.icon-refresh:before {
+.fa-refresh:before {
   content: "\f021";
 }
-.icon-list-alt:before {
+.fa-list-alt:before {
   content: "\f022";
 }
-.icon-lock:before {
+.fa-lock:before {
   content: "\f023";
 }
-.icon-flag:before {
+.fa-flag:before {
   content: "\f024";
 }
-.icon-headphones:before {
+.fa-headphones:before {
   content: "\f025";
 }
-.icon-volume-off:before {
+.fa-volume-off:before {
   content: "\f026";
 }
-.icon-volume-down:before {
+.fa-volume-down:before {
   content: "\f027";
 }
-.icon-volume-up:before {
+.fa-volume-up:before {
   content: "\f028";
 }
-.icon-qrcode:before {
+.fa-qrcode:before {
   content: "\f029";
 }
-.icon-barcode:before {
+.fa-barcode:before {
   content: "\f02a";
 }
-.icon-tag:before {
+.fa-tag:before {
   content: "\f02b";
 }
-.icon-tags:before {
+.fa-tags:before {
   content: "\f02c";
 }
-.icon-book:before {
+.fa-book:before {
   content: "\f02d";
 }
-.icon-bookmark:before {
+.fa-bookmark:before {
   content: "\f02e";
 }
-.icon-print:before {
+.fa-print:before {
   content: "\f02f";
 }
-.icon-camera:before {
+.fa-camera:before {
   content: "\f030";
 }
-.icon-font:before {
+.fa-font:before {
   content: "\f031";
 }
-.icon-bold:before {
+.fa-bold:before {
   content: "\f032";
 }
-.icon-italic:before {
+.fa-italic:before {
   content: "\f033";
 }
-.icon-text-height:before {
+.fa-text-height:before {
   content: "\f034";
 }
-.icon-text-width:before {
+.fa-text-width:before {
   content: "\f035";
 }
-.icon-align-left:before {
+.fa-align-left:before {
   content: "\f036";
 }
-.icon-align-center:before {
+.fa-align-center:before {
   content: "\f037";
 }
-.icon-align-right:before {
+.fa-align-right:before {
   content: "\f038";
 }
-.icon-align-justify:before {
+.fa-align-justify:before {
   content: "\f039";
 }
-.icon-list:before {
+.fa-list:before {
   content: "\f03a";
 }
-.icon-indent-left:before {
+.fa-dedent:before,
+.fa-outdent:before {
   content: "\f03b";
 }
-.icon-indent-right:before {
+.fa-indent:before {
   content: "\f03c";
 }
-.icon-facetime-video:before {
+.fa-video-camera:before {
   content: "\f03d";
 }
-.icon-picture:before {
+.fa-photo:before,
+.fa-image:before,
+.fa-picture-o:before {
   content: "\f03e";
 }
-.icon-pencil:before {
+.fa-pencil:before {
   content: "\f040";
 }
-.icon-map-marker:before {
+.fa-map-marker:before {
   content: "\f041";
 }
-.icon-adjust:before {
+.fa-adjust:before {
   content: "\f042";
 }
-.icon-tint:before {
+.fa-tint:before {
   content: "\f043";
 }
-.icon-edit:before {
+.fa-edit:before,
+.fa-pencil-square-o:before {
   content: "\f044";
 }
-.icon-share:before {
+.fa-share-square-o:before {
   content: "\f045";
 }
-.icon-check:before {
+.fa-check-square-o:before {
   content: "\f046";
 }
-.icon-move:before {
+.fa-arrows:before {
   content: "\f047";
 }
-.icon-step-backward:before {
+.fa-step-backward:before {
   content: "\f048";
 }
-.icon-fast-backward:before {
+.fa-fast-backward:before {
   content: "\f049";
 }
-.icon-backward:before {
+.fa-backward:before {
   content: "\f04a";
 }
-.icon-play:before {
+.fa-play:before {
   content: "\f04b";
 }
-.icon-pause:before {
+.fa-pause:before {
   content: "\f04c";
 }
-.icon-stop:before {
+.fa-stop:before {
   content: "\f04d";
 }
-.icon-forward:before {
+.fa-forward:before {
   content: "\f04e";
 }
-.icon-fast-forward:before {
+.fa-fast-forward:before {
   content: "\f050";
 }
-.icon-step-forward:before {
+.fa-step-forward:before {
   content: "\f051";
 }
-.icon-eject:before {
+.fa-eject:before {
   content: "\f052";
 }
-.icon-chevron-left:before {
+.fa-chevron-left:before {
   content: "\f053";
 }
-.icon-chevron-right:before {
+.fa-chevron-right:before {
   content: "\f054";
 }
-.icon-plus-sign:before {
+.fa-plus-circle:before {
   content: "\f055";
 }
-.icon-minus-sign:before {
+.fa-minus-circle:before {
   content: "\f056";
 }
-.icon-remove-sign:before {
+.fa-times-circle:before {
   content: "\f057";
 }
-.icon-ok-sign:before {
+.fa-check-circle:before {
   content: "\f058";
 }
-.icon-question-sign:before {
+.fa-question-circle:before {
   content: "\f059";
 }
-.icon-info-sign:before {
+.fa-info-circle:before {
   content: "\f05a";
 }
-.icon-screenshot:before {
+.fa-crosshairs:before {
   content: "\f05b";
 }
-.icon-remove-circle:before {
+.fa-times-circle-o:before {
   content: "\f05c";
 }
-.icon-ok-circle:before {
+.fa-check-circle-o:before {
   content: "\f05d";
 }
-.icon-ban-circle:before {
+.fa-ban:before {
   content: "\f05e";
 }
-.icon-arrow-left:before {
+.fa-arrow-left:before {
   content: "\f060";
 }
-.icon-arrow-right:before {
+.fa-arrow-right:before {
   content: "\f061";
 }
-.icon-arrow-up:before {
+.fa-arrow-up:before {
   content: "\f062";
 }
-.icon-arrow-down:before {
+.fa-arrow-down:before {
   content: "\f063";
 }
-.icon-mail-forward:before,
-.icon-share-alt:before {
+.fa-mail-forward:before,
+.fa-share:before {
   content: "\f064";
 }
-.icon-resize-full:before {
+.fa-expand:before {
   content: "\f065";
 }
-.icon-resize-small:before {
+.fa-compress:before {
   content: "\f066";
 }
-.icon-plus:before {
+.fa-plus:before {
   content: "\f067";
 }
-.icon-minus:before {
+.fa-minus:before {
   content: "\f068";
 }
-.icon-asterisk:before {
+.fa-asterisk:before {
   content: "\f069";
 }
-.icon-exclamation-sign:before {
+.fa-exclamation-circle:before {
   content: "\f06a";
 }
-.icon-gift:before {
+.fa-gift:before {
   content: "\f06b";
 }
-.icon-leaf:before {
+.fa-leaf:before {
   content: "\f06c";
 }
-.icon-fire:before {
+.fa-fire:before {
   content: "\f06d";
 }
-.icon-eye-open:before {
+.fa-eye:before {
   content: "\f06e";
 }
-.icon-eye-close:before {
+.fa-eye-slash:before {
   content: "\f070";
 }
-.icon-warning-sign:before {
+.fa-warning:before,
+.fa-exclamation-triangle:before {
   content: "\f071";
 }
-.icon-plane:before {
+.fa-plane:before {
   content: "\f072";
 }
-.icon-calendar:before {
+.fa-calendar:before {
   content: "\f073";
 }
-.icon-random:before {
+.fa-random:before {
   content: "\f074";
 }
-.icon-comment:before {
+.fa-comment:before {
   content: "\f075";
 }
-.icon-magnet:before {
+.fa-magnet:before {
   content: "\f076";
 }
-.icon-chevron-up:before {
+.fa-chevron-up:before {
   content: "\f077";
 }
-.icon-chevron-down:before {
+.fa-chevron-down:before {
   content: "\f078";
 }
-.icon-retweet:before {
+.fa-retweet:before {
   content: "\f079";
 }
-.icon-shopping-cart:before {
+.fa-shopping-cart:before {
   content: "\f07a";
 }
-.icon-folder-close:before {
+.fa-folder:before {
   content: "\f07b";
 }
-.icon-folder-open:before {
+.fa-folder-open:before {
   content: "\f07c";
 }
-.icon-resize-vertical:before {
+.fa-arrows-v:before {
   content: "\f07d";
 }
-.icon-resize-horizontal:before {
+.fa-arrows-h:before {
   content: "\f07e";
 }
-.icon-bar-chart:before {
+.fa-bar-chart-o:before {
   content: "\f080";
 }
-.icon-twitter-sign:before {
+.fa-twitter-square:before {
   content: "\f081";
 }
-.icon-facebook-sign:before {
+.fa-facebook-square:before {
   content: "\f082";
 }
-.icon-camera-retro:before {
+.fa-camera-retro:before {
   content: "\f083";
 }
-.icon-key:before {
+.fa-key:before {
   content: "\f084";
 }
-.icon-gears:before,
-.icon-cogs:before {
+.fa-gears:before,
+.fa-cogs:before {
   content: "\f085";
 }
-.icon-comments:before {
+.fa-comments:before {
   content: "\f086";
 }
-.icon-thumbs-up-alt:before {
+.fa-thumbs-o-up:before {
   content: "\f087";
 }
-.icon-thumbs-down-alt:before {
+.fa-thumbs-o-down:before {
   content: "\f088";
 }
-.icon-star-half:before {
+.fa-star-half:before {
   content: "\f089";
 }
-.icon-heart-empty:before {
+.fa-heart-o:before {
   content: "\f08a";
 }
-.icon-signout:before {
+.fa-sign-out:before {
   content: "\f08b";
 }
-.icon-linkedin-sign:before {
+.fa-linkedin-square:before {
   content: "\f08c";
 }
-.icon-pushpin:before {
+.fa-thumb-tack:before {
   content: "\f08d";
 }
-.icon-external-link:before {
+.fa-external-link:before {
   content: "\f08e";
 }
-.icon-signin:before {
+.fa-sign-in:before {
   content: "\f090";
 }
-.icon-trophy:before {
+.fa-trophy:before {
   content: "\f091";
 }
-.icon-github-sign:before {
+.fa-github-square:before {
   content: "\f092";
 }
-.icon-upload-alt:before {
+.fa-upload:before {
   content: "\f093";
 }
-.icon-lemon:before {
+.fa-lemon-o:before {
   content: "\f094";
 }
-.icon-phone:before {
+.fa-phone:before {
   content: "\f095";
 }
-.icon-unchecked:before,
-.icon-check-empty:before {
+.fa-square-o:before {
   content: "\f096";
 }
-.icon-bookmark-empty:before {
+.fa-bookmark-o:before {
   content: "\f097";
 }
-.icon-phone-sign:before {
+.fa-phone-square:before {
   content: "\f098";
 }
-.icon-twitter:before {
+.fa-twitter:before {
   content: "\f099";
 }
-.icon-facebook:before {
+.fa-facebook:before {
   content: "\f09a";
 }
-.icon-github:before {
+.fa-github:before {
   content: "\f09b";
 }
-.icon-unlock:before {
+.fa-unlock:before {
   content: "\f09c";
 }
-.icon-credit-card:before {
+.fa-credit-card:before {
   content: "\f09d";
 }
-.icon-rss:before {
+.fa-rss:before {
   content: "\f09e";
 }
-.icon-hdd:before {
+.fa-hdd-o:before {
   content: "\f0a0";
 }
-.icon-bullhorn:before {
+.fa-bullhorn:before {
   content: "\f0a1";
 }
-.icon-bell:before {
-  content: "\f0a2";
+.fa-bell:before {
+  content: "\f0f3";
 }
-.icon-certificate:before {
+.fa-certificate:before {
   content: "\f0a3";
 }
-.icon-hand-right:before {
+.fa-hand-o-right:before {
   content: "\f0a4";
 }
-.icon-hand-left:before {
+.fa-hand-o-left:before {
   content: "\f0a5";
 }
-.icon-hand-up:before {
+.fa-hand-o-up:before {
   content: "\f0a6";
 }
-.icon-hand-down:before {
+.fa-hand-o-down:before {
   content: "\f0a7";
 }
-.icon-circle-arrow-left:before {
+.fa-arrow-circle-left:before {
   content: "\f0a8";
 }
-.icon-circle-arrow-right:before {
+.fa-arrow-circle-right:before {
   content: "\f0a9";
 }
-.icon-circle-arrow-up:before {
+.fa-arrow-circle-up:before {
   content: "\f0aa";
 }
-.icon-circle-arrow-down:before {
+.fa-arrow-circle-down:before {
   content: "\f0ab";
 }
-.icon-globe:before {
+.fa-globe:before {
   content: "\f0ac";
 }
-.icon-wrench:before {
+.fa-wrench:before {
   content: "\f0ad";
 }
-.icon-tasks:before {
+.fa-tasks:before {
   content: "\f0ae";
 }
-.icon-filter:before {
+.fa-filter:before {
   content: "\f0b0";
 }
-.icon-briefcase:before {
+.fa-briefcase:before {
   content: "\f0b1";
 }
-.icon-fullscreen:before {
+.fa-arrows-alt:before {
   content: "\f0b2";
 }
-.icon-group:before {
+.fa-group:before,
+.fa-users:before {
   content: "\f0c0";
 }
-.icon-link:before {
+.fa-chain:before,
+.fa-link:before {
   content: "\f0c1";
 }
-.icon-cloud:before {
+.fa-cloud:before {
   content: "\f0c2";
 }
-.icon-beaker:before {
+.fa-flask:before {
   content: "\f0c3";
 }
-.icon-cut:before {
+.fa-cut:before,
+.fa-scissors:before {
   content: "\f0c4";
 }
-.icon-copy:before {
+.fa-copy:before,
+.fa-files-o:before {
   content: "\f0c5";
 }
-.icon-paperclip:before,
-.icon-paper-clip:before {
+.fa-paperclip:before {
   content: "\f0c6";
 }
-.icon-save:before {
+.fa-save:before,
+.fa-floppy-o:before {
   content: "\f0c7";
 }
-.icon-sign-blank:before {
+.fa-square:before {
   content: "\f0c8";
 }
-.icon-reorder:before {
+.fa-navicon:before,
+.fa-reorder:before,
+.fa-bars:before {
   content: "\f0c9";
 }
-.icon-list-ul:before {
+.fa-list-ul:before {
   content: "\f0ca";
 }
-.icon-list-ol:before {
+.fa-list-ol:before {
   content: "\f0cb";
 }
-.icon-strikethrough:before {
+.fa-strikethrough:before {
   content: "\f0cc";
 }
-.icon-underline:before {
+.fa-underline:before {
   content: "\f0cd";
 }
-.icon-table:before {
+.fa-table:before {
   content: "\f0ce";
 }
-.icon-magic:before {
+.fa-magic:before {
   content: "\f0d0";
 }
-.icon-truck:before {
+.fa-truck:before {
   content: "\f0d1";
 }
-.icon-pinterest:before {
+.fa-pinterest:before {
   content: "\f0d2";
 }
-.icon-pinterest-sign:before {
+.fa-pinterest-square:before {
   content: "\f0d3";
 }
-.icon-google-plus-sign:before {
+.fa-google-plus-square:before {
   content: "\f0d4";
 }
-.icon-google-plus:before {
+.fa-google-plus:before {
   content: "\f0d5";
 }
-.icon-money:before {
+.fa-money:before {
   content: "\f0d6";
 }
-.icon-caret-down:before {
+.fa-caret-down:before {
   content: "\f0d7";
 }
-.icon-caret-up:before {
+.fa-caret-up:before {
   content: "\f0d8";
 }
-.icon-caret-left:before {
+.fa-caret-left:before {
   content: "\f0d9";
 }
-.icon-caret-right:before {
+.fa-caret-right:before {
   content: "\f0da";
 }
-.icon-columns:before {
+.fa-columns:before {
   content: "\f0db";
 }
-.icon-sort:before {
+.fa-unsorted:before,
+.fa-sort:before {
   content: "\f0dc";
 }
-.icon-sort-down:before {
+.fa-sort-down:before,
+.fa-sort-desc:before {
   content: "\f0dd";
 }
-.icon-sort-up:before {
+.fa-sort-up:before,
+.fa-sort-asc:before {
   content: "\f0de";
 }
-.icon-envelope:before {
+.fa-envelope:before {
   content: "\f0e0";
 }
-.icon-linkedin:before {
+.fa-linkedin:before {
   content: "\f0e1";
 }
-.icon-rotate-left:before,
-.icon-undo:before {
+.fa-rotate-left:before,
+.fa-undo:before {
   content: "\f0e2";
 }
-.icon-legal:before {
+.fa-legal:before,
+.fa-gavel:before {
   content: "\f0e3";
 }
-.icon-dashboard:before {
+.fa-dashboard:before,
+.fa-tachometer:before {
   content: "\f0e4";
 }
-.icon-comment-alt:before {
+.fa-comment-o:before {
   content: "\f0e5";
 }
-.icon-comments-alt:before {
+.fa-comments-o:before {
   content: "\f0e6";
 }
-.icon-bolt:before {
+.fa-flash:before,
+.fa-bolt:before {
   content: "\f0e7";
 }
-.icon-sitemap:before {
+.fa-sitemap:before {
   content: "\f0e8";
 }
-.icon-umbrella:before {
+.fa-umbrella:before {
   content: "\f0e9";
 }
-.icon-paste:before {
+.fa-paste:before,
+.fa-clipboard:before {
   content: "\f0ea";
 }
-.icon-lightbulb:before {
+.fa-lightbulb-o:before {
   content: "\f0eb";
 }
-.icon-exchange:before {
+.fa-exchange:before {
   content: "\f0ec";
 }
-.icon-cloud-download:before {
+.fa-cloud-download:before {
   content: "\f0ed";
 }
-.icon-cloud-upload:before {
+.fa-cloud-upload:before {
   content: "\f0ee";
 }
-.icon-user-md:before {
+.fa-user-md:before {
   content: "\f0f0";
 }
-.icon-stethoscope:before {
+.fa-stethoscope:before {
   content: "\f0f1";
 }
-.icon-suitcase:before {
+.fa-suitcase:before {
   content: "\f0f2";
 }
-.icon-bell-alt:before {
-  content: "\f0f3";
+.fa-bell-o:before {
+  content: "\f0a2";
 }
-.icon-coffee:before {
+.fa-coffee:before {
   content: "\f0f4";
 }
-.icon-food:before {
+.fa-cutlery:before {
   content: "\f0f5";
 }
-.icon-file-text-alt:before {
+.fa-file-text-o:before {
   content: "\f0f6";
 }
-.icon-building:before {
+.fa-building-o:before {
   content: "\f0f7";
 }
-.icon-hospital:before {
+.fa-hospital-o:before {
   content: "\f0f8";
 }
-.icon-ambulance:before {
+.fa-ambulance:before {
   content: "\f0f9";
 }
-.icon-medkit:before {
+.fa-medkit:before {
   content: "\f0fa";
 }
-.icon-fighter-jet:before {
+.fa-fighter-jet:before {
   content: "\f0fb";
 }
-.icon-beer:before {
+.fa-beer:before {
   content: "\f0fc";
 }
-.icon-h-sign:before {
+.fa-h-square:before {
   content: "\f0fd";
 }
-.icon-plus-sign-alt:before {
+.fa-plus-square:before {
   content: "\f0fe";
 }
-.icon-double-angle-left:before {
+.fa-angle-double-left:before {
   content: "\f100";
 }
-.icon-double-angle-right:before {
+.fa-angle-double-right:before {
   content: "\f101";
 }
-.icon-double-angle-up:before {
+.fa-angle-double-up:before {
   content: "\f102";
 }
-.icon-double-angle-down:before {
+.fa-angle-double-down:before {
   content: "\f103";
 }
-.icon-angle-left:before {
+.fa-angle-left:before {
   content: "\f104";
 }
-.icon-angle-right:before {
+.fa-angle-right:before {
   content: "\f105";
 }
-.icon-angle-up:before {
+.fa-angle-up:before {
   content: "\f106";
 }
-.icon-angle-down:before {
+.fa-angle-down:before {
   content: "\f107";
 }
-.icon-desktop:before {
+.fa-desktop:before {
   content: "\f108";
 }
-.icon-laptop:before {
+.fa-laptop:before {
   content: "\f109";
 }
-.icon-tablet:before {
+.fa-tablet:before {
   content: "\f10a";
 }
-.icon-mobile-phone:before {
+.fa-mobile-phone:before,
+.fa-mobile:before {
   content: "\f10b";
 }
-.icon-circle-blank:before {
+.fa-circle-o:before {
   content: "\f10c";
 }
-.icon-quote-left:before {
+.fa-quote-left:before {
   content: "\f10d";
 }
-.icon-quote-right:before {
+.fa-quote-right:before {
   content: "\f10e";
 }
-.icon-spinner:before {
+.fa-spinner:before {
   content: "\f110";
 }
-.icon-circle:before {
+.fa-circle:before {
   content: "\f111";
 }
-.icon-mail-reply:before,
-.icon-reply:before {
+.fa-mail-reply:before,
+.fa-reply:before {
   content: "\f112";
 }
-.icon-github-alt:before {
+.fa-github-alt:before {
   content: "\f113";
 }
-.icon-folder-close-alt:before {
+.fa-folder-o:before {
   content: "\f114";
 }
-.icon-folder-open-alt:before {
+.fa-folder-open-o:before {
   content: "\f115";
 }
-.icon-expand-alt:before {
-  content: "\f116";
-}
-.icon-collapse-alt:before {
-  content: "\f117";
-}
-.icon-smile:before {
+.fa-smile-o:before {
   content: "\f118";
 }
-.icon-frown:before {
+.fa-frown-o:before {
   content: "\f119";
 }
-.icon-meh:before {
+.fa-meh-o:before {
   content: "\f11a";
 }
-.icon-gamepad:before {
+.fa-gamepad:before {
   content: "\f11b";
 }
-.icon-keyboard:before {
+.fa-keyboard-o:before {
   content: "\f11c";
 }
-.icon-flag-alt:before {
+.fa-flag-o:before {
   content: "\f11d";
 }
-.icon-flag-checkered:before {
+.fa-flag-checkered:before {
   content: "\f11e";
 }
-.icon-terminal:before {
+.fa-terminal:before {
   content: "\f120";
 }
-.icon-code:before {
+.fa-code:before {
   content: "\f121";
 }
-.icon-reply-all:before {
+.fa-mail-reply-all:before,
+.fa-reply-all:before {
   content: "\f122";
 }
-.icon-mail-reply-all:before {
-  content: "\f122";
-}
-.icon-star-half-full:before,
-.icon-star-half-empty:before {
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
   content: "\f123";
 }
-.icon-location-arrow:before {
+.fa-location-arrow:before {
   content: "\f124";
 }
-.icon-crop:before {
+.fa-crop:before {
   content: "\f125";
 }
-.icon-code-fork:before {
+.fa-code-fork:before {
   content: "\f126";
 }
-.icon-unlink:before {
+.fa-unlink:before,
+.fa-chain-broken:before {
   content: "\f127";
 }
-.icon-question:before {
+.fa-question:before {
   content: "\f128";
 }
-.icon-info:before {
+.fa-info:before {
   content: "\f129";
 }
-.icon-exclamation:before {
+.fa-exclamation:before {
   content: "\f12a";
 }
-.icon-superscript:before {
+.fa-superscript:before {
   content: "\f12b";
 }
-.icon-subscript:before {
+.fa-subscript:before {
   content: "\f12c";
 }
-.icon-eraser:before {
+.fa-eraser:before {
   content: "\f12d";
 }
-.icon-puzzle-piece:before {
+.fa-puzzle-piece:before {
   content: "\f12e";
 }
-.icon-microphone:before {
+.fa-microphone:before {
   content: "\f130";
 }
-.icon-microphone-off:before {
+.fa-microphone-slash:before {
   content: "\f131";
 }
-.icon-shield:before {
+.fa-shield:before {
   content: "\f132";
 }
-.icon-calendar-empty:before {
+.fa-calendar-o:before {
   content: "\f133";
 }
-.icon-fire-extinguisher:before {
+.fa-fire-extinguisher:before {
   content: "\f134";
 }
-.icon-rocket:before {
+.fa-rocket:before {
   content: "\f135";
 }
-.icon-maxcdn:before {
+.fa-maxcdn:before {
   content: "\f136";
 }
-.icon-chevron-sign-left:before {
+.fa-chevron-circle-left:before {
   content: "\f137";
 }
-.icon-chevron-sign-right:before {
+.fa-chevron-circle-right:before {
   content: "\f138";
 }
-.icon-chevron-sign-up:before {
+.fa-chevron-circle-up:before {
   content: "\f139";
 }
-.icon-chevron-sign-down:before {
+.fa-chevron-circle-down:before {
   content: "\f13a";
 }
-.icon-html5:before {
+.fa-html5:before {
   content: "\f13b";
 }
-.icon-css3:before {
+.fa-css3:before {
   content: "\f13c";
 }
-.icon-anchor:before {
+.fa-anchor:before {
   content: "\f13d";
 }
-.icon-unlock-alt:before {
+.fa-unlock-alt:before {
   content: "\f13e";
 }
-.icon-bullseye:before {
+.fa-bullseye:before {
   content: "\f140";
 }
-.icon-ellipsis-horizontal:before {
+.fa-ellipsis-h:before {
   content: "\f141";
 }
-.icon-ellipsis-vertical:before {
+.fa-ellipsis-v:before {
   content: "\f142";
 }
-.icon-rss-sign:before {
+.fa-rss-square:before {
   content: "\f143";
 }
-.icon-play-sign:before {
+.fa-play-circle:before {
   content: "\f144";
 }
-.icon-ticket:before {
+.fa-ticket:before {
   content: "\f145";
 }
-.icon-minus-sign-alt:before {
+.fa-minus-square:before {
   content: "\f146";
 }
-.icon-check-minus:before {
+.fa-minus-square-o:before {
   content: "\f147";
 }
-.icon-level-up:before {
+.fa-level-up:before {
   content: "\f148";
 }
-.icon-level-down:before {
+.fa-level-down:before {
   content: "\f149";
 }
-.icon-check-sign:before {
+.fa-check-square:before {
   content: "\f14a";
 }
-.icon-edit-sign:before {
+.fa-pencil-square:before {
   content: "\f14b";
 }
-.icon-external-link-sign:before {
+.fa-external-link-square:before {
   content: "\f14c";
 }
-.icon-share-sign:before {
+.fa-share-square:before {
   content: "\f14d";
 }
-.icon-compass:before {
+.fa-compass:before {
   content: "\f14e";
 }
-.icon-collapse:before {
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
   content: "\f150";
 }
-.icon-collapse-top:before {
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
   content: "\f151";
 }
-.icon-expand:before {
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
   content: "\f152";
 }
-.icon-euro:before,
-.icon-eur:before {
+.fa-euro:before,
+.fa-eur:before {
   content: "\f153";
 }
-.icon-gbp:before {
+.fa-gbp:before {
   content: "\f154";
 }
-.icon-dollar:before,
-.icon-usd:before {
+.fa-dollar:before,
+.fa-usd:before {
   content: "\f155";
 }
-.icon-rupee:before,
-.icon-inr:before {
+.fa-rupee:before,
+.fa-inr:before {
   content: "\f156";
 }
-.icon-yen:before,
-.icon-jpy:before {
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
   content: "\f157";
 }
-.icon-renminbi:before,
-.icon-cny:before {
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
   content: "\f158";
 }
-.icon-won:before,
-.icon-krw:before {
+.fa-won:before,
+.fa-krw:before {
   content: "\f159";
 }
-.icon-bitcoin:before,
-.icon-btc:before {
+.fa-bitcoin:before,
+.fa-btc:before {
   content: "\f15a";
 }
-.icon-file:before {
+.fa-file:before {
   content: "\f15b";
 }
-.icon-file-text:before {
+.fa-file-text:before {
   content: "\f15c";
 }
-.icon-sort-by-alphabet:before {
+.fa-sort-alpha-asc:before {
   content: "\f15d";
 }
-.icon-sort-by-alphabet-alt:before {
+.fa-sort-alpha-desc:before {
   content: "\f15e";
 }
-.icon-sort-by-attributes:before {
+.fa-sort-amount-asc:before {
   content: "\f160";
 }
-.icon-sort-by-attributes-alt:before {
+.fa-sort-amount-desc:before {
   content: "\f161";
 }
-.icon-sort-by-order:before {
+.fa-sort-numeric-asc:before {
   content: "\f162";
 }
-.icon-sort-by-order-alt:before {
+.fa-sort-numeric-desc:before {
   content: "\f163";
 }
-.icon-thumbs-up:before {
+.fa-thumbs-up:before {
   content: "\f164";
 }
-.icon-thumbs-down:before {
+.fa-thumbs-down:before {
   content: "\f165";
 }
-.icon-youtube-sign:before {
+.fa-youtube-square:before {
   content: "\f166";
 }
-.icon-youtube:before {
+.fa-youtube:before {
   content: "\f167";
 }
-.icon-xing:before {
+.fa-xing:before {
   content: "\f168";
 }
-.icon-xing-sign:before {
+.fa-xing-square:before {
   content: "\f169";
 }
-.icon-youtube-play:before {
+.fa-youtube-play:before {
   content: "\f16a";
 }
-.icon-dropbox:before {
+.fa-dropbox:before {
   content: "\f16b";
 }
-.icon-stackexchange:before {
+.fa-stack-overflow:before {
   content: "\f16c";
 }
-.icon-instagram:before {
+.fa-instagram:before {
   content: "\f16d";
 }
-.icon-flickr:before {
+.fa-flickr:before {
   content: "\f16e";
 }
-.icon-adn:before {
+.fa-adn:before {
   content: "\f170";
 }
-.icon-bitbucket:before {
+.fa-bitbucket:before {
   content: "\f171";
 }
-.icon-bitbucket-sign:before {
+.fa-bitbucket-square:before {
   content: "\f172";
 }
-.icon-tumblr:before {
+.fa-tumblr:before {
   content: "\f173";
 }
-.icon-tumblr-sign:before {
+.fa-tumblr-square:before {
   content: "\f174";
 }
-.icon-long-arrow-down:before {
+.fa-long-arrow-down:before {
   content: "\f175";
 }
-.icon-long-arrow-up:before {
+.fa-long-arrow-up:before {
   content: "\f176";
 }
-.icon-long-arrow-left:before {
+.fa-long-arrow-left:before {
   content: "\f177";
 }
-.icon-long-arrow-right:before {
+.fa-long-arrow-right:before {
   content: "\f178";
 }
-.icon-apple:before {
+.fa-apple:before {
   content: "\f179";
 }
-.icon-windows:before {
+.fa-windows:before {
   content: "\f17a";
 }
-.icon-android:before {
+.fa-android:before {
   content: "\f17b";
 }
-.icon-linux:before {
+.fa-linux:before {
   content: "\f17c";
 }
-.icon-dribbble:before {
+.fa-dribbble:before {
   content: "\f17d";
 }
-.icon-skype:before {
+.fa-skype:before {
   content: "\f17e";
 }
-.icon-foursquare:before {
+.fa-foursquare:before {
   content: "\f180";
 }
-.icon-trello:before {
+.fa-trello:before {
   content: "\f181";
 }
-.icon-female:before {
+.fa-female:before {
   content: "\f182";
 }
-.icon-male:before {
+.fa-male:before {
   content: "\f183";
 }
-.icon-gittip:before {
+.fa-gittip:before {
   content: "\f184";
 }
-.icon-sun:before {
+.fa-sun-o:before {
   content: "\f185";
 }
-.icon-moon:before {
+.fa-moon-o:before {
   content: "\f186";
 }
-.icon-archive:before {
+.fa-archive:before {
   content: "\f187";
 }
-.icon-bug:before {
+.fa-bug:before {
   content: "\f188";
 }
-.icon-vk:before {
+.fa-vk:before {
   content: "\f189";
 }
-.icon-weibo:before {
+.fa-weibo:before {
   content: "\f18a";
 }
-.icon-renren:before {
+.fa-renren:before {
   content: "\f18b";
 }
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}
+.fa-space-shuttle:before {
+  content: "\f197";
+}
+.fa-slack:before {
+  content: "\f198";
+}
+.fa-envelope-square:before {
+  content: "\f199";
+}
+.fa-wordpress:before {
+  content: "\f19a";
+}
+.fa-openid:before {
+  content: "\f19b";
+}
+.fa-institution:before,
+.fa-bank:before,
+.fa-university:before {
+  content: "\f19c";
+}
+.fa-mortar-board:before,
+.fa-graduation-cap:before {
+  content: "\f19d";
+}
+.fa-yahoo:before {
+  content: "\f19e";
+}
+.fa-google:before {
+  content: "\f1a0";
+}
+.fa-reddit:before {
+  content: "\f1a1";
+}
+.fa-reddit-square:before {
+  content: "\f1a2";
+}
+.fa-stumbleupon-circle:before {
+  content: "\f1a3";
+}
+.fa-stumbleupon:before {
+  content: "\f1a4";
+}
+.fa-delicious:before {
+  content: "\f1a5";
+}
+.fa-digg:before {
+  content: "\f1a6";
+}
+.fa-pied-piper-square:before,
+.fa-pied-piper:before {
+  content: "\f1a7";
+}
+.fa-pied-piper-alt:before {
+  content: "\f1a8";
+}
+.fa-drupal:before {
+  content: "\f1a9";
+}
+.fa-joomla:before {
+  content: "\f1aa";
+}
+.fa-language:before {
+  content: "\f1ab";
+}
+.fa-fax:before {
+  content: "\f1ac";
+}
+.fa-building:before {
+  content: "\f1ad";
+}
+.fa-child:before {
+  content: "\f1ae";
+}
+.fa-paw:before {
+  content: "\f1b0";
+}
+.fa-spoon:before {
+  content: "\f1b1";
+}
+.fa-cube:before {
+  content: "\f1b2";
+}
+.fa-cubes:before {
+  content: "\f1b3";
+}
+.fa-behance:before {
+  content: "\f1b4";
+}
+.fa-behance-square:before {
+  content: "\f1b5";
+}
+.fa-steam:before {
+  content: "\f1b6";
+}
+.fa-steam-square:before {
+  content: "\f1b7";
+}
+.fa-recycle:before {
+  content: "\f1b8";
+}
+.fa-automobile:before,
+.fa-car:before {
+  content: "\f1b9";
+}
+.fa-cab:before,
+.fa-taxi:before {
+  content: "\f1ba";
+}
+.fa-tree:before {
+  content: "\f1bb";
+}
+.fa-spotify:before {
+  content: "\f1bc";
+}
+.fa-deviantart:before {
+  content: "\f1bd";
+}
+.fa-soundcloud:before {
+  content: "\f1be";
+}
+.fa-database:before {
+  content: "\f1c0";
+}
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
+.fa-vine:before {
+  content: "\f1ca";
+}
+.fa-codepen:before {
+  content: "\f1cb";
+}
+.fa-jsfiddle:before {
+  content: "\f1cc";
+}
+.fa-life-bouy:before,
+.fa-life-saver:before,
+.fa-support:before,
+.fa-life-ring:before {
+  content: "\f1cd";
+}
+.fa-circle-o-notch:before {
+  content: "\f1ce";
+}
+.fa-ra:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}
+.fa-git-square:before {
+  content: "\f1d2";
+}
+.fa-git:before {
+  content: "\f1d3";
+}
+.fa-hacker-news:before {
+  content: "\f1d4";
+}
+.fa-tencent-weibo:before {
+  content: "\f1d5";
+}
+.fa-qq:before {
+  content: "\f1d6";
+}
+.fa-wechat:before,
+.fa-weixin:before {
+  content: "\f1d7";
+}
+.fa-send:before,
+.fa-paper-plane:before {
+  content: "\f1d8";
+}
+.fa-send-o:before,
+.fa-paper-plane-o:before {
+  content: "\f1d9";
+}
+.fa-history:before {
+  content: "\f1da";
+}
+.fa-circle-thin:before {
+  content: "\f1db";
+}
+.fa-header:before {
+  content: "\f1dc";
+}
+.fa-paragraph:before {
+  content: "\f1dd";
+}
+.fa-sliders:before {
+  content: "\f1de";
+}
+.fa-share-alt:before {
+  content: "\f1e0";
+}
+.fa-share-alt-square:before {
+  content: "\f1e1";
+}
+.fa-bomb:before {
+  content: "\f1e2";
+}
 /*!
 *
 * IPython base
@@ -7740,23 +7827,37 input.engine_num_input {
   margin-right: 0px;
 }
 .folder_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: "\f114";
 }
+.folder_icon:before.pull-left {
+  margin-right: .3em;
+}
+.folder_icon:before.pull-right {
+  margin-left: .3em;
+}
 .notebook_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: "\f02d";
 }
+.notebook_icon:before.pull-left {
+  margin-right: .3em;
+}
+.notebook_icon:before.pull-right {
+  margin-left: .3em;
+}
 /*!
 *
 * IPython notebook
@@ -8019,8 +8120,6 div.input_area > div.highlight > pre {
   /* .CodeMirror-lines */
   padding: 0;
   border: 0;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 .CodeMirror-vscrollbar,
@@ -8364,8 +8463,6 div.output_area pre {
   vertical-align: baseline;
   color: #000000;
   background-color: transparent;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 /* This class is for the output subarea inside the output_area and after
@@ -9664,41 +9761,69 ul#help_menu li a i {
   margin-right: 5px;
 }
 .edit_mode_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: "\f040";
 }
+.edit_mode_icon:before.pull-left {
+  margin-right: .3em;
+}
+.edit_mode_icon:before.pull-right {
+  margin-left: .3em;
+}
 .command_mode_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: ' ';
 }
+.command_mode_icon:before.pull-left {
+  margin-right: .3em;
+}
+.command_mode_icon:before.pull-right {
+  margin-left: .3em;
+}
 .kernel_idle_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: "\f10c";
 }
+.kernel_idle_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_idle_icon:before.pull-right {
+  margin-left: .3em;
+}
 .kernel_busy_icon:before {
+  display: inline-block;
   font-family: FontAwesome;
-  font-weight: normal;
   font-style: normal;
-  text-decoration: inherit;
+  font-weight: normal;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+  -moz-osx-font-smoothing: grayscale;
   content: "\f111";
 }
+.kernel_busy_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_busy_icon:before.pull-right {
+  margin-left: .3em;
+}
 .notification_widget {
   color: #777777;
   padding: 1px 12px;
@@ -9764,24 +9889,6 fieldset[disabled] .notification_widget {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.notification_widget [class^="icon-"].icon-large,
-.notification_widget [class*=" icon-"].icon-large {
-  line-height: .9em;
-}
-.notification_widget [class^="icon-"].icon-spin,
-.notification_widget [class*=" icon-"].icon-spin {
-  display: inline-block;
-}
-.notification_widget [class^="icon-"].pull-left.icon-2x,
-.notification_widget [class*=" icon-"].pull-left.icon-2x,
-.notification_widget [class^="icon-"].pull-right.icon-2x,
-.notification_widget [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .18em;
-}
-.notification_widget [class^="icon-"].icon-spin.icon-large,
-.notification_widget [class*=" icon-"].icon-spin.icon-large {
-  line-height: .8em;
-}
 .notification_widget:hover,
 .notification_widget:focus,
 .notification_widget:active,
@@ -10230,8 +10337,6 span#autosave_status {
 }
 .ipython_tooltip .tooltiptext pre {
   border: 0;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
   font-size: 100%;
   background-color: #f7f7f7;

IPython/html/static/tree/less/tree.less

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

IPython/html/static/widgets/js/widget_container.js

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

IPython/html/templates/notebook.html

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

IPython/html/templates/tree.html

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

IPython/nbconvert/templates/html/slides_reveal.tpl

@@ -78,7 +78,7 if( window.location.search.match( /print-pdf/gi ) ) {
 <![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">

examples/Notebook/Running Code.ipynb

@@ -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."
      ]
     },
     {

setupbase.py

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