scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2316 from okriuchykhin/ok_SCI_4243

Browse source 
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
This commit is contained in:
Alex Kriuchykhin 2020-01-16 10:20:46 +01:00 committed by GitHub
parent ce3b4450cc 168ba9d1c6
commit c5ccfc1bb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/views/layouts/sign_in_halt.html.erb
View file

@ -24,7 +24,7 @@
<div class="container-fluid">
<div class="navbar-header">
<span class="navbar-brand" title="<% t('nav.label.scinote') %>">
<%= image_tag('/images/scinote_icon.jpg', id: 'logo') %>
<%= image_tag('/images/scinote_icon.svg', id: 'logo') %>
</span>
</div>
<% if user_signed_in? %>
@ -36,15 +36,9 @@
<% end %>
</div>
</nav>
<% if flash[:error]%>
<div class="alert alert-danger alert-dismissable alert-floating">
<div class="container">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="fas fa-exclamation-circle"></span>
<span><%= sanitize_input(flash[:error]) %></span>
</div>
</div>
<% end %>
<%= render partial: 'shared/flash_alerts', locals: { flash: flash, notice: notice, alert: alert } %>
<div class="container sign-in-halt-container">
<%= yield %>
</div>