From b6b536dc5fd31510fb5806f11b6c835a7b298c9f Mon Sep 17 00:00:00 2001 From: hmtanbir Date: Tue, 1 Mar 2016 21:32:21 +0600 Subject: [PATCH] sliders add in menu --- .idea/workspace.xml | 263 +++++++++++++------------ app/assets/stylesheets/main.css | 1 + app/views/layouts/_footer.html.erb | 2 +- app/views/layouts/_header.html.erb | 1 + app/views/layouts/application.html.erb | 2 +- config/environments/production.rb | 4 +- problems.md | 11 ++ 7 files changed, 152 insertions(+), 132 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f0304c5..d2bf9ea 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,17 @@ - + + + + @@ -38,51 +41,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -91,18 +54,8 @@ - - - - - - - - - - - - + + @@ -133,7 +86,6 @@ @@ -195,9 +148,9 @@ - @@ -222,8 +175,16 @@ - - + + + + + + + + @@ -236,6 +197,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -263,23 +260,33 @@ - + + + - - - - - - + + @@ -503,7 +510,7 @@ - + @@ -518,13 +525,13 @@ - + - - + + @@ -542,9 +549,9 @@ - - + + @@ -565,21 +572,6 @@ - - - - - - - - - - - - - - - @@ -811,16 +803,6 @@ - - - - - - - - - - @@ -842,13 +824,6 @@ - - - - - - - @@ -872,41 +847,57 @@ - + - + + + + + + + + - + + + + + + + + + - - + + + - + - - + + - + - - + + - + - + @@ -919,18 +910,34 @@ - + + + + + + + + + - + - - + + + + + + + + + + diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css index b0b9308..4a3cd02 100644 --- a/app/assets/stylesheets/main.css +++ b/app/assets/stylesheets/main.css @@ -2786,6 +2786,7 @@ a.mean-expand { } .footer-boxed .footer-inner { background-image: url("footer-bg-full.jpg"); + } .footer-fluid { background-image: url("temp-images/footer-bg-full.jpg"); diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 432e82c..c09e95a 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -4,7 +4,7 @@
- <%= image_tag 'logo1.png' %> + <%= image_tag 'logo2.png' %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 1e58870..066ab65 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -57,6 +57,7 @@
  • Recipes
    • <% if user_signed_in? %> +
  • Sliders
  • Submit Recipe
    • <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 16dc8d7..bf2d5c1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -57,7 +57,7 @@ - +<%= render 'layouts/footer' %> diff --git a/config/environments/production.rb b/config/environments/production.rb index bdf1b67..8ddcc58 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -29,14 +29,14 @@ # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # Asset digests allow you to set far-future HTTP expiration dates on all assets, # yet still be able to expire them through the digest params. config.assets.digest = true # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - + config.serve_static_files = true # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX diff --git a/problems.md b/problems.md index 92dc62b..00dc3e1 100644 --- a/problems.md +++ b/problems.md @@ -142,3 +142,14 @@ iii) Now open again home/index.html.erb file and write this code for showing sea
    <% end %> + +9.Background image not showing up in heroku,why? +solution: +In your production.rb add the following line + +config.serve_static_files = true +config.assets.compile = true + +or you can try to precompile the assets locally using + +RAILS_ENV=production rake assets:precompile \ No newline at end of file