Merge pull request #7268 from Carreau/ungroup-button

ungroup button on dashboard
This commit is contained in:
Jonathan Frederic 2014-12-23 11:24:30 -08:00
commit 849c96ae61
4 changed files with 21 additions and 5 deletions

View File

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

View File

@ -227,7 +227,7 @@ define([
$("<span/>").addClass("item_name")
)
).append(
$('<div/>').addClass("item_buttons btn-group pull-right")
$('<div/>').addClass("item_buttons pull-right")
));
if (index === -1) {

View File

@ -106,6 +106,7 @@ ul.breadcrumb {
.btn {
min-width: 13ex;
}
.btn-toolbar();
}
.toolbar_info {

View File

@ -42,7 +42,7 @@ data-terminals-available="{{terminals_available}}"
</span>
</span>
</form>
<div id="notebook_buttons" class="pull-right">
<div id="notebook_buttons" class="pull-right btn-toolbar">
<div id="new-notebook-buttons" class="btn-group">
<button id="new_notebook" class="btn btn-default btn-xs">
New Notebook
@ -53,7 +53,9 @@ data-terminals-available="{{terminals_available}}"
</button>
<ul id="new-notebook-menu" class="dropdown-menu"></ul>
</div>
<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
<div class="btn-group">
<button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
</div>
</div>
</div>
</div>