Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb
This commit is contained in:
Maximilian Grundke
2018-02-28 16:48:14 +01:00
44 changed files with 330 additions and 226 deletions

View File

@ -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;
}