Merge branch 'master' into practice

updating branch with the new changes in the user profile section of the website
This commit is contained in:
soyed 2021-03-09 18:47:18 -05:00
commit 54d00dd7bc
4 changed files with 90 additions and 14 deletions

View file

@ -62,6 +62,10 @@ h3 {
font-size: 1.5rem;
}
h5{
font-weight: bold;
}
p {
color: rgb(77, 77, 77);
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif
@ -131,6 +135,25 @@ p {
text-align: left;
}
/* Worker profiles */
.profile{
width: 200px;
height: 200px;
object-fit: cover;
}
.profile_names{
font-size:25px;
}
.name_text{
font-weight
}
/* Features section */

BIN
images/Stewie.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

BIN
images/mumen.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 KiB

View file

@ -83,25 +83,78 @@
<div class="container-fluid">
<h1 style="font-weight: bold;">Meet the Team</h1>
<br>
<br>
<div class="row">
<div class="feature-box col">
<h1 style="font-weight: bold;">Hey, my name is Batuhan.</h1>
<p>Ever since I was a child, it was my dream to own
a bike shop. One day after school, a bike fell out of the sky
and I could see that it was broken. I managed to fix that bike
up and use it in bike tournaments. That same bike is the one that I
used to win the national biking tournament in Bikini Bottom. To this day,
I don't know where that bike came from but I wish to pass on my good fortune to
others by helping them with their bikes. </p>
<div class="col-lg-4 col-12">
<div class="card mb-3" style="max-width: 540px;">
<div class="row g-0">
<div class="col-md-4">
<img src="images\owner_pic.jpg" alt="" class="profile">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title ">Batuhan</h5>
<p class="card-text">Hey, I'm the store owner. Ever since I was a child, it was my dream to own
a bike shop. I specialize in brake repair.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
<div class="feature-box col-lg-4">
<p><img src="images\owner_pic.jpg" alt="Girl in a jacket"> </p>
</div>
</div>
<div class="col-lg-4 col-12">
<div class="card mb-3" style="max-width: 540px;">
<div class="row g-0">
<div class="col-md-4">
<img src="images\mumen.jpg" alt="" class="profile">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title">Mumem</h5>
<p class="card-text">Without biking, my life has no meaning. I am
the best at fixing punctures in town.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-4 col-12">
<div class="card mb-3" style="max-width: 540px;">
<div class="row g-0">
<div class="col-md-4">
<img src="images\Stewie.png" alt="" class="profile">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title">Stewart</h5>
<p class="card-text"> I recently got my masters in bike fixing. I can help you with any repair or maintenence </p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
</div>
</div>
</div>
</section>