From 70a4284b24aa1d77727355521d18c0182f78f959 Mon Sep 17 00:00:00 2001 From: "eoghan.conlon" Date: Sat, 5 Aug 2023 17:04:44 +0100 Subject: [PATCH 01/16] Merging styling into new branch based on most up to date branch of main --- src/index.html | 6 +++++- src/stylesheets/index.css | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/stylesheets/index.css diff --git a/src/index.html b/src/index.html index b5a0fac..c53b0cc 100644 --- a/src/index.html +++ b/src/index.html @@ -4,9 +4,13 @@ Skynet + -

Skynet Password Reset & Sign-up service

+
+ Picture of Sharky, the mascot of skynet +

Skynet Password Reset & Sign-up service

+

Password Reset

Please use this service if you ever forget your skynet password

diff --git a/src/stylesheets/index.css b/src/stylesheets/index.css new file mode 100644 index 0000000..18975b3 --- /dev/null +++ b/src/stylesheets/index.css @@ -0,0 +1,17 @@ +/* General styling */ +body{ + background-color: #007480; +} +/* Title bar */ +#title { + background-color: white; + height: 82px; +} + +#title img { + float: left; +} + +#title h1 { + position: relative; +} \ No newline at end of file From 05f71c101fad3832dff9458b585ecb09f3924b10 Mon Sep 17 00:00:00 2001 From: "eoghan.conlon" Date: Sat, 5 Aug 2023 17:25:34 +0100 Subject: [PATCH 02/16] Feat. Adding image of sharky --- src/images/sharky_png.png | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/images/sharky_png.png diff --git a/src/images/sharky_png.png b/src/images/sharky_png.png new file mode 100644 index 0000000..b41ff78 --- /dev/null +++ b/src/images/sharky_png.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9be8244c395a2b47766591bd1bbc37726be49776968ae69735711dddb539162 +size 31892 From c151c02d4542b25bc987c64a5a39ab7909cc5b1f Mon Sep 17 00:00:00 2001 From: "eoghan.conlon" Date: Sat, 5 Aug 2023 17:26:36 +0100 Subject: [PATCH 03/16] Fix. Stylesheet ref now matches this iteration --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index c53b0cc..d8aab68 100644 --- a/src/index.html +++ b/src/index.html @@ -4,7 +4,7 @@ Skynet - +
From 570347c497deec72fec4aa637a4f80f56df4a402 Mon Sep 17 00:00:00 2001 From: "eoghan.conlon" Date: Sat, 5 Aug 2023 18:16:11 +0100 Subject: [PATCH 04/16] Fix. Sharky image now saved as a .svg rather than a .png --- src/images/sharky_png.png | 3 - src/images/sharky_vector_svg.svg | 193 +++++++++++++++++++++++++++++++ src/index.html | 2 +- 3 files changed, 194 insertions(+), 4 deletions(-) delete mode 100644 src/images/sharky_png.png create mode 100644 src/images/sharky_vector_svg.svg diff --git a/src/images/sharky_png.png b/src/images/sharky_png.png deleted file mode 100644 index b41ff78..0000000 --- a/src/images/sharky_png.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9be8244c395a2b47766591bd1bbc37726be49776968ae69735711dddb539162 -size 31892 diff --git a/src/images/sharky_vector_svg.svg b/src/images/sharky_vector_svg.svg new file mode 100644 index 0000000..c864050 --- /dev/null +++ b/src/images/sharky_vector_svg.svg @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/index.html b/src/index.html index d8aab68..cf3fec3 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@
- Picture of Sharky, the mascot of skynet + Picture of Sharky, the mascot of skynet

Skynet Password Reset & Sign-up service

Password Reset

From ee7c6446622db7712afd66ada4c84f1859805979 Mon Sep 17 00:00:00 2001 From: "eoghan.conlon" Date: Sun, 6 Aug 2023 17:44:07 +0100 Subject: [PATCH 05/16] Fix. Backgrounds colour set for password reset and modify options --- src/index.html | 5 ++++- src/stylesheets/index.css | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index cf3fec3..a000514 100644 --- a/src/index.html +++ b/src/index.html @@ -11,13 +11,16 @@ Picture of Sharky, the mascot of skynet

Skynet Password Reset & Sign-up service

+

Password Reset

Please use this service if you ever forget your skynet password

- +
+

User modification

Please use this service to modify your user data (email, login ssh key, etc.)

+