finishing touches

changed icon to fit new style
minor layout changes
cleaned some stuff up
This commit is contained in:
Nye Evans 2021-01-14 15:44:08 +00:00
parent 016f6578e5
commit 210e2f82fc
7 changed files with 72 additions and 35 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

BIN
images/Icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -2,7 +2,7 @@
<header> <header>
<link rel = "stylesheet" href = "pages\mainpage.css"> <link rel = "stylesheet" href = "pages\mainpage.css">
<link rel = "icon" href = "..\images\Favicon.ico"> <link rel = "icon" href = "images\Icon.ico">
<meta charset="UTF-8"> <meta charset="UTF-8">
@ -41,10 +41,10 @@
</div> </div>
<div id = "programGallery"> <div id = "programGallery">
<a href = "pages/gallery/Cat_tower_defense/cat-tower-defense.html" class = "galleryLink">
<img src = "" class = "galleryImage">
</a>
<p class = "galleryTitle"></p> <p class = "galleryTitle"></p>
<a href = "pages/gallery/Cat_tower_defense/cat-tower-defense.html" class = "galleryLink">
<img src = "" class = "galleryImage" style = "">
</a>
<p class = "galleryCaption"></p> <p class = "galleryCaption"></p>
<button class = "galleryLeftArrow" onClick = "window.parent.lastSlide();"></button> <button class = "galleryLeftArrow" onClick = "window.parent.lastSlide();"></button>
<button class = "galleryRightArrow" onClick = "window.parent.nextSlide();"></button> <button class = "galleryRightArrow" onClick = "window.parent.nextSlide();"></button>

View file

@ -1,8 +1,9 @@
export class slide{ export class slide{
constructor(title, caption, image, link){ constructor(title, caption, image, imagePos, link){
this.title = title; this.title = title;
this.caption = caption; this.caption = caption;
this.image = image; this.image = image;
this.imagePos = imagePos;
this.link = link; this.link = link;
} }
} }
@ -14,6 +15,7 @@ export var slides = [
environment.<br><br>This system was my introduction to Unreal Engine and mainly used its \"Blueprint\" visual language, however I later used C++ to try and add my own physics \ environment.<br><br>This system was my introduction to Unreal Engine and mainly used its \"Blueprint\" visual language, however I later used C++ to try and add my own physics \
to it.", to it.",
"./pages/gallery/epq-project/projectHeaderImage.png", "./pages/gallery/epq-project/projectHeaderImage.png",
"object-position: center;",
"./pages/gallery/epq-project/epq-project.html" "./pages/gallery/epq-project/epq-project.html"
), ),
new slide( new slide(
@ -21,6 +23,7 @@ export var slides = [
"A project I created with a friend to help us gain a better understanding of pygame. <br><br> This was a basic tower defence game but featured a fully scalable and customisable \ "A project I created with a friend to help us gain a better understanding of pygame. <br><br> This was a basic tower defence game but featured a fully scalable and customisable \
level system allowing users to add their own levels and towers. One of my earliest projects, this is something I have revisited and improved upon quite a few times.", level system allowing users to add their own levels and towers. One of my earliest projects, this is something I have revisited and improved upon quite a few times.",
"./pages/gallery/cat-tower-defence/projectHeaderImage.png", "./pages/gallery/cat-tower-defence/projectHeaderImage.png",
"object-position: top;",
"./pages/gallery/cat-tower-defence/cat-tower-defence.html" "./pages/gallery/cat-tower-defence/cat-tower-defence.html"
), ),
new slide( new slide(
@ -29,6 +32,7 @@ export var slides = [
a graphical interface that allowed the user to draw, move and label rooms as well as set the painting and carpeting price which could later be used to calculate \ a graphical interface that allowed the user to draw, move and label rooms as well as set the painting and carpeting price which could later be used to calculate \
full decoration costs.", full decoration costs.",
"./pages/gallery/room-builder/projectHeaderImage.png", "./pages/gallery/room-builder/projectHeaderImage.png",
"object-position: top;",
"./pages/gallery/room-builder/room-builder.html" "./pages/gallery/room-builder/room-builder.html"
) )
]; ];

View file

@ -24,6 +24,7 @@ function updateSlide(){
document.querySelector(".galleryCaption").innerHTML = slides[currentSlide].caption; document.querySelector(".galleryCaption").innerHTML = slides[currentSlide].caption;
document.querySelector(".galleryLink").href = slides[currentSlide].link; document.querySelector(".galleryLink").href = slides[currentSlide].link;
document.querySelector(".galleryImage").src = slides[currentSlide].image; document.querySelector(".galleryImage").src = slides[currentSlide].image;
document.querySelector(".galleryImage").style = slides[currentSlide].imagePos;
} }

View file

@ -57,6 +57,19 @@ iframe{
@media (orientation:portrait){ @media (orientation:portrait){
body{
/*
touch-action: none;
touch-action: pan-y;
as well as disabling double tap, disables zoom which some people with bad eyes need, use something else
*/
touch-action: manipulation; /*stops double tap zoom*/
-webkit-text-size-adjust: none; /*stops browsers messing with text size*/
-moz-text-size-adjust: none;
-ms-text-size-adjust: none;
text-size-adjust: none;
}
h1{ h1{
font-size: 10vw; font-size: 10vw;
@ -74,6 +87,32 @@ iframe{
} }
h2{
font-size: clamp(25px, 3.6vw, 50px);
padding: 0;
}
.textBox{
font-size: clamp(25px, 2vw, 50px);
padding: 15px;
margin-bottom: 5vh;
}
.backButton{
font-size: clamp(25px, 2.5vw, 50px);
}
.videoContainer{
text-align: center;
}
iframe{
border: 2px solid #ffd256;
width: 90vw;
height: 50vw;
}
} }

View file

@ -26,6 +26,11 @@ button:focus {
outline: none; outline: none;
} }
a:link, a:visited{
color: #ffd256;
text-decoration: none;
}
h1{ h1{
font-size: clamp(1.2rem, 4vw, 4rem); font-size: clamp(1.2rem, 4vw, 4rem);
@ -163,7 +168,6 @@ h1{
} }
#socialBar{ #socialBar{
position: fixed;
display: flex; display: flex;
margin-left: 1vh; margin-left: 1vh;
margin-bottom: 1vh; margin-bottom: 1vh;
@ -183,9 +187,9 @@ h1{
touch-action: pan-y; touch-action: pan-y;
as well as disabling double tap, disables zoom which some people with bad eyes need, use something else as well as disabling double tap, disables zoom which some people with bad eyes need, use something else
*/ */
touch-action: manipulation; touch-action: manipulation; /*stops double tap zoom*/
-webkit-text-size-adjust: none; -webkit-text-size-adjust: none; /*stops browsers messing with text size*/
-moz-text-size-adjust: none; -moz-text-size-adjust: none;
-ms-text-size-adjust: none; -ms-text-size-adjust: none;
text-size-adjust: none; text-size-adjust: none;
@ -211,62 +215,51 @@ h1{
padding: 0; padding: 0;
margin-top: 3vh; margin-top: 3vh;
margin-bottom: 3vh; margin-bottom: 3vh;
margin-left: 5px; margin-left: 15px;
margin-right: 5px; margin-right: 15px;
min-width: inherit; min-width: inherit;
max-width: inherit; max-width: inherit;
border-radius: 0; border: 0;
text-align: left; text-align: left;
font-size: clamp(25px, 3.6vw, 50px); font-size: clamp(25px, 3.6vw, 50px);
} }
.profileImage{ .profileImage{
margin: 0; width: 90%;
width: 100%; }
border: none; .orangeBorder{
border-radius: 0; border: 5px solid #ffd256;
border-top: 5px solid #ffd256; border-radius: 10px;
border-bottom: 5px solid #ffd256;
padding-left: 0;
padding-right: 0;
} }
#galleryHeader{ #galleryHeader{
margin-left: 0; margin-left: 15px;
margin-right: 0; margin-right: 15px;
border-radius: 0;
font-size: clamp(2rem, 4vw, 5rem); font-size: clamp(2rem, 4vw, 5rem);
} }
#programGallery{ #programGallery{
width: 100%; width: 92vw;
margin-left: 4vw;
margin-right: 4vw;
border: 5px solid #ffd256;
margin-left: 0; border-radius: 10px;
margin-right: 0;
border-bottom: 5px solid #ffd256;
border-top: 5px solid #ffd256;
} }
.galleryImage{ /*all images should be 700x700*/ .galleryImage{ /*all images should be 700x700*/
grid-column: 1/13; grid-column: 1/13;
grid-row: 2/7; grid-row: 2/7;
padding-left: 0;
padding-right: 0;
border-radius: 0; border-radius: 0;
border: 5px solid #ffd256; border: 5px solid #ffd256;
border-left: 0; border-left: 0;
border-right: 0; border-right: 0;
object-position: center;
object-fit: cover; object-fit: cover;