diff --git a/gallery/static/js/login.js b/gallery/static/js/login.js index 735ccca..08964da 100644 --- a/gallery/static/js/login.js +++ b/gallery/static/js/login.js @@ -2,7 +2,7 @@ function showLogin() { popUpShow( 'Login!', - 'Need an account? Register!', + 'Need an account? Register!', '' + '', '
' + @@ -57,7 +57,7 @@ function login(event) { function showRegister() { popUpShow( 'Who are you?', - 'Already have an account? Login!', + 'Already have an account? Login!', '\ ', '\ diff --git a/gallery/static/js/main.js b/gallery/static/js/main.js index cba5135..ae1e91f 100644 --- a/gallery/static/js/main.js +++ b/gallery/static/js/main.js @@ -73,11 +73,8 @@ window.onload = function () { // Convert to local time times[i].innerHTML = dateTime.toLocaleDateString() + ' ' + dateTime.toLocaleTimeString(); } -}; -window.onscroll = function () { - loadOnView(); - // Jump to top button + // Top Of Page button let topOfPage = document.querySelector('.top-of-page'); if (document.body.scrollTop > 300 || document.documentElement.scrollTop > 20) { topOfPage.classList.add('show'); @@ -88,6 +85,45 @@ window.onscroll = function () { document.body.scrollTop = 0; document.documentElement.scrollTop = 0; } + + // Info button + let infoButton = document.querySelector('.info-button'); + if (document.body.scrollTop > 300 || document.documentElement.scrollTop > 20) { + infoButton.classList.remove('show'); + } else { + infoButton.classList.add('show'); + } + infoButton.onclick = function () { + popUpShow('OnlyLegs Gallery', 'Made by Fluffy with ❤️
' + + 'Version: 23.03.23'); + } +}; +window.onscroll = function () { + loadOnView(); + + // Top Of Page button + let topOfPage = document.querySelector('.top-of-page'); + if (document.body.scrollTop > 300 || document.documentElement.scrollTop > 20) { + topOfPage.classList.add('show'); + } else { + topOfPage.classList.remove('show'); + } + topOfPage.onclick = function () { + document.body.scrollTop = 0; + document.documentElement.scrollTop = 0; + } + + // Info button + let infoButton = document.querySelector('.info-button'); + if (document.body.scrollTop > 300 || document.documentElement.scrollTop > 20) { + infoButton.classList.remove('show'); + } else { + infoButton.classList.add('show'); + } + infoButton.onclick = function () { + popUpShow('OnlyLegs Gallery', 'Made by Fluffy with ❤️
' + + 'Version: 23.03.23'); + } }; window.onresize = function () { loadOnView(); diff --git a/gallery/templates/groups/list.html b/gallery/templates/groups/list.html index ebb059b..8dd3393 100644 --- a/gallery/templates/groups/list.html +++ b/gallery/templates/groups/list.html @@ -4,13 +4,16 @@ {% block content %} diff --git a/gallery/templates/index.html b/gallery/templates/index.html index fb88994..6e142d6 100644 --- a/gallery/templates/index.html +++ b/gallery/templates/index.html @@ -4,13 +4,16 @@ {% block content %} @@ -28,12 +31,7 @@ {% else %}
-

No images

- {% if g.user %} -

You can get started by uploading an image!

- {% else %} -

Login to start uploading images!

- {% endif %} +

*crickets chirping*

{% endif %} {% endblock %} diff --git a/gallery/templates/layout.html b/gallery/templates/layout.html index 9d01a79..af8faa6 100644 --- a/gallery/templates/layout.html +++ b/gallery/templates/layout.html @@ -38,7 +38,12 @@
- + +
diff --git a/gallery/themes/default/components/banner.sass b/gallery/themes/default/components/banner.sass index e6d182d..6f41647 100644 --- a/gallery/themes/default/components/banner.sass +++ b/gallery/themes/default/components/banner.sass @@ -1,11 +1,11 @@ .banner width: 100% - height: 40vh + height: 50vh position: relative background-color: $black - color: $black + color: $white overflow: hidden transition: opacity 0.3s ease-in-out @@ -18,7 +18,7 @@ width: 100% height: 100% - background-color: $black + background-color: $black2 object-fit: cover object-position: center center @@ -46,7 +46,6 @@ display: flex flex-direction: column justify-content: flex-end - gap: 0.5rem z-index: +2 @@ -55,22 +54,19 @@ padding: 0 font-size: 6.9rem - font-weight: 700 - line-height: 1 + font-weight: 800 text-align: left - color: $black + color: $primary p margin: 0 padding: 0 font-size: 1rem - font-weight: 600 + font-weight: 500 line-height: 1 - text-align: left - - color: $black + text-align: left @media (max-width: $breakpoint) .banner diff --git a/gallery/themes/default/components/buttons/block.sass b/gallery/themes/default/components/buttons/block.sass index 724817a..6dcba23 100644 --- a/gallery/themes/default/components/buttons/block.sass +++ b/gallery/themes/default/components/buttons/block.sass @@ -26,7 +26,7 @@ font-weight: 600 text-align: center - background-color: transparent + background-color: rgba($white, 0.1) color: $white border: none border-radius: $rad-inner @@ -36,10 +36,10 @@ transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out &:hover - background-color: $black + background-color: rgba($white, 0.3) &:focus-visible - outline: 2px solid rgba($black, 0.5) + outline: 2px solid rgba($white, 0.5) &.primary @include btn-block($primary) @@ -152,6 +152,10 @@ opacity: 0 cursor: pointer + &:hover + background-color: rgba($white, 0.2) + color: $white + &.active background-color: rgba($primary, 0.2) color: $primary diff --git a/gallery/themes/default/components/buttons/info-button.sass b/gallery/themes/default/components/buttons/info-button.sass new file mode 100644 index 0000000..03cd281 --- /dev/null +++ b/gallery/themes/default/components/buttons/info-button.sass @@ -0,0 +1,41 @@ +.info-button + margin: 0 + padding: 0 + + width: auto + height: auto + + position: fixed + bottom: 0.75rem + right: -3rem + + display: flex + justify-content: center + align-items: center + + background-color: $black2 + color: $white + border-radius: $rad + border: none + opacity: 0 + + z-index: 20 + cursor: pointer + transition: all 0.2s cubic-bezier(.86, 0, .07, 1) + + &:hover + color: $info + + svg + margin: 0.5rem + + width: 1.25rem + height: 1.25rem + + &.show + right: 0.75rem + opacity: 1 + +@media (max-width: $breakpoint) + .info-button + bottom: 4.25rem diff --git a/gallery/themes/default/components/buttons/top-of-page.sass b/gallery/themes/default/components/buttons/top-of-page.sass index 9534683..367ce94 100644 --- a/gallery/themes/default/components/buttons/top-of-page.sass +++ b/gallery/themes/default/components/buttons/top-of-page.sass @@ -1,33 +1,37 @@ .top-of-page margin: 0 - padding: 0.55rem + padding: 0 - width: 2.5rem - height: 2.5rem + width: auto + height: auto position: fixed bottom: 0.75rem right: -3rem - display: flex // hidden + display: flex justify-content: center align-items: center - border-radius: 50% - background-color: $black + background-color: $black2 color: $white - opacity: 0 // hidden - - z-index: 2 + border-radius: $rad + border: none + opacity: 0 + z-index: 20 cursor: pointer - transition: all 0.2s cubic-bezier(.86, 0, .07, 1) &:hover - background-color: $black color: $primary + svg + margin: 0.5rem + + width: 1.25rem + height: 1.25rem + &.show right: 0.75rem opacity: 1 diff --git a/gallery/themes/default/components/elements/pop-up.sass b/gallery/themes/default/components/elements/pop-up.sass index 02c10a4..90bb82d 100644 --- a/gallery/themes/default/components/elements/pop-up.sass +++ b/gallery/themes/default/components/elements/pop-up.sass @@ -70,9 +70,8 @@ top: 0 font-size: 2.25rem - font-weight: 600 + font-weight: 700 text-align: center - line-height: 1 color: $white background-color: $black @@ -85,10 +84,30 @@ font-size: 1rem font-weight: 500 text-align: center - line-height: 1 color: $white + svg + width: 1rem + height: 1rem + + display: inline-block + vertical-align: middle + + a, .link + font-size: 1rem + font-weight: 500 + text-align: center + line-height: 1 + + color: $primary + + cursor: pointer + text-decoration: none + + &:hover + text-decoration: underline + img margin: auto padding: 0 @@ -133,18 +152,10 @@ .pop-up-wrapper transform: translate(-50%, 50%) scale(1) -.pop-up__link - color: $primary - text-decoration: none - - &:hover - text-decoration: underline - cursor: pointer - @media (max-width: $breakpoint) .pop-up .pop-up-wrapper - width: calc(100% - 1rem) + width: calc(100% - 0.75rem) max-height: 95vh .pop-up-content diff --git a/gallery/themes/default/components/elements/upload-panel.sass b/gallery/themes/default/components/elements/upload-panel.sass index 2f5ea5b..e0b1a21 100644 --- a/gallery/themes/default/components/elements/upload-panel.sass +++ b/gallery/themes/default/components/elements/upload-panel.sass @@ -18,10 +18,10 @@ margin: 0 padding: 0 - font-size: 1.5rem - font-weight: 600 + font-size: 1.75rem + font-weight: 700 - color: $white + color: $primary p margin: 0 diff --git a/gallery/themes/default/fonts/Manrope[wght].ttf b/gallery/themes/default/fonts/Manrope[wght].ttf new file mode 100644 index 0000000..21c45b9 Binary files /dev/null and b/gallery/themes/default/fonts/Manrope[wght].ttf differ diff --git a/gallery/themes/default/fonts/Manrope[wght].woff2 b/gallery/themes/default/fonts/Manrope[wght].woff2 new file mode 100644 index 0000000..4d677aa Binary files /dev/null and b/gallery/themes/default/fonts/Manrope[wght].woff2 differ diff --git a/gallery/themes/default/style.sass b/gallery/themes/default/style.sass index b2da044..e40ad67 100644 --- a/gallery/themes/default/style.sass +++ b/gallery/themes/default/style.sass @@ -14,6 +14,7 @@ @import "components/gallery" @import "components/buttons/top-of-page" +@import "components/buttons/info-button" @import "components/buttons/pill" @import "components/buttons/block" diff --git a/gallery/themes/default/variables.sass b/gallery/themes/default/variables.sass index eaf790a..2682619 100644 --- a/gallery/themes/default/variables.sass +++ b/gallery/themes/default/variables.sass @@ -22,7 +22,7 @@ $rad-inner: 3px $animation-smooth: cubic-bezier(0.76, 0, 0.17, 1) $animation-bounce: cubic-bezier(.68,-0.55,.27,1.55) -$font: "Work Sans", sans-serif +$font: "Manrope", sans-serif $breakpoint: 800px @font-face @@ -38,4 +38,10 @@ $breakpoint: 800px @font-face font-family: 'Work Sans' src: url('fonts/worksans-black.woff2') - font-weight: 900 \ No newline at end of file + font-weight: 900 + +@font-face + font-family: 'Manrope' + src: url('fonts/Manrope[wght].woff2') format('woff2') + font-style: normal; + font-display: swap; \ No newline at end of file