diff --git a/Gemfile b/Gemfile index d2d6491..c1e8d8e 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,6 @@ end gem 'administrate' gem 'dragonfly' gem 'dragonfly-s3_data_store' -gem 'haml' gem 'kaminari' gem 'monban' gem 'monban-generators' diff --git a/Gemfile.lock b/Gemfile.lock index 5bf0912..0265240 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,8 +133,6 @@ GEM formatador (0.2.5) globalid (0.3.6) activesupport (>= 4.1.0) - haml (4.0.7) - tilt i18n (0.7.0) ipaddress (0.8.3) jmespath (1.2.4) @@ -330,7 +328,6 @@ DEPENDENCIES dragonfly-s3_data_store factory_girl_rails fivemat - haml jquery-rails kaminari kramdown diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb new file mode 100644 index 0000000..757944c --- /dev/null +++ b/app/views/shared/_flash_messages.html.erb @@ -0,0 +1,13 @@ +<% if !flash[:notice].blank? %> +

+ <%= flash[:notice] %> + <%= link_to raw("×"), "#", class: :close %> +

+<% end %> + +<% if !flash[:alert].blank? %> +

+ <%= flash[:alert] %> + <%= link_to raw("×"), "#", class: :close %> +

+<% end %> diff --git a/app/views/shared/_flash_messages.html.haml b/app/views/shared/_flash_messages.html.haml deleted file mode 100644 index 064ef6c..0000000 --- a/app/views/shared/_flash_messages.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- if !flash[:notice].blank? - %p.flash.notice - = flash[:notice] - = link_to raw("×"), "#", class: :close - -- if !flash[:alert].blank? - %p.flash.alert - = flash[:alert] - = link_to raw("×"), "#", class: :close diff --git a/app/views/shared/_typekit.html.erb b/app/views/shared/_typekit.html.erb new file mode 100644 index 0000000..f69d46b --- /dev/null +++ b/app/views/shared/_typekit.html.erb @@ -0,0 +1,2 @@ +<%= javascript_include_tag "//use.typekit.com/bvi1xdc.js" %> + diff --git a/app/views/shared/_typekit.html.haml b/app/views/shared/_typekit.html.haml deleted file mode 100644 index db66176..0000000 --- a/app/views/shared/_typekit.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -= javascript_include_tag "//use.typekit.com/bvi1xdc.js" -:javascript - try{Typekit.load();}catch(e){}