Skip to content

Commit

Permalink
Merge pull request #59 from FAC29A/layout-footer
Browse files Browse the repository at this point in the history
My last pull request before sending my laptop repair
  • Loading branch information
JasonWarrenUK authored Oct 1, 2023
2 parents 6b02927 + 136dec3 commit 4e3537c
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 17 deletions.
File renamed without changes
Binary file added images/associate-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/associate-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/associate-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/associate-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/associate-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/instagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/tiktok.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 18 additions & 16 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h2 class="center">Associates</h2>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-1.png"
width="170"
height="170"
alt="A card showing one of our associates"
Expand All @@ -151,14 +151,14 @@ <h3>Oliver twist</h3>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-2.png"
width="170"
height="170"
alt="A card showing one of our associates"
/>

<img class="associatePocket"
src="/images/pocket-red.png"
src="/images/pocket-blush.png"
width="170"
height="170"
alt="A pocket"
Expand All @@ -175,14 +175,14 @@ <h3>Oliver twist</h3>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-3.png"
width="170"
height="170"
alt="A card showing one of our associates"
/>

<img class="associatePocket"
src="/images/pocket-red.png"
src="/images/pocket-violet.png"
width="170"
height="170"
alt="A pocket"
Expand All @@ -199,7 +199,7 @@ <h3>Oliver twist</h3>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-4.png"
width="170"
height="170"
alt="A card showing one of our associates"
Expand All @@ -223,14 +223,14 @@ <h3>Oliver twist</h3>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-5.png"
width="170"
height="170"
alt="A card showing one of our associates"
/>

<img class="associatePocket"
src="/images/pocket-red.png"
src="/images/pocket-blush.png"
width="170"
height="170"
alt="A pocket"
Expand All @@ -247,14 +247,14 @@ <h3>Oliver twist</h3>
<div class="associateHolder">
<div class="associate">
<img class="associateCard"
src="/images/assoociate-1.png"
src="/images/associate-6.png"
width="170"
height="170"
alt="A card showing one of our associates"
/>

<img class="associatePocket"
src="/images/pocket-red.png"
src="/images/pocket-violet.png"
width="170"
height="170"
alt="A pocket"
Expand Down Expand Up @@ -318,16 +318,18 @@ <h2>Contact</h2>
</div>
</section>
</div>

</main>

<footer class="center width-xl stack-lg">
<footer class="center row width-xl stack-lg">


<h2>footer title </h2>

<div class="social-media-group center width-md row justify-center">
<p> instagram </p>
<p> facebook </p>
<p> tiktok </p>
<div class="social-media-group center width-xl row justify-center">
<img src="/images/facebook.png" heigh="50" width="50">
<img src="/images/instagram.png" heigh="50" width="50">
<img src="/images/tiktok.png" heigh="40" width="40">
</div>

<p>More footer text</p>
Expand Down
14 changes: 13 additions & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ html {font-size: 10px;}
margin-right: auto;
}


.pad2 {padding: 2rem;}
.pad3 {padding: 3rem;}
.pad0Top {padding-top: :0;}
.pad5Top {padding-top: 5rem;}

.width-sm {max-width: 20rem;}
Expand Down Expand Up @@ -339,4 +341,14 @@ input[type="checkbox"] {
.contact-text {text-align: center;}

/* footer css */
footer {text-align: center;}
#black-background {
height: 5rem;
width:100%;
background-color: var(--black);
}

footer {
text-align: center;
padding: 2rem;
height: 30rem ;
}

0 comments on commit 4e3537c

Please sign in to comment.