From fdd2656a7b6e4f2c7139aebedf6cab6ca45dddef Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Tue, 29 Jul 2014 13:36:54 +0300 Subject: [PATCH] Theme the site with the current OpenFest WP Theme --- app/assets/javascripts/application.js | 1 - app/views/layouts/_nav.html.erb | 27 ++++++++++++++++++ app/views/layouts/application.html.erb | 38 ++++++++++++++++++++------ 3 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 app/views/layouts/_nav.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..1ca0e3b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,4 @@ // //= require jquery //= require jquery_ujs -//= require turbolinks //= require_tree . diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb new file mode 100644 index 0000000..2a04c27 --- /dev/null +++ b/app/views/layouts/_nav.html.erb @@ -0,0 +1,27 @@ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f5a1741..cb9643b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,34 @@ - - Clarion - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - + + Clarion + <%= stylesheet_link_tag 'application' %> + <%= stylesheet_link_tag 'http://openfest.org/wp-content/themes/thematic-openfest/style.css' %> + <%= csrf_meta_tags %> + + +
+ - +
+ <%= yield %> +
+
+ <%= javascript_include_tag 'application' %> +