diff --git a/IPython/html/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less index dccb28a..761a5b3 100644 --- a/IPython/html/static/notebook/less/menubar.less +++ b/IPython/html/static/notebook/less/menubar.less @@ -19,6 +19,12 @@ line-height: 12px; } +#menubar .navbar-right { + // Add some padding to the right aligned items. + padding-top: 5px; +} + + i.menu-icon { // add padding to account for float-right padding-top: 4px; @@ -36,7 +42,8 @@ ul#menus { float: left; } -// http://www.bootply.com/86684 +// Make sub menus work in BS3. +// Credit: http://www.bootply.com/86684 .dropdown-submenu{position:relative;} .dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .dropdown-submenu:hover>.dropdown-menu{display:block;} diff --git a/IPython/html/static/notebook/less/notificationarea.less b/IPython/html/static/notebook/less/notificationarea.less index 1be03cf..5b3fd52 100644 --- a/IPython/html/static/notebook/less/notificationarea.less +++ b/IPython/html/static/notebook/less/notificationarea.less @@ -1,4 +1,6 @@ #notification_area { + .pull-right(); + z-index: 10; } @@ -12,8 +14,17 @@ } #kernel_indicator { - // Pull it to the right, outside the container boundary - margin-right: -16px; + .pull-right(); + .indicator_area(); + + margin-right: 12px; +} + +#modal_indicator { + .pull-right(); + .indicator_area(); + + margin-right: 5px; } .edit_mode_icon:before { diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html index 47a6b87..aee8c5a 100644 --- a/IPython/html/templates/notebook.html +++ b/IPython/html/templates/notebook.html @@ -49,222 +49,222 @@ class="notebook_app" - - -
+ +
+