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

c7510bcf · ibuler · 52e5487e · 4a0d6842 · c7510bcf · c7510bcf
Commit c7510bcf authored 6 years ago by ibuler
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 2 deletions
+5 -2
--- a/apps/assets/templates/assets/asset_create.html
+++ b/apps/assets/templates/assets/asset_create.html
@@ -86,6 +86,9 @@ $(document).ready(function () {
        allowClear: true,
        templateSelection: format
    });
+    $('#id_nodes.select2').select2({
+        closeOnSelect: false
+    });
    $("#id_protocol").change(function (){
        var protocol = $("#id_protocol option:selected").text();
        var port = 22;

--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -34,8 +34,8 @@ th a {
 }

 .select2-container--default .select2-results__option--highlighted[aria-selected] {
-    background-color: #d2d2d2 !important;
-    color: #333 !important;
+    background-color: #1ab394 !important;
+    /*color: #333 !important;*/
 }

 .select2-selection--single,