Merge branch 'master' into disable_rfcs

# Conflicts: # app/assets/stylesheets/editor.css.scss
2018-03-07 17:30:14 +01:00
parent fbff875348 84bd85703d
commit 182062b480
26 changed files with 138 additions and 78 deletions
--- a/lib/assets/stylesheets/flash.css.scss
+++ b/lib/assets/stylesheets/flash.css.scss
@ -1,3 +1,8 @@
+#flash-container {
+  position: relative;
+  top: -21px;
+}
+
 .flash {
  display: none;

@ -10,14 +15,10 @@
 }

 .fixed_error_messages {
-  position: fixed;
+  position: absolute;
  z-index: 1000;
-  top: 20px;
-  left: 0;
+  padding: inherit;
  width: 100%;
-  padding-left: 10%;
-  padding-right: 10%;
-  padding-top: 0;
 }