##// END OF EJS Templates
Merge pull request #7268 from Carreau/ungroup-button...
Jonathan Frederic -
r19693:b8e783e1 merge
parent child Browse files
Show More
@@ -5613,7 +5613,9 b' button.close {'
5613 .panel-body:before,
5613 .panel-body:before,
5614 .panel-body:after,
5614 .panel-body:after,
5615 .modal-footer:before,
5615 .modal-footer:before,
5616 .modal-footer:after {
5616 .modal-footer:after,
5617 .item_buttons:before,
5618 .item_buttons:after {
5617 content: " ";
5619 content: " ";
5618 display: table;
5620 display: table;
5619 }
5621 }
@@ -5630,7 +5632,8 b' button.close {'
5630 .navbar-collapse:after,
5632 .navbar-collapse:after,
5631 .pager:after,
5633 .pager:after,
5632 .panel-body:after,
5634 .panel-body:after,
5633 .modal-footer:after {
5635 .modal-footer:after,
5636 .item_buttons:after {
5634 clear: both;
5637 clear: both;
5635 }
5638 }
5636 .center-block {
5639 .center-block {
@@ -8029,10 +8032,20 b' ul.breadcrumb span {'
8029 }
8032 }
8030 .item_buttons {
8033 .item_buttons {
8031 line-height: 1em;
8034 line-height: 1em;
8035 margin-left: -5px;
8032 }
8036 }
8033 .item_buttons .btn {
8037 .item_buttons .btn {
8034 min-width: 13ex;
8038 min-width: 13ex;
8035 }
8039 }
8040 .item_buttons .btn-group,
8041 .item_buttons .input-group {
8042 float: left;
8043 }
8044 .item_buttons > .btn,
8045 .item_buttons > .btn-group,
8046 .item_buttons > .input-group {
8047 margin-left: 5px;
8048 }
8036 .toolbar_info {
8049 .toolbar_info {
8037 height: 24px;
8050 height: 24px;
8038 line-height: 24px;
8051 line-height: 24px;
@@ -227,7 +227,7 b' define(['
227 $("<span/>").addClass("item_name")
227 $("<span/>").addClass("item_name")
228 )
228 )
229 ).append(
229 ).append(
230 $('<div/>').addClass("item_buttons btn-group pull-right")
230 $('<div/>').addClass("item_buttons pull-right")
231 ));
231 ));
232
232
233 if (index === -1) {
233 if (index === -1) {
@@ -106,6 +106,7 b' ul.breadcrumb {'
106 .btn {
106 .btn {
107 min-width: 13ex;
107 min-width: 13ex;
108 }
108 }
109 .btn-toolbar();
109 }
110 }
110
111
111 .toolbar_info {
112 .toolbar_info {
@@ -42,7 +42,7 b' data-terminals-available="{{terminals_available}}"'
42 </span>
42 </span>
43 </span>
43 </span>
44 </form>
44 </form>
45 <div id="notebook_buttons" class="pull-right">
45 <div id="notebook_buttons" class="pull-right btn-toolbar">
46 <div id="new-notebook-buttons" class="btn-group">
46 <div id="new-notebook-buttons" class="btn-group">
47 <button id="new_notebook" class="btn btn-default btn-xs">
47 <button id="new_notebook" class="btn btn-default btn-xs">
48 New Notebook
48 New Notebook
@@ -53,7 +53,9 b' data-terminals-available="{{terminals_available}}"'
53 </button>
53 </button>
54 <ul id="new-notebook-menu" class="dropdown-menu"></ul>
54 <ul id="new-notebook-menu" class="dropdown-menu"></ul>
55 </div>
55 </div>
56 <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
56 <div class="btn-group">
57 <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
58 </div>
57 </div>
59 </div>
58 </div>
60 </div>
59 </div>
61 </div>
General Comments 0
You need to be logged in to leave comments. Login now