Skip to content

Commit

Permalink
Bug fixes on top left images and GIT link.
Browse files Browse the repository at this point in the history
Added annotation to the code, GIT link now redirects to the repository page, the top left images no longer make a grab pointer when hovered over.
  • Loading branch information
Joshua-Briggs authored Oct 19, 2022
1 parent 85c33fd commit ae62659
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 54 deletions.
5 changes: 3 additions & 2 deletions Contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
</head>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<li><a href="Portfolio.html">PORTFOLIO</a></li>
<li><b href="Contact.html">CONTACT</b></li>
</ul>
</div>
</nav>
<!-- Container box for the contact details -->
<div class="container">
<h1>Contact</h1>
<p>I would love to respond to any queries. Please feel free to get in touch with me.</p>
Expand Down
7 changes: 5 additions & 2 deletions Models.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
<body>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<!-- Displays all the tools used to make the website -->
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<!-- Displays all the navigation tools -->
<li><a href="Portfolio.html">PORTFOLIO</a></li>
<li><a href="Contact.html">CONTACT</a></li>
</ul>
Expand Down Expand Up @@ -48,6 +50,7 @@ <h1>3D Models</h1>

</div>
</div>
<!-- Displays all the questions and answers used to make the models -->
<div class="video-body">
<div class="video-text">
<div class="video-info">
Expand Down
8 changes: 6 additions & 2 deletions Nivana.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@
<body>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<!-- Displays all the photos in the top left -->
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<!-- Displays all the navigation tools -->
<li><a href="Portfolio.html">PORTFOLIO</a></li>
<li><a href="Contact.html">CONTACT</a></li>
</ul>
</div>
</nav>

<div class="video-header">
<h1>Nivana</h1>
</div>
Expand All @@ -47,6 +50,7 @@ <h1>Nivana</h1>

</div>
</div>
<!-- Displays all the text in the bottom of the page -->
<div class="video-body">
<div class="video-text">
<div class="video-info">
Expand Down
7 changes: 5 additions & 2 deletions Pokemon.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
<body>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<!-- Photos in the top left -->
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<!-- Displays all the navigation tools -->
<li><a href="Portfolio.html">PORTFOLIO</a></li>
<li><a href="Contact.html">CONTACT</a></li>
</ul>
Expand Down Expand Up @@ -47,6 +49,7 @@ <h1>Pokemon</h1>

</div>
</div>
<!-- Text descriptions at the bottom -->
<div class="video-body">
<div class="video-text">
<div class="video-info">
Expand Down
31 changes: 28 additions & 3 deletions Portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,73 +11,98 @@
<body>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<!-- Displays all the tools used to make the website -->
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<!-- Navigational buttons -->
<li><b href="">PORTFOLIO</b></li>
<li><a href="Contact.html">CONTACT</a></li>
</ul>
</div>
</nav>
<div class="text-box">
<!-- Main title and basic description of the website -->
<h1>Portfolio</h1>
<p>Welcome to my website made in HTML and CSS,<br> this page shows you all my projects I have worked on in the past couple of years.</p>
<!-- The buttons below the text to send you to different links -->
<a href="https://www.linkedin.com/in/joshua-briggs-421507253/" class="hero-btn">Visit my LinkedIn profile</a>
<a href="documents/CV.pdf" class="hero-btn">View my CV</a>
</div>
</section>

<!-- New section of the website. -->
<section class="portfolio">
<!-- Title and description of this section -->
<h1>Projects</h1>
<p>This is where all the good stuff is at!</p>
<div class="row">
<!-- Subject area with link to the page -->
<a href="Woodwork.html">
<div class="portfolio-col1">
<!-- Title -->
<h3>Woodwork</h3>
<!-- Description -->
<p>Woodwork is a game about chopping trees down, avoiding each passing branch, collecting points to win a high score to change the map or even the characters. This project in total took me a couple of months, taking a dive into C++ rather then C#. I later submitted this project for my assignment at SHU.</p>
<!-- Software used (Images) -->
<div class="column-bottom">
<div class="column-images">
<img src="images/C++.png">
<img src="images/VS.png">
<img src="images/Aseprite.png">
</div>
<!-- Info displaying date start - finish -->
<h4>2021-2022</h4>
</div>
</div>
</a>
<!-- Subject area with link to the page -->
<a href="Models.html">
<div class="portfolio-col2">
<!-- Title -->
<h3>Collection of 3D assets</h3>
<!-- Description -->
<p>This collection contains assets I am currently using for an upcoming project. The crate, is a 3Ds Maxes piece whilst the others are all from Blender, I used different softwares to compare and optimise work load.</p>
<div class="column-bottom">
<!-- Info displaying date start - finish -->
<h4>2021-2022</h4>
<!-- Software used (Images) -->
<div class="column-images">
<img src="images/3Ds%20Max.png"</a>
<img src="images/Blender.png"</a>
</div>
</div>
</div>
<!-- Subject area with link to the page -->
<a href="Nivana.html">
<div class="portfolio-col1">
<!-- Title -->
<h3>Nivana</h3>
<!-- Description -->
<p>Nivanna was a small project I worked on in summer over a couple of weeks, after many attempts at game jams, I wanted to take some time and not worry about a deadline. This is a platformer where the player must defeat enemies to progress, using different combat mechanics and beautiful 2D art.</p>
<div class="column-bottom">
<div class="column-images">
<!-- Software used (Images) -->
<img src="images/CSharp.png"</a>
<img src="images/Unity.png"</a>
<img src="images/VS.png"</a>
</div>
<!-- Info displaying date start - finish -->
<h4>2020</h4>
</div>
</div>
<!-- Subject area with link to the page -->
<a href="Pokemon.html">
<div class="portfolio-col2">
<!-- Title -->
<h3>Pokemon</h3>
<!-- Description -->
<p>This was where it all started, this started as a menu screen, taking myself weeks to design the smallest of things, then each week I progressed, making a world out of 2D art, creating randomised battles, collecting and walking with Pokemon. This project was the spark of my game dev career.</p>
<div class="column-bottom">
<!-- Info displaying date start - finish -->
<h4>2018-2019</h4>
<div class="column-images">
<!-- Software used (Images) -->
<img src="images/VS.png"</a>
<img src="images/Unity.png"</a>
<img src="images/CSharp.png"</a>
Expand Down
11 changes: 8 additions & 3 deletions Woodwork.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@
<body>
<section class="header">
<nav>
<a href=""><img src="images/HTML.svg"</a>
<a href=""><img src="images/CSS.png"</a>
<!-- Top left images -->
<a><img src="images/HTML.svg"</a>
<a><img src="images/CSS.png"</a>
<div class="nav-links">
<ul>
<!-- Buttons to nav links -->
<li><a href="Portfolio.html">PORTFOLIO</a></li>
<li><a href="Contact.html">CONTACT</a></li>
</ul>
</div>
</nav>
<!-- Title -->
<div class="video-header">
<h1>Woodwork</h1>
<div class="video-button">
<a href="documents/CV.pdf" class="hero-btn">GITHUB REPOSITORY</a>
<!-- Button for github link -->
<a href="https://github.com/BrigDog/Woodwork" class="hero-btn">GITHUB REPOSITORY</a>
</div>
</div>
<div class="slide-container">
Expand Down Expand Up @@ -55,6 +59,7 @@ <h1>Woodwork</h1>
<div class="video-text">
<div class="video-info">
<div class="video-questions">
<!-- Bottom text -->
<p>Game type:</p>
<p>Process of making the game:</p>
<p>Software:</p>
Expand Down
45 changes: 5 additions & 40 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*---- index page ----*/
*{ margin: 0;
padding: 0;
font-family: 'Lato', sans-serif;
Expand Down Expand Up @@ -94,40 +95,6 @@ nav img{
background: #f44226;
transition: 1s;
}
nav .fa{

}
/*
@media(max-width: 700px){
.text-box h1{
font-size: 20px;
}
.nav-links ul li{
display: block;
}
.nav-links{
position: absolute;
background: #f44336;
height: 100vh;
width: 200px;
top: 0;
right: -800;
text-align: left;
z-index: 2;
}
nav .fa{
display: block;
color: #fff;
margin: 10px;
font-size: 22px;
cursor: pointer;
}
.nav-links ul{
padding: 30px;
}
}
*/

/*---- portfolio ----*/

Expand Down Expand Up @@ -213,10 +180,7 @@ h3{
cursor: pointer;
}





/*---- contact ----*/

.container{
width: 80%;
Expand Down Expand Up @@ -297,6 +261,9 @@ tr td:first-child{
tr td{
padding-top: 20px;
}

/*---- showcase ----*/

.video-body{
padding: 1% 6%;
display: flex;
Expand All @@ -306,8 +273,6 @@ tr td{
justify-content: space-between;
padding-left: 37.5%;
padding-bottom: 20px;


}
.slide-container{
margin-left: 20%
Expand Down

0 comments on commit ae62659

Please sign in to comment.