##// END OF EJS Templates
Simplify and uniformise styling of kernel selector...
Matthias BUSSONNIER -
Show More
@@ -54,7 +54,7 b' define(['
54 KernelSelector.prototype.bind_events = function() {
54 KernelSelector.prototype.bind_events = function() {
55 var that = this;
55 var that = this;
56 this.events.on('spec_changed.Kernel', function(event, data) {
56 this.events.on('spec_changed.Kernel', function(event, data) {
57 that.element.find("#current_kernel_spec").text(data.display_name);
57 that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
58 });
58 });
59 };
59 };
60
60
@@ -1,7 +1,14 b''
1 span#kernel_selector_widget {
1 #kernel_selector_widget {
2 padding: 0px 5px;
3 margin-top: 12px;
4 margin-right: 1em;
2 margin-right: 1em;
5 font-size: 120%;
3 float:right;
6 position: relative;
4
5 & > button {
6 .btn();
7 .btn-default();
8 .btn-sm();
9
10 & > span.caret {
11 margin-top:0px;
12 }
13 }
7 }
14 }
@@ -9436,12 +9436,121 b' p {'
9436 .completions select option.context {
9436 .completions select option.context {
9437 color: #3071a9;
9437 color: #3071a9;
9438 }
9438 }
9439 span#kernel_selector_widget {
9439 #kernel_selector_widget {
9440 padding: 0px 5px;
9441 margin-top: 12px;
9442 margin-right: 1em;
9440 margin-right: 1em;
9443 font-size: 120%;
9441 float: right;
9444 position: relative;
9442 }
9443 #kernel_selector_widget > button {
9444 display: inline-block;
9445 margin-bottom: 0;
9446 font-weight: normal;
9447 text-align: center;
9448 vertical-align: middle;
9449 cursor: pointer;
9450 background-image: none;
9451 border: 1px solid transparent;
9452 white-space: nowrap;
9453 padding: 6px 12px;
9454 font-size: 13px;
9455 line-height: 1.42857143;
9456 border-radius: 4px;
9457 -webkit-user-select: none;
9458 -moz-user-select: none;
9459 -ms-user-select: none;
9460 user-select: none;
9461 color: #333333;
9462 background-color: #ffffff;
9463 border-color: #cccccc;
9464 padding: 5px 10px;
9465 font-size: 12px;
9466 line-height: 1.5;
9467 border-radius: 3px;
9468 }
9469 #kernel_selector_widget > button:focus,
9470 #kernel_selector_widget > button:active:focus,
9471 #kernel_selector_widget > button.active:focus {
9472 outline: thin dotted;
9473 outline: 5px auto -webkit-focus-ring-color;
9474 outline-offset: -2px;
9475 }
9476 #kernel_selector_widget > button:hover,
9477 #kernel_selector_widget > button:focus {
9478 color: #333333;
9479 text-decoration: none;
9480 }
9481 #kernel_selector_widget > button:active,
9482 #kernel_selector_widget > button.active {
9483 outline: 0;
9484 background-image: none;
9485 -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
9486 box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
9487 }
9488 #kernel_selector_widget > button.disabled,
9489 #kernel_selector_widget > button[disabled],
9490 fieldset[disabled] #kernel_selector_widget > button {
9491 cursor: not-allowed;
9492 pointer-events: none;
9493 opacity: 0.65;
9494 filter: alpha(opacity=65);
9495 -webkit-box-shadow: none;
9496 box-shadow: none;
9497 }
9498 #kernel_selector_widget > button [class^="icon-"].icon-large,
9499 #kernel_selector_widget > button [class*=" icon-"].icon-large {
9500 line-height: .9em;
9501 }
9502 #kernel_selector_widget > button [class^="icon-"].icon-spin,
9503 #kernel_selector_widget > button [class*=" icon-"].icon-spin {
9504 display: inline-block;
9505 }
9506 #kernel_selector_widget > button [class^="icon-"].pull-left.icon-2x,
9507 #kernel_selector_widget > button [class*=" icon-"].pull-left.icon-2x,
9508 #kernel_selector_widget > button [class^="icon-"].pull-right.icon-2x,
9509 #kernel_selector_widget > button [class*=" icon-"].pull-right.icon-2x {
9510 margin-top: .18em;
9511 }
9512 #kernel_selector_widget > button [class^="icon-"].icon-spin.icon-large,
9513 #kernel_selector_widget > button [class*=" icon-"].icon-spin.icon-large {
9514 line-height: .8em;
9515 }
9516 #kernel_selector_widget > button:hover,
9517 #kernel_selector_widget > button:focus,
9518 #kernel_selector_widget > button:active,
9519 #kernel_selector_widget > button.active,
9520 .open .dropdown-toggle#kernel_selector_widget > button {
9521 color: #333333;
9522 background-color: #ebebeb;
9523 border-color: #adadad;
9524 }
9525 #kernel_selector_widget > button:active,
9526 #kernel_selector_widget > button.active,
9527 .open .dropdown-toggle#kernel_selector_widget > button {
9528 background-image: none;
9529 }
9530 #kernel_selector_widget > button.disabled,
9531 #kernel_selector_widget > button[disabled],
9532 fieldset[disabled] #kernel_selector_widget > button,
9533 #kernel_selector_widget > button.disabled:hover,
9534 #kernel_selector_widget > button[disabled]:hover,
9535 fieldset[disabled] #kernel_selector_widget > button:hover,
9536 #kernel_selector_widget > button.disabled:focus,
9537 #kernel_selector_widget > button[disabled]:focus,
9538 fieldset[disabled] #kernel_selector_widget > button:focus,
9539 #kernel_selector_widget > button.disabled:active,
9540 #kernel_selector_widget > button[disabled]:active,
9541 fieldset[disabled] #kernel_selector_widget > button:active,
9542 #kernel_selector_widget > button.disabled.active,
9543 #kernel_selector_widget > button[disabled].active,
9544 fieldset[disabled] #kernel_selector_widget > button.active {
9545 background-color: #ffffff;
9546 border-color: #cccccc;
9547 }
9548 #kernel_selector_widget > button .badge {
9549 color: #ffffff;
9550 background-color: #333333;
9551 }
9552 #kernel_selector_widget > button > span.caret {
9553 margin-top: 0px;
9445 }
9554 }
9446 #menubar {
9555 #menubar {
9447 margin-top: 0px;
9556 margin-top: 0px;
@@ -34,14 +34,18 b' class="notebook_app"'
34
34
35 {% block header %}
35 {% block header %}
36
36
37
37 <span id="save_widget" class="nav pull-left">
38 <span id="save_widget" class="nav pull-left">
38 <span id="notebook_name"></span>
39 <span id="notebook_name"></span>
39 <span id="checkpoint_status"></span>
40 <span id="checkpoint_status"></span>
40 <span id="autosave_status"></span>
41 <span id="autosave_status"></span>
41 </span>
42 </span>
42
43
43 <span id="kernel_selector_widget" class="nav pull-right">
44 <span id="kernel_selector_widget" class="pull-right dropdown">
44 <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="current_kernel_spec">Python</a>
45 <button href="#" class="dropdown-toggle" data-toggle="dropdown" type='button' id="current_kernel_spec">
46 <span class='kernel_name'>Python</span>
47 <span class="caret"></span>
48 </button>
45 <ul id="kernel_selector" class="dropdown-menu">
49 <ul id="kernel_selector" class="dropdown-menu">
46 </ul>
50 </ul>
47 </span>
51 </span>
General Comments 0
You need to be logged in to leave comments. Login now