From fb352eff1d66cd6422c6e30378f06db687aae70d Mon Sep 17 00:00:00 2001 From: Nye Evans Date: Mon, 4 Jan 2021 19:27:14 +0000 Subject: [PATCH] cleaned up css and fixed javascript, moved files around done! --- pages/index.html => index.html | 13 +++++--- pages/gallery-index.js | 7 ++-- pages/gallery.js | 6 +++- pages/mainpage.css | 61 ++++++++++++++++++++-------------- 4 files changed, 53 insertions(+), 34 deletions(-) rename pages/index.html => index.html (84%) diff --git a/pages/index.html b/index.html similarity index 84% rename from pages/index.html rename to index.html index ca46dc3..b8cb4eb 100644 --- a/pages/index.html +++ b/index.html @@ -1,12 +1,12 @@
- + - + Nye Evans Portfolio
@@ -25,7 +25,7 @@
- +

@@ -41,8 +41,8 @@
- - + +

Image Title

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

@@ -55,7 +55,10 @@

+ + Twitter   Email   diff --git a/pages/gallery-index.js b/pages/gallery-index.js index 340a684..17111af 100644 --- a/pages/gallery-index.js +++ b/pages/gallery-index.js @@ -6,7 +6,8 @@ export class slide{ this.link = link; } } -export var slides = [new slide("john", "he is john", "gallery/Cat_tower_defense/projectHeaderImage.png"), - new slide("jack", "he is jack", "gallery/Room_builder/projectHeaderImage.png"), - new slide("james", "he is james", "gallery/EPQ_project/projectHeaderImage.png") + +export var slides = [new slide("john", "he is john", "pages/gallery/Cat_tower_defense/projectHeaderImage.png", "https://www.bbc.co.uk/"), + new slide("jack", "he is jack", "pages/gallery/Room_builder/projectHeaderImage.png", "https://twitter.com/"), + new slide("james", "he is james", "pages/gallery/EPQ_project/projectHeaderImage.png", "https://www.google.com/") ]; \ No newline at end of file diff --git a/pages/gallery.js b/pages/gallery.js index 74d788d..e8bc11e 100644 --- a/pages/gallery.js +++ b/pages/gallery.js @@ -19,10 +19,14 @@ function updateSlide(){ } else if (currentSlide < 0){ currentSlide = slides.length-1; } + document.querySelector(".galleryTitle").innerHTML = slides[currentSlide].title; document.querySelector(".galleryCaption").innerHTML = slides[currentSlide].caption; - document.querySelector(".galleryImage").src = slides[currentSlide].image; document.querySelector(".galleryLink").href = slides[currentSlide].link; + document.querySelector(".galleryImage").src = slides[currentSlide].image; + + console.log(document.querySelector(".galleryImage").src) + console.log(slides[currentSlide].image) } updateSlide(); \ No newline at end of file diff --git a/pages/mainpage.css b/pages/mainpage.css index 2219503..a5dd0c0 100644 --- a/pages/mainpage.css +++ b/pages/mainpage.css @@ -10,11 +10,20 @@ body{ color: #ffd256; font-family: "roboto"; background-color: #181818; - /*background-image: url("../images/BackGroundTestNoGlow.png");*/ - background-position: bottom; } +button{ + background-color: transparent; + border: none; + color: #ffd256; +} + +button:focus { + border: none; + outline: none; +} + h1, h2, h3, h4{ font-size: clamp(18px, 1.4vw, 70px); @@ -25,10 +34,11 @@ h1{ font-size: clamp(20px, 4vw, 170px); padding-left: 6; - margin-left: 2vw; - margin-right: 70vw; + margin-top: 10vh; margin-bottom: 70vh; + margin-left: 2vw; + margin-right: 70vw; height: 20vh; text-align: left; @@ -40,9 +50,9 @@ h2, h3{ margin-bottom: 10vh; margin-left: auto; margin-right: auto; + min-width: 720px; max-width: 86vw; - } h4{ @@ -50,31 +60,29 @@ h4{ margin-bottom: 30vh; margin-left: 27vw; margin-right: 27vw; - } -button{ - background-color: transparent; - border: none; - color: #ffd256; -} .orangeBorder{ border: 2px solid #ffd256; border-radius: 5px; + padding: 5px; } .textBox{ text-align: center; - padding: 2.5vh; font-size: 1.3vw; + + padding: 2.5vh; } #galleryHeader{ margin-left: 35vw; margin-right: 35vw; + border-radius: 5px; + font-size: 1.4vw; } @@ -103,9 +111,7 @@ button{ width: 100%; height: 100%; -} -img.galleryImage{ border: 2px solid #ffd256; border-bottom-left-radius: 5px; box-sizing: border-box; @@ -113,6 +119,16 @@ img.galleryImage{ padding: 5; } +.galleryLink{ + grid-column: 2/8; + grid-row: 2/12; + + object-fit: cover; + + width: 100%; + height: 100%; +} + .galleryTitle{ grid-column: 2/12; grid-row: 1; @@ -125,9 +141,8 @@ img.galleryImage{ border-top-left-radius: 5px; border-top-right-radius: 5px; - border-left: 2px solid #ffd256; - border-top: 2px solid #ffd256; - border-right: 2px solid #ffd256; + border: 2px solid #ffd256; + border-bottom: none; } .galleryCaption{ @@ -137,9 +152,8 @@ img.galleryImage{ border-radius: 0; border-bottom-right-radius: 5px; - border-bottom: 2px solid #ffd256; - border-right: 2px solid #ffd256; - border-top: 2px solid #ffd256; + border: 2px solid #ffd256; + border-left: none; padding: 5px; } @@ -147,20 +161,17 @@ img.galleryImage{ .galleryLeftArrow{ grid-column: 1; grid-row: 5/6; + font-size: 7vw; } .galleryRightArrow{ grid-column: 12; grid-row: 5/6; + font-size: 7vw; } -button:focus { - border: none; - outline: none; -} - #socialBar{ position: fixed;