Merge pull request #1 from Axelbruget/master

cosmetic changes : fixed double popup bug and logo
alexandrecuer · Apr 4, 2018 · 03dd2ef · 03dd2ef
2 parents 7fab619 + 197c8bd
commit 03dd2ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,7 +11,7 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_ujs
+
 //= require rails-ujs
 //= require turbolinks
 //= require_tree .
@@ -36,4 +36,4 @@ $(function() {
         return show(id, text);
     })
 });
-*/
+*/
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>Cerema ShareBox</title>
+    <link rel="shortcut icon" href="../../../public/images/logo/logo.jpg">
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>