diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index a2d8db9..efb9032 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -54,7 +54,7 @@ define([
KernelSelector.prototype.bind_events = function() {
var that = this;
this.events.on('spec_changed.Kernel', function(event, data) {
- that.element.find("#current_kernel_spec").text(data.display_name);
+ that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
});
};
diff --git a/IPython/html/static/notebook/less/kernelselector.less b/IPython/html/static/notebook/less/kernelselector.less
index 1b5821f..5757978 100644
--- a/IPython/html/static/notebook/less/kernelselector.less
+++ b/IPython/html/static/notebook/less/kernelselector.less
@@ -1,7 +1,14 @@
-span#kernel_selector_widget {
- padding: 0px 5px;
- margin-top: 12px;
+#kernel_selector_widget {
margin-right: 1em;
- font-size: 120%;
- position: relative;
+ float:right;
+
+ & > button {
+ .btn();
+ .btn-default();
+ .btn-sm();
+
+ & > span.caret {
+ margin-top:0px;
+ }
+ }
}
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index ced0d11..aa381db 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -9436,12 +9436,121 @@ p {
.completions select option.context {
color: #3071a9;
}
-span#kernel_selector_widget {
- padding: 0px 5px;
- margin-top: 12px;
+#kernel_selector_widget {
margin-right: 1em;
- font-size: 120%;
- position: relative;
+ float: right;
+}
+#kernel_selector_widget > button {
+ display: inline-block;
+ margin-bottom: 0;
+ font-weight: normal;
+ text-align: center;
+ vertical-align: middle;
+ cursor: pointer;
+ background-image: none;
+ border: 1px solid transparent;
+ white-space: nowrap;
+ padding: 6px 12px;
+ font-size: 13px;
+ line-height: 1.42857143;
+ border-radius: 4px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ color: #333333;
+ background-color: #ffffff;
+ border-color: #cccccc;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+#kernel_selector_widget > button:focus,
+#kernel_selector_widget > button:active:focus,
+#kernel_selector_widget > button.active:focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+#kernel_selector_widget > button:hover,
+#kernel_selector_widget > button:focus {
+ color: #333333;
+ text-decoration: none;
+}
+#kernel_selector_widget > button:active,
+#kernel_selector_widget > button.active {
+ outline: 0;
+ background-image: none;
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+#kernel_selector_widget > button.disabled,
+#kernel_selector_widget > button[disabled],
+fieldset[disabled] #kernel_selector_widget > button {
+ cursor: not-allowed;
+ pointer-events: none;
+ opacity: 0.65;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+#kernel_selector_widget > button [class^="icon-"].icon-large,
+#kernel_selector_widget > button [class*=" icon-"].icon-large {
+ line-height: .9em;
+}
+#kernel_selector_widget > button [class^="icon-"].icon-spin,
+#kernel_selector_widget > button [class*=" icon-"].icon-spin {
+ display: inline-block;
+}
+#kernel_selector_widget > button [class^="icon-"].pull-left.icon-2x,
+#kernel_selector_widget > button [class*=" icon-"].pull-left.icon-2x,
+#kernel_selector_widget > button [class^="icon-"].pull-right.icon-2x,
+#kernel_selector_widget > button [class*=" icon-"].pull-right.icon-2x {
+ margin-top: .18em;
+}
+#kernel_selector_widget > button [class^="icon-"].icon-spin.icon-large,
+#kernel_selector_widget > button [class*=" icon-"].icon-spin.icon-large {
+ line-height: .8em;
+}
+#kernel_selector_widget > button:hover,
+#kernel_selector_widget > button:focus,
+#kernel_selector_widget > button:active,
+#kernel_selector_widget > button.active,
+.open .dropdown-toggle#kernel_selector_widget > button {
+ color: #333333;
+ background-color: #ebebeb;
+ border-color: #adadad;
+}
+#kernel_selector_widget > button:active,
+#kernel_selector_widget > button.active,
+.open .dropdown-toggle#kernel_selector_widget > button {
+ background-image: none;
+}
+#kernel_selector_widget > button.disabled,
+#kernel_selector_widget > button[disabled],
+fieldset[disabled] #kernel_selector_widget > button,
+#kernel_selector_widget > button.disabled:hover,
+#kernel_selector_widget > button[disabled]:hover,
+fieldset[disabled] #kernel_selector_widget > button:hover,
+#kernel_selector_widget > button.disabled:focus,
+#kernel_selector_widget > button[disabled]:focus,
+fieldset[disabled] #kernel_selector_widget > button:focus,
+#kernel_selector_widget > button.disabled:active,
+#kernel_selector_widget > button[disabled]:active,
+fieldset[disabled] #kernel_selector_widget > button:active,
+#kernel_selector_widget > button.disabled.active,
+#kernel_selector_widget > button[disabled].active,
+fieldset[disabled] #kernel_selector_widget > button.active {
+ background-color: #ffffff;
+ border-color: #cccccc;
+}
+#kernel_selector_widget > button .badge {
+ color: #ffffff;
+ background-color: #333333;
+}
+#kernel_selector_widget > button > span.caret {
+ margin-top: 0px;
}
#menubar {
margin-top: 0px;
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 0ad6185..1f759d7 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -34,14 +34,18 @@ class="notebook_app"
{% block header %}
+
-
- Python
+
+