Merge branch 'dev' into test

5f1681bb · liuzheng · 943f7174 · db17df36 · 5f1681bb · 5f1681bb
Unverified Commit 5f1681bb authored Jan 02, 2018 by liuzheng
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

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

cleftbar.component.html src/app/ControlPage/cleftbar/cleftbar.component.html +1 -1

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

 .footer {
  background: #2f2a2a;
-  font-size: 12pt;
+  font-size: 9pt;
  border-top-width: 1px;
-  padding-top: 1px;
-  padding-bottom: 5px;
+  left: 0;
+  padding: 1px 20px 30px 20px;
+  position: absolute;
 }
--- a/src/app/ControlPage/cleftbar/cleftbar.component.html
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.html
@@ -18,5 +18,5 @@
  </ul>
 </div>
 <div class="footer">
-  Version <strong>{{version}}</strong> GPL.
+  Version <strong>{{version}}</strong>
 </div>