Skip to content

Commit 05ef4df

Browse files
authored
Merge pull request #4 from Isma69/master
merge master avec ismael
2 parents dc0cba9 + 013807c commit 05ef4df

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

agile-dev/css/custom.css

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
#img_cover {
2+
float: left;
3+
margin-right: 10%;
4+
}
5+
6+
#section2 {
7+
margin: 5%;
8+
display: flex;
9+
justify-content: space-around;
10+
}
11+
12+
#text2 {
13+
display: flex;
14+
flex-direction: column;
15+
width: 30%;
16+
justify-content: center;
17+
}
118
.nav-wrapper{
219
background-color: blue;
320
}
@@ -69,4 +86,4 @@
6986
.features .text-wrapper{
7087
text-align: center;
7188
}
72-
}
89+
}

agile-dev/index.html

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,17 @@ <h1>Découvrez notre toute nouvelle App</h1>
5454
</div>
5555
</section>
5656

57-
<!-- Start code here -->
57+
<!-- Start code here -->
58+
<div id="section2">
59+
<img src="img/iphone_side_light.png" width="300px" id="img_cover"/>
60+
<div id="text2">
61+
<h2>Benefice</h2>
62+
<p>
63+
dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
64+
</p>
65+
<a class="waves-effect waves-light btn">Lorem ipsum</a>
66+
</div>
67+
</div>
5868

5969
<!-- finish code here -->
6070

0 commit comments

Comments
 (0)