From ab380db8b9f9031da6000b1bf67fefeda5354cf2 2014-12-23 10:32:15 From: Matthias Bussonnier Date: 2014-12-23 10:32:15 Subject: [PATCH] ungroup button on dashboard fix a few instanced of button toolbar that were not with the right class or not in btn groups. --- diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 9ea181a..c49e170 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -5613,7 +5613,9 @@ button.close { .panel-body:before, .panel-body:after, .modal-footer:before, -.modal-footer:after { +.modal-footer:after, +.item_buttons:before, +.item_buttons:after { content: " "; display: table; } @@ -5630,7 +5632,8 @@ button.close { .navbar-collapse:after, .pager:after, .panel-body:after, -.modal-footer:after { +.modal-footer:after, +.item_buttons:after { clear: both; } .center-block { @@ -8029,10 +8032,20 @@ ul.breadcrumb span { } .item_buttons { line-height: 1em; + margin-left: -5px; } .item_buttons .btn { min-width: 13ex; } +.item_buttons .btn-group, +.item_buttons .input-group { + float: left; +} +.item_buttons > .btn, +.item_buttons > .btn-group, +.item_buttons > .input-group { + margin-left: 5px; +} .toolbar_info { height: 24px; line-height: 24px; diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index 05d223e..ed45369 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -227,7 +227,7 @@ define([ $("").addClass("item_name") ) ).append( - $('
').addClass("item_buttons btn-group pull-right") + $('
').addClass("item_buttons pull-right") )); if (index === -1) { diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 8ed509a..84c64a4 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -106,6 +106,7 @@ ul.breadcrumb { .btn { min-width: 13ex; } + .btn-toolbar(); } .toolbar_info { diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index 8f1d2b9..cd80351 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -42,7 +42,7 @@ data-terminals-available="{{terminals_available}}" -
+
- +
+ +