diff --git a/gallery/__init__.py b/gallery/__init__.py index c24f1a3..7474190 100644 --- a/gallery/__init__.py +++ b/gallery/__init__.py @@ -89,7 +89,7 @@ def create_app(test_config=None): "js/*.js", filters="jsmin", output="gen/index.js", depends="js/*.js" ) styles = Bundle( - "sass/*.sass", filters="libsass,cssmin", output="gen/styles.css", depends="**" + "sass/*.sass", filters="libsass,cssmin", output="gen/styles.css", depends='sass/**/*.sass' ) assets.register("lib", lib) diff --git a/gallery/static/fonts/Manrope[wght].ttf b/gallery/static/fonts/Manrope[wght].ttf deleted file mode 100644 index 21c45b9..0000000 Binary files a/gallery/static/fonts/Manrope[wght].ttf and /dev/null differ diff --git a/gallery/static/fonts/Manrope[wght].woff2 b/gallery/static/fonts/Manrope[wght].woff2 deleted file mode 100644 index 4d677aa..0000000 Binary files a/gallery/static/fonts/Manrope[wght].woff2 and /dev/null differ diff --git a/gallery/static/fonts/Rubik.ttf b/gallery/static/fonts/Rubik.ttf new file mode 100644 index 0000000..547f069 Binary files /dev/null and b/gallery/static/fonts/Rubik.ttf differ diff --git a/gallery/static/js/index.js b/gallery/static/js/index.js index f8f09ac..c7ed18c 100644 --- a/gallery/static/js/index.js +++ b/gallery/static/js/index.js @@ -64,11 +64,10 @@ window.onload = function () { infoButton.classList.add('show'); } infoButton.onclick = function () { - popUpShow('OnlyLegs on Flask', - 'Using Phosphoricons and ' + - 'Manrope
' + + popUpShow('OnlyLegs', + 'Using Phosphoricons and Flask
' + 'Made by Fluffy and others with ❤️
' + - 'V23.04.06'); + 'V23.04.08'); } } }; diff --git a/gallery/static/sass/components/banner.sass b/gallery/static/sass/components/banner.sass index 6611be8..e4c0f99 100644 --- a/gallery/static/sass/components/banner.sass +++ b/gallery/static/sass/components/banner.sass @@ -5,13 +5,19 @@ color: RGB($fg-white) .link - color: inherit + padding: 0.1rem 0.3rem + + text-decoration: none + + background-color: RGB($fg-white) + color: RGB($fg-black) + border-radius: $rad-inner cursor: pointer - text-decoration: underline &:hover - text-decoration: none + background-color: RGB($fg-black) + color: RGB($fg-white) &::after content: '' diff --git a/gallery/static/sass/variables.sass b/gallery/static/sass/variables.sass index d77effa..321a03d 100644 --- a/gallery/static/sass/variables.sass +++ b/gallery/static/sass/variables.sass @@ -33,7 +33,7 @@ $rad-inner: var(--rad-inner) $animation-smooth: var(--animation-smooth) $animation-bounce: var(--animation-bounce) -$font: 'Manrope', sans-serif +$font: 'Rubik', sans-serif $breakpoint: 800px @@ -77,8 +77,10 @@ $breakpoint: 800px // I have no clue if its webassets or libsass thats doing this shit // But one of them is trying to "correct" the path, and 404-ing the // font, so enjoy this path fuckery + @font-face - font-family: 'Manrope' - src: url('../../../../static/fonts/Manrope[wght].woff2') format('woff2') + font-family: 'Rubik' + src: url('../../../../static/fonts/Rubik.ttf') format('truetype') font-style: normal font-display: swap + font-weight: 300 900 diff --git a/gallery/templates/group.html b/gallery/templates/group.html index 11a789a..9014fb9 100644 --- a/gallery/templates/group.html +++ b/gallery/templates/group.html @@ -184,6 +184,15 @@ color: {{ text_colour }} !important; } + .banner-content .link { + background-color: {{ text_colour }} !important; + color: rgb({{ images.0.colours.0.0 }}, {{ images.0.colours.0.1 }}, {{ images.0.colours.0.2 }}) !important; + } + .banner-content .link:hover { + background-color: rgb({{ images.0.colours.0.0 }}, {{ images.0.colours.0.1 }}, {{ images.0.colours.0.2 }}) !important; + color: {{ text_colour }} !important; + } + .banner-filter { background: linear-gradient(90deg, rgb({{ images.0.colours.0.0 }}, {{ images.0.colours.0.1 }}, {{ images.0.colours.0.2 }}), rgba({{ images.0.colours.1.0 }}, {{ images.0.colours.1.1 }}, {{ images.0.colours.1.2 }}, 0.3)) !important; @@ -214,7 +223,7 @@ {% if images.0.alt %}{{ images.0.alt }}{% else %}Group Banner{% endif %}