htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into disable_rfcs

Browse Source 
# Conflicts:
#	app/assets/stylesheets/editor.css.scss
This commit is contained in:
Ralf Teusner
2018-03-07 17:30:14 +01:00
parent fbff875348 84bd85703d
commit 182062b480
26 changed files with 138 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/application/_flash.html.slim
View File

@@ -1,5 +1,6 @@
#flash.fixed_error_messages data-message-failure=t('shared.message_failure')
- %w[alert danger info notice success warning].each do |severity|
div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}"
p id="flash-#{severity}" = flash[severity]
span.fa.fa-times
#flash-container
#flash.container.fixed_error_messages data-message-failure=t('shared.message_failure')
- %w[alert danger info notice success warning].each do |severity|
div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}"
p id="flash-#{severity}" = flash[severity]
span.fa.fa-times