Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

pull/2140/head
ibuler 2018-12-10 19:51:57 +08:00
commit c7510bcf19
2 changed files with 5 additions and 2 deletions

View File

@ -86,6 +86,9 @@ $(document).ready(function () {
allowClear: true, allowClear: true,
templateSelection: format templateSelection: format
}); });
$('#id_nodes.select2').select2({
closeOnSelect: false
});
$("#id_protocol").change(function (){ $("#id_protocol").change(function (){
var protocol = $("#id_protocol option:selected").text(); var protocol = $("#id_protocol option:selected").text();
var port = 22; var port = 22;

View File

@ -34,8 +34,8 @@ th a {
} }
.select2-container--default .select2-results__option--highlighted[aria-selected] { .select2-container--default .select2-results__option--highlighted[aria-selected] {
background-color: #d2d2d2 !important; background-color: #1ab394 !important;
color: #333 !important; /*color: #333 !important;*/
} }
.select2-selection--single, .select2-selection--single,