This commit is contained in:
Nicolas Bally 2019-06-11 15:38:12 +02:00
parent a7aef9b805
commit 7d69da3aba
10 changed files with 131 additions and 82 deletions

View File

@ -27,7 +27,7 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.0.1' gem 'jbuilder', '~> 1.0.1'
gem "therubyracer" gem "therubyracer", group: :production
#gem "less-rails" #gem "less-rails"
gem "sass-rails", "~> 4.0.3" gem "sass-rails", "~> 4.0.3"
gem "twitter-bootstrap-rails" gem "twitter-bootstrap-rails"
@ -54,8 +54,8 @@ group :doc do
gem 'sdoc', require: false gem 'sdoc', require: false
end end
gem "capistrano", group: :development gem "capistrano", group: :development, require: false
gem "rvm-capistrano", group: :development gem "rvm-capistrano", group: :development, require: false
gem 'net-ssh', '~>2.7.0' gem 'net-ssh', '~>2.7.0'
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0' # gem 'bcrypt-ruby', '~> 3.0.0'

View File

@ -74,7 +74,7 @@ GEM
jquery-rails (3.1.2) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.2)
kaminari (0.16.1) kaminari (0.16.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -4,21 +4,24 @@
resize = () -> 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) $(".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")
#$(".panels").css("top", ($(window).height() - $(".row").height())/ 2)
$(".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)
$ -> $ ->
resize() resize()
$(window).bind "resize", -> $(window).bind "resize", ->
resize() resize()
$(".electrolux, .miele").click (event) -> $(".electrolux, .miele, .gold").click (event) ->
window.location.href = $(this).find("a:first").attr("href") window.location.href = $(this).find("a:first").attr("href")

View File

@ -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/

View File

@ -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/

View File

@ -622,51 +622,67 @@ body{
} }
.electrolux, .miele{ .panel{
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15); box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15);
background:white; background:white;
max-width:600px; width:600px;
margin:auto; margin:20px 20px;
display:inline-block;
max-width:90%;
&:hover{ &:hover{
cursor:pointer; cursor:pointer;
box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25); box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25);
} }
.logo{ .logo_container{
float:left; background:rgba(0,0,0,0.9);
margin:10px 10px; }
.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{ .panels{
margin:0px; text-align:center;
padding:24px 10px;
padding-right:20px;
font-size:16px;
text-align:right;
}
} }
.electrolux2{
.electrolux_img{ .img{
height:auto;
background:url("/laverie-electrolux.jpg")center center; width:250px;
}
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{
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{ .img{
width:273px;
margin:auto;
background:url("/laverie-miele2.jpg")center center; display:block;
background-size:cover;
} }
}
.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{ .img{
width:273px; width:273px;
margin:auto; margin:auto;
@ -705,6 +741,8 @@ display:block;
} }
.auclair{ .auclair{
background:url("/auclair_bg.jpg") ; background:url("/auclair_bg.jpg") ;
background-size:cover; background-size:cover;

View File

@ -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" -@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 : .header
.span_6.columns %h1 Créez votre laverie automatique avec les meilleures marques :
.electrolux .panels
.electrolux_img .panel.electrolux2
=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" .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 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"
=link_to "Votre laverie équipée avec Electrolux", "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux"
%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 .panel.gold
.miele .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"
.miele_img .gold_img.with_ratio{:data => {:ratio => 0.4}}
=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("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-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"
=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"

BIN
public/laverie-gold.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 KiB

BIN
public/laverie-gold2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB