Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Martin Lensment 2015-03-27 12:49:59 +02:00
commit 9ebc809c66
6 changed files with 10 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -8,7 +8,7 @@
= csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
%link{href: "../../favicon.ico", rel: "icon"}/
= favicon_link_tag 'favicon.ico'
%title Eesti Interneti SA
%body{:style => env_style}
/ Static navbar

View file

@ -8,7 +8,7 @@
= csrf_meta_tags
= stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
%link{href: "../../favicon.ico", rel: "icon"}/
= favicon_link_tag 'favicon.ico'
%title EIS Registrar Portal
%body
/ Static navbar

View file

@ -9,7 +9,7 @@
= csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
%link{:href => "../../favicon.ico", :rel => "icon"}/
= favicon_link_tag 'favicon.ico'
%title Eesti Interneti SA - Log In
%body{:style => env_style}
.container

View file

@ -9,7 +9,7 @@
= csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
%link{:href => "../../favicon.ico", :rel => "icon"}/
= favicon_link_tag 'favicon.ico'
%title EIS Registrar - Log In
%body{:style => env_style}
.container

View file

@ -33,6 +33,12 @@ module Registry
# Load all model subdirs
config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')]
# Add the fonts path
config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
# Precompile additional assets
config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
# Active Record used to suppresses errors raised within
# `after_rollback`/`after_commit` callbacks and only printed them to the logs.
# In the next version, these errors will no longer be suppressed.