Merge pull request #5584 from ivanov/more-semantic-icons

more semantic icons

IPython/html/static/style/ipython.less

@@ -5,13 +5,5 @@
 // base
 @import "../base/less/style.less";
 
-// auth
-@import "../auth/less/style.less";
-
-// tree
-@import "../tree/less/style.less";
-
 // notebook
 @import "../notebook/less/style_noapp.less";
-
-

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

@@ -26,32 +26,6 @@ div.error{margin:2em;text-align:center}
 div.error>h1{font-size:500%;line-height:normal}
 div.error>p{font-size:200%;line-height:normal}
 div.traceback-wrapper{text-align:left;max-width:800px;margin:auto}
-.center-nav{display:inline-block;margin-bottom:-4px}
-.alternate_upload{background-color:none;display:inline}
-.alternate_upload.form{padding:0;margin:0}
-.alternate_upload input.fileinput{background-color:#f00;position:relative;opacity:0;z-index:2;width:295px;margin-left:163px;cursor:pointer;height:26px}
-ul#tabs{margin-bottom:4px}
-ul#tabs a{padding-top:4px;padding-bottom:4px}
-ul.breadcrumb a:focus,ul.breadcrumb a:hover{text-decoration:none}
-ul.breadcrumb i.icon-home{font-size:16px;margin-right:4px}
-ul.breadcrumb span{color:#5e5e5e}
-.list_toolbar{padding:4px 0 4px 0}
-.list_toolbar [class*="span"]{min-height:26px}
-.list_header{font-weight:bold}
-.list_container{margin-top:4px;margin-bottom:20px;border:1px solid #ababab;border-radius:4px}
-.list_container>div{border-bottom:1px solid #ababab}.list_container>div:hover .list-item{background-color:#f00}
-.list_container>div:last-child{border:none}
-.list_item:hover .list_item{background-color:#ddd}
-.list_item a{text-decoration:none}
-.list_header>div,.list_item>div{padding-top:4px;padding-bottom:4px;padding-left:7px;padding-right:7px;height:22px;line-height:22px}
-.item_name{line-height:22px;height:26px}
-.item_icon{font-size:14px;color:#5e5e5e;margin-right:7px}
-.item_buttons{line-height:1em}
-.toolbar_info{height:26px;line-height:26px}
-input.nbname_input,input.engine_num_input{padding-top:3px;padding-bottom:3px;height:14px;line-height:14px;margin:0}
-input.engine_num_input{width:60px}
-.highlight_text{color:#00f}
-#project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold}
 .ansibold{font-weight:bold}
 .ansiblack{color:#000}
 .ansired{color:#8b0000}

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

@@ -1329,6 +1329,8 @@ input.nbname_input,input.engine_num_input{padding-top:3px;padding-bottom:3px;hei
 input.engine_num_input{width:60px}
 .highlight_text{color:#00f}
 #project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold}
+.folder_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f114"}
+.notebook_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f02d"}
 .ansibold{font-weight:bold}
 .ansiblack{color:#000}
 .ansired{color:#8b0000}

IPython/html/static/tree/js/notebooklist.js

@@ -214,7 +214,7 @@ var IPython = (function (IPython) {
         item.data('name', name);
         item.data('path', path);
         item.find(".item_name").text(name);
-        item.find(".item_icon").addClass('icon-folder-open');
+        item.find(".item_icon").addClass('folder_icon').addClass('icon-fixed-width');
         item.find("a.item_link")
             .attr('href',
                 utils.url_join_encode(
@@ -231,7 +231,7 @@ var IPython = (function (IPython) {
         item.data('nbname', nbname);
         item.data('path', path);
         item.find(".item_name").text(nbname);
-        item.find(".item_icon").addClass('icon-book');
+        item.find(".item_icon").addClass('notebook_icon').addClass('icon-fixed-width');
         item.find("a.item_link")
             .attr('href',
                 utils.url_join_encode(
@@ -246,7 +246,7 @@ var IPython = (function (IPython) {
 
     NotebookList.prototype.add_name_input = function (nbname, item) {
         item.data('nbname', nbname);
-        item.find(".item_icon").addClass('icon-book');
+        item.find(".item_icon").addClass('notebook_icon').addClass('icon-fixed-width');
         item.find(".item_name").empty().append(
             $('<input/>')
             .addClass("nbname_input")

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

@@ -127,4 +127,10 @@ input.engine_num_input {
    
 }
 
+.folder_icon:before {
+    .icon(@folder-close-alt)
+}
 
+.notebook_icon:before {
+    .icon(@book)
+}