Merge branch 'dev' into test

package-lock.json

@@ -5116,6 +5116,11 @@
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
       "dev": true
     },
+    "inconsolata": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/inconsolata/-/inconsolata-0.0.2.tgz",
+      "integrity": "sha1-uqFDP0PUKqHtsmvZ7odzjpKSUOs="
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -6165,9 +6170,6 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "layui-layer": {
-      "version": "git+https://github.com/jumpserver/layer.git#c568876741b64556df9916ed678a6106e1e82899"
-    },
     "lazy-cache": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",

package.json

@@ -32,6 +32,7 @@
     "filetree-css": "^1.0.0",
     "font-awesome": "^4.7.0",
     "handlebars": "^4.0.11",
+    "inconsolata": "0.0.2",
     "jquery": "^3.1.0",
     "jquery-slimscroll": "^1.3.8",
     "jquery-sparkline": "^2.4.0",

src/app/ControlPage/cleftbar/cleftbar.component.css

@@ -51,7 +51,7 @@ label {
 
 .search {
   border-left-width: 0;
-  border-bottom: gold 2px inset;
+  border-bottom: #19aa8d 2px inset;
 }
 
 .left-search {
@@ -71,3 +71,7 @@ label {
   padding: 1px 20px 0 20px;
   position: absolute;
 }
+
+.fa.fa-undefined:before {
+  content: "\f26c";
+}

src/app/ControlPage/control/controlnav/controlnav.component.css

@@ -32,7 +32,7 @@
 
 .tabs ul li.active {
   box-sizing: border-box;
-  border-bottom: 3px solid #7f3f98 !important;
+  border-bottom: 3px solid #19aa8d !important;
 }
 
 .tabs ul li span {

src/assets/inspinia/imports/_md-skin.scss

-//@import url("https://fonts.googleapis.com/css?family=Roboto:400,300,500,700");
 
 $md-color-primary: #1AB394;
 $md-shadow-main: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);

src/assets/inspinia/style.scss

@@ -5,7 +5,6 @@
  *
 */
 // Google Fonts
-//@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700");
 
 // Variables, Mixins
 @import "imports/variables";

src/styles.css

@@ -4,9 +4,10 @@
  * --------------------------------------------------
  */
 @font-face {
-  font-family: iosevka;
-  src: url('assets/fonts/iosevka-term-ss07-1.13.3/woff2/iosevka-term-ss07-light.woff2') format("woff2");
+  font-family: Inconsolata;
+  src: url('assets/fonts/inconsolata.woff') format("woff");
   font-weight: normal;
+  font-size: large;
 }
 
 html,
@@ -29,11 +30,11 @@ app-root {
   z-index: -1;
   font-size: 11px !important;
   padding-bottom: 16px !important;
-  font-family: 'Monaco', iosevka !important;
+  font-family: 'Monaco', Inconsolata !important;
 }
 
 .terminal {
-  font-family: 'Monaco', iosevka;
+  font-family: 'Monaco', Inconsolata;
   font-size: 11px;
   white-space: nowrap;
   display: inline-block;