Commit 821a6ac8 authored by bvagne's avatar bvagne

Merge remote-tracking branch 'origin/page_recipe_completed' into master-2

parents 53f1566d d5a5507c
......@@ -9,7 +9,7 @@
.overviewRecipe{
position: relative;
top:0;
width: 2000px;
width: 200%;
}
.carrousselRecipe{
......@@ -17,7 +17,7 @@
position: relative;
width: 30%;
top : 10%;
left: 35%;
left: 25%;
}
.ratingRecipe{
......@@ -30,10 +30,11 @@
.informationsRecipe {
position: absolute;
width: 10%;
width: 15%;
margin: 10px;
left: 65%;
left: 55%;
top:0;
background: #CD853F;
}
.Ingredients{
......@@ -42,6 +43,7 @@
left: 0%;
width: 30%;
padding : 10px;
background: #CD853F;
}
.Tools{
......@@ -50,6 +52,7 @@
bottom: 37%;
left: 0%;
padding: 10px;
background: #CD853F;
}
.Instructions{
......@@ -60,6 +63,7 @@
left:50%;
width: 30%;
padding :10px;
background: #CD853F;
}
.uling {
......@@ -73,6 +77,8 @@
width: 80%;
font-size: 25px;
}
ul > li {
position: relative;
height: 5%;
......@@ -128,3 +134,7 @@ li p {
top:30%;
left: 0;
}
.content{
background-image: url("../../assets/logoModif.jpeg"),url("../../assets/logo2.jpeg");
}
......@@ -10,7 +10,7 @@
<a href="#/profile">LOGIN</a>
</div>
<search-bar></search-bar>
<h3>{{recipeName}}</h3>
......@@ -18,13 +18,21 @@
<div>
<carousel :per-page="1" class="carrousselRecipe">
<slide v-for='image in images' :key="image.path">
<img :src="image.path">
</slide>
</carousel>
<slide>
<img src="../assets/waffle.jpg">
</slide>
<slide>
<img src="../assets/cookie.jpg">
</slide>
<slide>
<img src="../assets/cookie.jpg">
</slide>
<slide>
<img src="../assets/waffle.jpg">
</slide>
</carousel>
</div>
<div class="informationsRecipe">
<ol>
<li><img src="../assets/timer.png" class="icone"><p>prep time : {{time}}</p></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment