Merge branch 'dev' into test

ef260b58 · liuzheng · 1e29be5b · aa82cef6 · ef260b58 · ef260b58
Unverified Commit ef260b58 authored Jan 02, 2018 by liuzheng
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

cleftbar.component.css src/app/ControlPage/cleftbar/cleftbar.component.css +4 -0

cleftbar.component.ts src/app/ControlPage/cleftbar/cleftbar.component.ts +1 -0

No files found.
--- a/src/app/ControlPage/cleftbar/cleftbar.component.css
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.css
@@ -65,4 +65,8 @@ label {

 .footer {
  background: #2f2a2a;
+  font-size: 12pt;
+  border-top-width: 1px;
+  padding-top: 1px;
+  padding-bottom: 5px;
 }
--- a/src/app/ControlPage/cleftbar/cleftbar.component.ts
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.ts
@@ -42,6 +42,7 @@ export class CleftbarComponent implements OnInit {
  DataStore = DataStore;
  HostGroups: Array<HostGroup>;
  version = version;
+  q: string;

  static Reload() {
  }