Skip to content

Sofia3 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sofiaskogelin merged 3 commits into from
Jan 26, 2018
Merged

Sofia3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a61907b
ny footer
Sofiaskogelin Jan 26, 2018
9cc16fc
Merge branch 'master' into Sofia3
Sofiaskogelin Jan 26, 2018
87c364b
Merge branch 'Sofia3' of https://github.com/bruer/GamePoint-v3 into S…
Sofiaskogelin Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,24 @@ <h2>Solving problems together</h2>
</main>

<footer>
<img src="img/logo-gp.png" alt="logo game point">
<img class="footerlogo" src="img/logo-gp.png" alt="logo game point">
<h2>game point - <i>slogan</i> </h2>
<p>copyright 2017-2018</p>

<div class="info">
<div>
<ul>
<h4> Follow us </h4>
<li> Twitter </li>
<li> Facebook </li>
<h4> Follow&nbsp;us </h4>
<li>
<a href="https://twitter.com/"><img class="twitter-logo" src="img/logo-twitter.png" alt="twitter">
</a> Twitter </li>
<li> <a href="https://www.facebook.com/"> <img class="fb-logo" src="img/logo-fb.png" alt="Facebook"></a>Facebook </li>
</ul>
</div>

<div>
<ul>
<h4> Contact us </h4>
<h4> Contact&nbsp;us </h4>
<li> Storgatan 32 </li>
<li> Sweden </li>
<li> Phone </li>
Expand All @@ -95,13 +97,13 @@ <h4> Contact us </h4>
<div>
<ul>
<h4> Information </h4>
<a href="start.html"><li>Home</li></a>
<a href="about.html"><li>About</li></a>
<a href="work.html"><li>Work</li></a>
<a href="contact.html"><li>Contact</li></a>
<li><a href="start.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="work.html">Work</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>

</div>
</footer>
</body>
</html>
21 changes: 11 additions & 10 deletions contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,24 @@ <h3>get in touch</h3>
</main>

<footer>
<img src="img/logo-gp.png" alt="logo game point">
<img class="footerlogo" src="img/logo-gp.png" alt="logo game point">
<h2>game point - <i>slogan</i> </h2>
<p>copyright 2017-2018</p>

<div class="info">
<div>
<ul>
<h4> Follow us </h4>
<li> Twitter </li>
<li> Facebook </li>
<h4> Follow&nbsp;us </h4>
<li>
<a href="https://twitter.com/"><img class="twitter-logo" src="img/logo-twitter.png" alt="twitter">
</a> Twitter </li>
<li> <a href="https://www.facebook.com/"> <img class="fb-logo" src="img/logo-fb.png" alt="Facebook"></a>Facebook </li>
</ul>
</div>

<div>
<ul>
<h4> Contact us </h4>
<h4> Contact&nbsp;us </h4>
<li> Storgatan 32 </li>
<li> Sweden </li>
<li> Phone </li>
Expand All @@ -117,14 +119,13 @@ <h4> Contact us </h4>
<div>
<ul>
<h4> Information </h4>
<a href="start.html"><li>Home</li></a>
<a href="about.html"><li>About</li></a>
<a href="work.html"><li>Work</li></a>
<a href="contact.html"><li>Contact</li></a>
<li><a href="start.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="work.html">Work</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>
</div>

</footer>
</body>
</html>
22 changes: 12 additions & 10 deletions work-example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,24 @@ <h2>Our work</h2>
</main>

<footer>
<img src="img/logo-gp.png" alt="logo game point">
<img class="footerlogo" src="img/logo-gp.png" alt="logo game point">
<h2>game point - <i>slogan</i> </h2>
<p>copyright 2017-2018</p>

<div class="info">
<div>
<ul>
<h4> Follow us </h4>
<li> Twitter </li>
<li> Facebook </li>
<h4> Follow&nbsp;us </h4>
<li>
<a href="https://twitter.com/"><img class="twitter-logo" src="img/logo-twitter.png" alt="twitter">
</a> Twitter </li>
<li> <a href="https://www.facebook.com/"> <img class="fb-logo" src="img/logo-fb.png" alt="Facebook"></a>Facebook </li>
</ul>
</div>

<div>
<ul>
<h4> Contact us </h4>
<h4> Contact&nbsp;us </h4>
<li> Storgatan 32 </li>
<li> Sweden </li>
<li> Phone </li>
Expand All @@ -83,13 +85,13 @@ <h4> Contact us </h4>
<div>
<ul>
<h4> Information </h4>
<a href="start.html"><li>Home</li></a>
<a href="about.html"><li>About</li></a>
<a href="work.html"><li>Work</li></a>
<a href="contact.html"><li>Contact</li></a>
<li><a href="start.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="work.html">Work</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>

</div>
</footer>
</body>
</html>
20 changes: 11 additions & 9 deletions work.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,24 @@ <h3>Horror</h3>
</main>

<footer>
<img src="img/logo-gp.png" alt="logo game point">
<img class="footerlogo" src="img/logo-gp.png" alt="logo game point">
<h2>game point - <i>slogan</i> </h2>
<p>copyright 2017-2018</p>

<div class="info">
<div>
<ul>
<h4> Follow us </h4>
<li> Twitter </li>
<li> Facebook </li>
<h4> Follow&nbsp;us </h4>
<li>
<a href="https://twitter.com/"><img class="twitter-logo" src="img/logo-twitter.png" alt="twitter">
</a> Twitter </li>
<li> <a href="https://www.facebook.com/"> <img class="fb-logo" src="img/logo-fb.png" alt="Facebook"></a>Facebook </li>
</ul>
</div>

<div>
<ul>
<h4> Contact us </h4>
<h4> Contact&nbsp;us </h4>
<li> Storgatan 32 </li>
<li> Sweden </li>
<li> Phone </li>
Expand All @@ -105,10 +107,10 @@ <h4> Contact us </h4>
<div>
<ul>
<h4> Information </h4>
<a href="start.html"><li>Home</li></a>
<a href="about.html"><li>About</li></a>
<a href="work.html"><li>Work</li></a>
<a href="contact.html"><li>Contact</li></a>
<li><a href="start.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="work.html">Work</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>
</div>
Expand Down