diff --git a/Gemfile b/Gemfile index f4e5663..1c06c25 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' -gem "therubyracer" +gem "therubyracer", group: :production #gem "less-rails" gem "sass-rails", "~> 4.0.3" gem "twitter-bootstrap-rails" @@ -54,8 +54,8 @@ group :doc do gem 'sdoc', require: false end -gem "capistrano", group: :development -gem "rvm-capistrano", group: :development +gem "capistrano", group: :development, require: false +gem "rvm-capistrano", group: :development, require: false gem 'net-ssh', '~>2.7.0' # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 330ca6d..e4c9ef4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.2) kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) diff --git a/app/assets/images/logo-gold.png b/app/assets/images/logo-gold.png new file mode 100644 index 0000000..2e07249 Binary files /dev/null and b/app/assets/images/logo-gold.png differ diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 3876bad..bebf42d 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -4,21 +4,24 @@ resize = () -> - $(".electrolux_img .img").css("padding-top", ($(".electrolux_img").height() - $(".electrolux_img img").height())/ 2) + $(".electrolux2_img .img").css("padding-top", ($(".electrolux2_img").height() - $(".electrolux2_img img").height())/ 2) $(".miele_img .img").css("padding-top", ($(".miele_img").height() - $(".miele_img img").height())/ 2) + $(".gold_img .img").css("padding-top", ($(".gold_img").height() - $(".gold_img img").height())/ 2) + + $(".with_ratio").each -> + ratio = parseFloat($(this).data("ratio")) + height = $(this).width()*ratio + + $(this).css("height",height+"px") - - $(".electrolux").css("margin-left", ($(window).width() - ($(".electrolux").width()*2))/ 3) - $(".miele").css("margin-right", ($(window).width() - ($(".electrolux").width()*2))/ 3) - - $(".row").css("top", ($(window).height() - $(".row").height())/ 2) + #$(".panels").css("top", ($(window).height() - $(".row").height())/ 2) $ -> resize() $(window).bind "resize", -> resize() - $(".electrolux, .miele").click (event) -> + $(".electrolux, .miele, .gold").click (event) -> window.location.href = $(this).find("a:first").attr("href") \ No newline at end of file diff --git a/app/assets/javascripts/contact.js.coffee b/app/assets/javascripts/contact.js.coffee deleted file mode 100644 index 7615679..0000000 --- a/app/assets/javascripts/contact.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/pages.js.coffee b/app/assets/javascripts/pages.js.coffee deleted file mode 100644 index 7615679..0000000 --- a/app/assets/javascripts/pages.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 4daa916..5abc83c 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -622,51 +622,67 @@ body{ } -.electrolux, .miele{ -box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15); -background:white; -max-width:600px; -margin:auto; +.panel{ + box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15); + background:white; + width:600px; + margin:20px 20px; + display:inline-block; + max-width:90%; -&:hover{ -cursor:pointer; -box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25); + &:hover{ + cursor:pointer; + box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25); -} -.logo{ -float:left; -margin:10px 10px; + } + .logo_container{ + background:rgba(0,0,0,0.9); + } + .img{ + margin:auto; + display:block; + padding:10px; + height:100px; + } + .logo{ + float:left; + margin:10px 10px; + } + + h3{ + margin:0px; + padding:24px 10px; + padding-right:20px; + font-size:16px; + text-align:right; + } } -h3{ -margin:0px; -padding:24px 10px; -padding-right:20px; -font-size:16px; -text-align:right; -} +.panels{ + text-align:center; } - -.electrolux_img{ - -background:url("/laverie-electrolux.jpg")center center; - -background-size:cover; -height:350px; - -&:hover{ - - -background:url("/laverie-electrolux2.jpg")center center; -background-size:cover; -} -.img{ -width:396px; -margin:auto; -display:block; +.electrolux2{ + .img{ + height:auto; + width:250px; + } } +.electrolux2_img{ + + background:url("/laverie-electrolux.jpg")center center; + + background-size:cover; + height:350px; + + + .img{ + width:396px; + margin:auto; + display:block; + } + @@ -688,13 +704,33 @@ height:350px; -&:hover{ - - -background:url("/laverie-miele2.jpg")center center; -background-size:cover; +.img{ +width:273px; +margin:auto; +display:block; } + +} + + + +.gold_img{ +.new{ +position:absolute; +top:0px; +right:0px; +width:200px; + +} +position:relative; + +background:url("/laverie-gold.jpg")center center; +background-size:cover; +height:350px; + + + .img{ width:273px; margin:auto; @@ -705,6 +741,8 @@ display:block; } + + .auclair{ background:url("/auclair_bg.jpg") ; background-size:cover; diff --git a/app/views/pages_content/index.html.haml b/app/views/pages_content/index.html.haml index 17965af..c441f16 100644 --- a/app/views/pages_content/index.html.haml +++ b/app/views/pages_content/index.html.haml @@ -3,36 +3,50 @@ -@keywords = "Laverie automatique,Laverie self service, acheter laverie, laverie libre service, franchise laverie, laveries libre service,lavomatique, laverie, libre-service, pressing, blanchisserie, laver, machine a laver, lavoir, linge, lavette, distributeur de lessive, lessive, centrale de paiement, monnayeur, miele, electrolux" - - -.row - .header - %h1 Créez votre laverie automatique avec les meilleures marques : - .span_6.columns - .electrolux - .electrolux_img - =link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie" + +.header + %h1 Créez votre laverie automatique avec les meilleures marques : +.panels + .panel.electrolux2 + .logo_container=link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie" + .electrolux2_img.with_ratio{:data => {:ratio => 0.4}} - =link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux" + + =link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux" + + + %h3 + =link_to "Votre laverie équipée avec Electrolux", "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux" + + + + + .panel.miele + .logo_container=link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele", :class => "img"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" + .miele_img.with_ratio{:data => {:ratio => 0.4}} - %h3 - =link_to "Votre laverie équipée avec Electrolux", "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux" + =link_to image_tag("logo-miele.png", :class => "logo", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" + + + %h3 + =link_to "Votre laverie équipée avec Miele Professional", "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" - - .span_6.columns - .miele - .miele_img - =link_to image_tag("nouveau.png", :alt => "Nouveau : Une autre laverie, laverie automatique Miele", :class => "new"), "http://une-autre-laverie.com", :title => "Nouveau : Une autre laverie, laverie automatique Miele" - =link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele", :class => "img"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" - =link_to image_tag("logo-miele.png", :class => "logo", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" - - - %h3 - =link_to "Votre laverie équipée avec Miele Professional", "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" + .panel.gold + .logo_container=link_to image_tag("logo-gold.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "https://gold-laverie.com/", :title => "Laverie automatique Electrolux avec Gold Laverie" + .gold_img.with_ratio{:data => {:ratio => 0.4}} + =link_to image_tag("nouveau.png", :alt => "Acheter laverie automatique electrolux", :class => "new"), "http://une-autre-laverie.com", :title => "Laverie automatique Electrolux avec Gold Laverie" + + =link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "https://gold-laverie.com/", :title => "Gold Laverie, installation laverie automatique Electrolux" + + + %h3 + =link_to "Votre laverie équipée avec Electrolux", "https://gold-laverie.com/", :title => "Gold Laverie, installation laverie automatique Electrolux" + + diff --git a/public/laverie-gold.jpg b/public/laverie-gold.jpg new file mode 100644 index 0000000..cc2988f Binary files /dev/null and b/public/laverie-gold.jpg differ diff --git a/public/laverie-gold2.jpg b/public/laverie-gold2.jpg new file mode 100644 index 0000000..b376a00 Binary files /dev/null and b/public/laverie-gold2.jpg differ