diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 56d6f31..f505adb 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8621,10 +8621,8 @@ span#login_widget > .button .badge, width: 12ex; margin-right: -12ex; } -.alternate_upload .input-overlay { - display: inline-block; - font-weight: bold; - line-height: 1em; +.alternate_upload .btn-upload { + height: 22px; } /** * Primary styles @@ -8657,6 +8655,7 @@ ul.breadcrumb span { padding-top: 1px; } .dynamic-buttons { + padding-top: 3px; display: inline-block; } .list_toolbar [class*="span"] { @@ -8940,6 +8939,10 @@ ul#new-menu { .shutdown-button { display: none; } +.dynamic-instructions { + display: inline-block; + padding-top: 4px; +} /*! * * IPython text editor webapp diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index b3f2db9..40ca74f 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -509,6 +509,13 @@ define([ } // Update total counter $('#counter-select-all').html(checked===0 ? ' ' : checked); + + // If at aleast on item is selected, hide the selection instructions. + if (checked > 0) { + $('.dynamic-instructions').hide(); + } else { + $('.dynamic-instructions').show(); + } }; NotebookList.prototype.add_link = function (model, item) { diff --git a/IPython/html/static/tree/less/altuploadform.less b/IPython/html/static/tree/less/altuploadform.less index bc107ff..be608cf 100644 --- a/IPython/html/static/tree/less/altuploadform.less +++ b/IPython/html/static/tree/less/altuploadform.less @@ -1,29 +1,26 @@ /* We need an invisible input field on top of the sentense*/ /* "Drag file onto the list ..." */ -.alternate_upload -{ +.alternate_upload { background-color:none; display: inline; -} -.alternate_upload.form -{ - padding: 0; - margin:0; -} + &.form + { + padding: 0; + margin:0; + } -.alternate_upload input.fileinput -{ - display: inline; - opacity: 0; - z-index: 2; - width: 12ex; - margin-right: -12ex; -} + input.fileinput + { + display: inline; + opacity: 0; + z-index: 2; + width: 12ex; + margin-right: -12ex; + } -.alternate_upload .input-overlay { - display: inline-block; - font-weight: bold; - line-height:1em; + .btn-upload { + height: @btn_mini_height; + } } diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index ba2236e..e75587f 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -49,6 +49,7 @@ ul.breadcrumb { } .dynamic-buttons { + padding-top: @dashboard_tb_pad - 1px; display: inline-block; } @@ -321,3 +322,8 @@ ul#new-menu { .shutdown-button { display: none; } + +.dynamic-instructions { + display: inline-block; + padding-top: @dashboard_tb_pad; +} diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index fa22adc..498b7de 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -25,24 +25,26 @@ data-terminals-available="{{terminals_available}}"
-
- - To import a notebook, drag the file onto the listing below or - - - click here. - - -
+
+ Select items to perform actions on them. +
+
+ + + + +
-
- - - - -
+
+ + + + Upload + + +