diff --git a/app/assets/images/auth_bg.jpg b/app/assets/images/auth_bg.jpg index 3dd6271a5..bcc4a1250 100644 Binary files a/app/assets/images/auth_bg.jpg and b/app/assets/images/auth_bg.jpg differ diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico new file mode 100644 index 000000000..a68af1ef8 Binary files /dev/null and b/app/assets/images/favicon.ico differ diff --git a/app/assets/images/header_bg.jpg b/app/assets/images/header_bg.jpg new file mode 100644 index 000000000..8d991b8f8 Binary files /dev/null and b/app/assets/images/header_bg.jpg differ diff --git a/app/assets/images/home_header_bg.jpg b/app/assets/images/home_header_bg.jpg deleted file mode 100644 index 3f5065f9b..000000000 Binary files a/app/assets/images/home_header_bg.jpg and /dev/null differ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e27dcc51c..d04b2553d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,17 +9,18 @@ <%= javascript_include_tag "vendor/modernizr" %> <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> + <%= favicon_link_tag "favicon.ico" %> -
+ "> <%= render 'layouts/header' %> <% if notice %> -<%= notice %>
+<%= notice %>
<% end %> <% if alert %> -<%= alert %>
+<%= alert %>
<% end %> <%= yield %> diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 85f448f81..3631d3619 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -14,11 +14,11 @@ <% if notice %> -<%= notice %>
+<%= notice %>
<% end %> <% if alert %> -<%= alert %>
+<%= alert %>
<% end %>- - <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %> - <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %> - -
+ + <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %> + <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %> +