diff --git a/src/lib/components/Modal.svelte b/src/lib/components/Modal.svelte index 63c4de8..91c1e33 100644 --- a/src/lib/components/Modal.svelte +++ b/src/lib/components/Modal.svelte @@ -60,57 +60,6 @@ {/if} diff --git a/src/lib/components/Projects.svelte b/src/lib/components/Projects.svelte index eabe0f3..66e5b5b 100644 --- a/src/lib/components/Projects.svelte +++ b/src/lib/components/Projects.svelte @@ -10,6 +10,7 @@ import UtilityClientModal from '$lib/modals/utilityclient.svelte'; import SangeloSpaceModal from '$lib/modals/sangelospace.svelte'; import LunivityModal from '$lib/modals/lunivity.svelte'; + import GitpotModal from '$lib/modals/gitpot.svelte'; import MoreProjectsModal from '$lib/modals/more.svelte'; let showModal = false; @@ -73,7 +74,7 @@ + + + + + diff --git a/src/lib/modals/lunivity.svelte b/src/lib/modals/lunivity.svelte index 565213d..0277020 100644 --- a/src/lib/modals/lunivity.svelte +++ b/src/lib/modals/lunivity.svelte @@ -38,5 +38,5 @@ diff --git a/src/lib/modals/more.svelte b/src/lib/modals/more.svelte index b4208a5..c195c62 100644 --- a/src/lib/modals/more.svelte +++ b/src/lib/modals/more.svelte @@ -6,14 +6,6 @@ let showModal = false; let selectedModule: any = null; - function openModalWith(module: any) { - selectedModule = module; - showModal = true; - } - - function handleModalClose() { - showModal = false; - } @@ -26,7 +18,7 @@

These are all of my projects, including the ones that didn't fit in the homepage. Take a look!

@@ -127,6 +119,7 @@ diff --git a/src/lib/modals/sangefault.svelte b/src/lib/modals/sangefault.svelte index 6776609..c9f94a4 100644 --- a/src/lib/modals/sangefault.svelte +++ b/src/lib/modals/sangefault.svelte @@ -38,5 +38,5 @@ diff --git a/src/lib/modals/sangelospace.svelte b/src/lib/modals/sangelospace.svelte index 7685cf1..b6ecf90 100644 --- a/src/lib/modals/sangelospace.svelte +++ b/src/lib/modals/sangelospace.svelte @@ -1,6 +1,6 @@ @@ -38,5 +38,5 @@ diff --git a/src/lib/modals/utilityclient.svelte b/src/lib/modals/utilityclient.svelte index 9a5729a..9bf3dc8 100644 --- a/src/lib/modals/utilityclient.svelte +++ b/src/lib/modals/utilityclient.svelte @@ -38,5 +38,5 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0501abb..8bc1dc7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -4,6 +4,7 @@ width: 100%; scroll-snap-type: y mandatory; overflow-y: scroll; + overflow-x: hidden; } .section { @@ -13,4 +14,5 @@ justify-content: center; align-items: center; text-align: center; + overflow-x: scroll; } \ No newline at end of file diff --git a/src/styles/mobile/home.scss b/src/styles/mobile/home.scss index c360df0..3c33c36 100644 --- a/src/styles/mobile/home.scss +++ b/src/styles/mobile/home.scss @@ -5,6 +5,7 @@ text-align: center; user-select: text; cursor: text; + line-height: 1.2; } header .logo { diff --git a/src/styles/mobile/modal-core.scss b/src/styles/mobile/modal-core.scss new file mode 100644 index 0000000..a66f4d4 --- /dev/null +++ b/src/styles/mobile/modal-core.scss @@ -0,0 +1,10 @@ +@media (max-width: 850px) { + .modal { + .modal-card { + height: 100%; + width: 100%; + border-radius: 0; + padding: 0 1em 0 1em; + } + } +} \ No newline at end of file diff --git a/src/styles/mobile/modal-more.scss b/src/styles/mobile/modal-more.scss new file mode 100644 index 0000000..7b95278 --- /dev/null +++ b/src/styles/mobile/modal-more.scss @@ -0,0 +1,10 @@ +@media (max-width: 850px) { + + .item-list { + &::before { + width: 100% !important; + bottom: 0 !important; + left: 0; + } + } +} \ No newline at end of file diff --git a/src/styles/mobile/modal-mobile.scss b/src/styles/mobile/modal.scss similarity index 82% rename from src/styles/mobile/modal-mobile.scss rename to src/styles/mobile/modal.scss index 3c6320c..04eb0f3 100644 --- a/src/styles/mobile/modal-mobile.scss +++ b/src/styles/mobile/modal.scss @@ -7,10 +7,13 @@ grid-column-gap: 0px; grid-row-gap: 0px; overflow: scroll; - margin: 0 5% 15% 5%; + margin: 0; + padding: 1em; .content { margin-top: 1em; + padding-bottom: 8em; + padding-right: 0em; } .gallery { @@ -32,11 +35,12 @@ } .button-container { - bottom: 7.5%; + bottom: 2%; &::before { - bottom: 5.9%; - width: 80%; + bottom: 0; + width: 100%; + left: 0; } button { diff --git a/src/styles/modal-core.scss b/src/styles/modal-core.scss new file mode 100644 index 0000000..d5355c9 --- /dev/null +++ b/src/styles/modal-core.scss @@ -0,0 +1,46 @@ +.modal { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, 0.5); + backdrop-filter: blur(8px); + z-index: 1000; + + .modal-card { + height: 80%; + width: 85%; + position: relative; + background-color: $space-gray; + border-radius: 2em; + padding: 1em; + box-shadow: 0px 2px 10px $space-black-modal; + z-index: 1001; + // overflow: auto; + } + + .close-button { + position: absolute; + top: 0.9em; + right: 0.8em; + background: none; + border: none; + font-size: 20px; + cursor: pointer; + z-index: 1002; + color: #fff; + } + + .error-msg { + justify-self: center; + align-self: center; + } + + .error-icon { + color: #fe8484; + } +} \ No newline at end of file diff --git a/src/styles/modal-more.scss b/src/styles/modal-more.scss index b5c522f..a6b72b7 100644 --- a/src/styles/modal-more.scss +++ b/src/styles/modal-more.scss @@ -50,13 +50,13 @@ position: fixed; left: 9%; bottom: calc(10% - 0.96em); - height: calc(100% + 1em); // 1em higher than the button + height: calc(100% + 1em); height: 15%; width: 82%; pointer-events: none; background: linear-gradient(to top, $space-gray, transparent); background: -webkit-linear-gradient(to top, $space-gray, transparent); - z-index: 1001; // Place it behind the button + z-index: 1001; } .item { @@ -127,6 +127,7 @@ .end-text { display: flex; flex-direction: column; + text-align: center; align-items: center; gap: 0.5em; margin: 4% auto 0 auto; diff --git a/src/styles/modal.scss b/src/styles/modal.scss index 0b7fb6b..665323a 100644 --- a/src/styles/modal.scss +++ b/src/styles/modal.scss @@ -17,7 +17,7 @@ content { overflow: hidden; .content { - padding: 0 1em 6em 0; + padding: 0 1em 7em 0; overflow: auto; } diff --git a/src/styles/projects.scss b/src/styles/projects.scss index a74fa82..78d868d 100644 --- a/src/styles/projects.scss +++ b/src/styles/projects.scss @@ -99,7 +99,7 @@ } .sangelo { - background-image: url('/assets/logos/sangelo.svg'); + background-image: url('/assets/logos/sangelos-space-website.svg'); } .lunivity { diff --git a/static/assets/img/gitpot-dark.png b/static/assets/img/gitpot-dark.png new file mode 100644 index 0000000..29cef59 Binary files /dev/null and b/static/assets/img/gitpot-dark.png differ diff --git a/static/assets/img/gitpot-light.png b/static/assets/img/gitpot-light.png new file mode 100644 index 0000000..636c46b Binary files /dev/null and b/static/assets/img/gitpot-light.png differ diff --git a/static/assets/logos/gitpot-color.svg b/static/assets/logos/gitpot-color.svg index 6e8476e..48619c6 100644 --- a/static/assets/logos/gitpot-color.svg +++ b/static/assets/logos/gitpot-color.svg @@ -11,8 +11,8 @@ - - + + diff --git a/static/assets/logos/sangelos-space-website.svg b/static/assets/logos/sangelos-space-website.svg new file mode 100644 index 0000000..7ef4569 --- /dev/null +++ b/static/assets/logos/sangelos-space-website.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +