From c6a086c5c103ea687fcd83f60ecc309dbef82335 Mon Sep 17 00:00:00 2001 From: Notoric Date: Tue, 16 Apr 2024 21:39:19 +0100 Subject: [PATCH 1/2] Update readme --- readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 68d09b0..cb1ed00 100644 --- a/readme.md +++ b/readme.md @@ -21,4 +21,6 @@ The `js/scripts.js` file contains a simple console.log statement to confirm that All images inside `assets/photos` folder are from https://pixabay.com and used under the licence outlined here https://pixabay.com/service/terms/ -All SVG Vectors are from https://www.svgrepo.com \ No newline at end of file +All SVG Vectors are from https://www.svgrepo.com + +This application makes use of the PokeAPI, which can be found at https://pokeapi.co/ \ No newline at end of file From ce5104d97e09c820f0bbed58063f95f5f9ef6470 Mon Sep 17 00:00:00 2001 From: Notoric Date: Tue, 16 Apr 2024 21:57:36 +0100 Subject: [PATCH 2/2] Added favicon and cleaned up page --- css/styles.css | 2 +- favicon.ico | Bin 0 -> 318 bytes js/scripts.js | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 favicon.ico diff --git a/css/styles.css b/css/styles.css index 3d5790c..161feb1 100644 --- a/css/styles.css +++ b/css/styles.css @@ -288,7 +288,7 @@ h3 { overflow: hidden; height: fit-content; position: relative; - overflow-y: scroll; + overflow-y: auto; } #description-carousel .description-carousel-item { diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..bc6fe6d393b7b508eca1df47fe9ee133ad6da807 GIT binary patch literal 318 zcmb`BF%E+;5Cq2(J$6GIN}ib_Jx|DEcu3Oa0klYF*XGJ}tTnqn-$_15Iyq;7B z7Lmm){BAv)cXKaPUvaxNOYtYENJ?AMj=n3~a=5S}d)2+PG50+FPqjjDJm5RR_JdV? OcJ<6Pv%kSa?K}Zc^dKw% literal 0 HcmV?d00001 diff --git a/js/scripts.js b/js/scripts.js index 40c4e36..4d58b78 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -740,7 +740,12 @@ function pokemonCarousel(direction) { rightButton.style.display = "block"; } - transitionPokemonCarousel(activePokemonCarousel); + try { + transitionPokemonCarousel(activePokemonCarousel); + } catch { + //carousel not built yet + } + } function transitionPokemonCarousel(i) {