Merge branch 'master' into mm-1420

1 files changed, 1 insertions, 53 deletions

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 1fb970075..52659521d 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -5,7 +5,7 @@ html, body {
 body {
   font-family: 'Open Sans', sans-serif;
   -webkit-font-smoothing: antialiased;
-  background: #e9e9e9;
+  background: $body-bg;
   position: relative;
   height: 100%;
   &.white {
@@ -96,32 +96,6 @@ div.theme {
   position:relative;
 }
 
-.command-box {
-  position:absolute;
-  background-color:#fff;
-  width:100%;
-  border:1px solid #ddd;
-  bottom: 38;
-}
-
-.command-name {
-  position: relative;
-  width: 100%;
-  background-color: #fff;
-  height: 37px;
-  line-height: 37px;
-  padding: 2px 10px 2px 5px;
-  z-index: 101;
-}
-
-.command-name:hover {
-  background-color:#e8eaed;
-}
-
-.command-desc {
-  color: #a7a8ab;
-}
-
 @-webkit-keyframes spin2 {
   from { -webkit-transform: rotate(0deg);}
   to { -webkit-transform: rotate(360deg);}
@@ -139,29 +113,3 @@ div.theme {
 .black-bg {
   background-color: black !important;
 }
-
-#error_bar {
-  background-color: #0099FF;
-  text-align:center;
-  position: relative;
-  color: #fff;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 9999;
-
-  .error-bar {
-    padding: 5px 30px;
-  }
-
-  .error-close {
-    position: absolute;
-    right: 0;
-    top: 0;
-    color: #FFF;
-    font-size: 20px;
-    font-weight: 600;
-    text-decoration: none;
-    padding: 0 10px;
-  }
-}
\ No newline at end of file