5 files changed, 40 insertions, 4 deletions
diff --git a/webapp/sass/base/_structure.scss b/webapp/sass/base/_structure.scss
index 60673f9a2..df7d75329 100644
--- a/webapp/sass/base/_structure.scss
+++ b/webapp/sass/base/_structure.scss
@@ -10,6 +10,10 @@ body {
     height: 100%;
     position: relative;
     width: 100%;
+
+    &.error-bar--fixed {
+        padding-top: 22px;
+    }
 }
 
 .sticky {
diff --git a/webapp/sass/components/_error-bar.scss b/webapp/sass/components/_error-bar.scss
index c2ad2402a..765b61ba8 100644
--- a/webapp/sass/components/_error-bar.scss
+++ b/webapp/sass/components/_error-bar.scss
@@ -4,16 +4,33 @@
     background-color: darken($primary-color, 5%);
     color: $white;
     padding: 5px 30px;
-    position: absolute;
+    position: fixed;
     text-align: center;
     top: 0;
     width: 100%;
     z-index: 9999;
 
+    &.error-bar--fixed {
+        overflow: hidden;
+        padding: 1px 30px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
     a {
-        color: $white !important;
+        color: $white;
         text-decoration: underline;
 
+        .app__body & {
+            color: $white;
+
+            &:hover,
+            &:active,
+            &:focus {
+                color: $white;
+            }
+        }
+
         &.error-bar__close {
             color: $white;
             font-family: 'Open Sans', sans-serif;
diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss
index d08a9ef45..abe49b9c6 100644
--- a/webapp/sass/layout/_sidebar-left.scss
+++ b/webapp/sass/layout/_sidebar-left.scss
@@ -8,6 +8,10 @@
     width: 220px;
     z-index: 5;
 
+    .error-bar--fixed & {
+        height: calc(100% - 22px);
+    }
+
     &.sidebar--padded {
         padding-top: 44px;
     }
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index a1698b3a1..ab73e075b 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -10,6 +10,10 @@
     width: 400px;
     z-index: 8;
 
+    .error-bar--fixed & {
+        height: calc(100% - 22px);
+    }
+
     &.webrtc {
         z-index: 5;
     }
@@ -85,8 +89,8 @@
                 @include opacity(.55);
                 position: absolute;
                 top: -25px;
-          }
-       }
+            }
+        }
     }
 
     .help__format-text {
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index aece76b28..26e93ec3d 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -12,6 +12,13 @@
     overflow: auto;
     padding: 0 20px;
 
+    .color-picker__popover {
+        position: absolute;
+        right: 0;
+        top: 40px;
+        z-index: 5;
+    }
+
     .dropdown-menu {
         .divider {
             @include opacity(1);