diff --git a/gallery/__init__.py b/gallery/__init__.py index 7474190..9fb35b5 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' + "sass/*.sass", filters="libsass, cssmin", output="gen/styles.css", depends='sass/**/*.sass' ) assets.register("lib", lib) diff --git a/gallery/static/sass/components/banner.sass b/gallery/static/sass/components/banner.sass index e4c0f99..e9d713f 100644 --- a/gallery/static/sass/components/banner.sass +++ b/gallery/static/sass/components/banner.sass @@ -8,6 +8,7 @@ padding: 0.1rem 0.3rem text-decoration: none + font-weight: 500 background-color: RGB($fg-white) color: RGB($fg-black) @@ -90,18 +91,18 @@ text-align: left font-size: 6.9rem - font-weight: 800 + font-weight: 700 color: RGB($primary) .banner-info grid-area: info font-size: 1rem - font-weight: 600 + font-weight: 400 .banner-subtitle grid-area: subtitle font-size: 1rem - font-weight: 600 + font-weight: 400 .pill-row margin-top: auto @@ -142,14 +143,14 @@ text-overflow: ellipsis overflow: hidden text-align: left - font-weight: 800 + font-weight: 700 font-size: 1.5rem color: RGB($primary) .banner-info font-size: 0.9rem - font-weight: 600 + font-weight: 400 .pill-row margin-left: auto @@ -173,7 +174,7 @@ flex-direction: column justify-content: center align-items: center - gap: 0.25rem + gap: 1rem .banner-header text-align: center @@ -187,7 +188,7 @@ display: none .pill-row - margin-top: 1rem + margin-top: 0rem .banner-small .banner-content diff --git a/gallery/static/sass/components/buttons/block.sass b/gallery/static/sass/components/buttons/block.sass index 15be087..2b767ee 100644 --- a/gallery/static/sass/components/buttons/block.sass +++ b/gallery/static/sass/components/buttons/block.sass @@ -9,10 +9,10 @@ outline: 2px solid RGBA($color, 0.3) .btn-block - padding: 0.5rem 1rem + padding: 0.4rem 0.7rem width: auto - min-height: 2.5rem + min-height: 2.3rem display: flex justify-content: center @@ -22,7 +22,7 @@ position: relative font-size: 1rem - font-weight: 600 + font-weight: 400 text-align: center background-color: transparent @@ -68,16 +68,16 @@ label font-size: 1rem - font-weight: 600 + font-weight: 400 text-align: left color: RGB($fg-white) .input-block - padding: 0.5rem 1rem + padding: 0.4rem 0.7rem width: auto - min-height: 2.5rem + min-height: 2.3rem display: flex justify-content: flex-start @@ -86,7 +86,7 @@ position: relative font-size: 1rem - font-weight: 600 + font-weight: 400 text-align: left background-color: RGBA($white, 0.1) @@ -116,7 +116,7 @@ padding: 1rem 1.25rem width: 100% - min-height: 2.5rem + min-height: 2.3rem display: flex flex-direction: column @@ -127,7 +127,7 @@ position: relative font-size: 1rem - font-weight: 600 + font-weight: 400 text-align: center background-color: RGBA($white, 0.1) diff --git a/gallery/static/sass/components/buttons/pill.sass b/gallery/static/sass/components/buttons/pill.sass index 26e6897..d0b7ee6 100644 --- a/gallery/static/sass/components/buttons/pill.sass +++ b/gallery/static/sass/components/buttons/pill.sass @@ -16,7 +16,7 @@ display: flex - background-color: RGB($bg-100) + background-color: RGB($bg-200) border-radius: $rad .pill-text @@ -34,7 +34,7 @@ text-align: center font-size: 1rem - font-weight: 500 + font-weight: 400 color: RGB($fg-white) diff --git a/gallery/static/sass/components/elements/pop-up.sass b/gallery/static/sass/components/elements/pop-up.sass index 880d4f7..8af0dc8 100644 --- a/gallery/static/sass/components/elements/pop-up.sass +++ b/gallery/static/sass/components/elements/pop-up.sass @@ -70,8 +70,8 @@ top: 0 font-size: 1.5rem - font-weight: 800 - text-align: center + font-weight: 700 + text-align: left color: RGB($fg-white) @@ -81,8 +81,8 @@ width: 100% font-size: 1rem - font-weight: 500 - text-align: center + font-weight: 400 + text-align: left color: RGB($fg-white) @@ -96,7 +96,6 @@ a, .link font-size: 1rem font-weight: 500 - text-align: center line-height: 1 color: RGB($primary) diff --git a/gallery/static/sass/components/elements/upload-panel.sass b/gallery/static/sass/components/elements/upload-panel.sass index 692868a..19325bb 100644 --- a/gallery/static/sass/components/elements/upload-panel.sass +++ b/gallery/static/sass/components/elements/upload-panel.sass @@ -213,7 +213,7 @@ height: 95% left: 0 - bottom: calc(-100vh + 3.5rem) + bottom: -100vh border-radius: $rad $rad 0 0 diff --git a/gallery/static/sass/components/gallery.sass b/gallery/static/sass/components/gallery.sass index 7079937..69ee691 100644 --- a/gallery/static/sass/components/gallery.sass +++ b/gallery/static/sass/components/gallery.sass @@ -59,11 +59,11 @@ .image-title font-size: 0.9rem - font-weight: 800 + font-weight: 700 .image-subtitle font-size: 0.8rem - font-weight: 600 + font-weight: 400 img width: 100% @@ -143,11 +143,11 @@ .image-title font-size: 0.9rem - font-weight: 800 + font-weight: 700 .image-subtitle font-size: 0.8rem - font-weight: 600 + font-weight: 400 .images margin: 0 diff --git a/gallery/static/sass/components/image-view/info-tab.sass b/gallery/static/sass/components/image-view/info-tab.sass index 3cded6a..47c9d44 100644 --- a/gallery/static/sass/components/image-view/info-tab.sass +++ b/gallery/static/sass/components/image-view/info-tab.sass @@ -94,7 +94,7 @@ padding: 0 font-size: 1.1rem - font-weight: 600 + font-weight: 500 color: RGB($primary) @@ -118,7 +118,7 @@ padding: 0 font-size: 1rem - font-weight: 500 + font-weight: 400 text-overflow: ellipsis overflow: hidden @@ -171,7 +171,7 @@ white-space: nowrap font-size: 1rem - font-weight: 500 + font-weight: 400 td:last-child padding: 0 @@ -183,7 +183,7 @@ white-space: nowrap font-size: 1rem - font-weight: 500 + font-weight: 400 td.empty-table opacity: 0.3 diff --git a/gallery/static/sass/components/navigation.sass b/gallery/static/sass/components/navigation.sass index 718c351..5235e34 100644 --- a/gallery/static/sass/components/navigation.sass +++ b/gallery/static/sass/components/navigation.sass @@ -68,7 +68,7 @@ .tool-tip margin: 0 - padding: 0.35rem 0.7rem + padding: 0.4rem 0.7rem display: block @@ -78,9 +78,9 @@ transform: translateY(-50%) font-size: 0.9rem - font-weight: 700 + font-weight: 500 - background-color: #000000 + background-color: RGB($bg-100) color: RGB($fg-white) opacity: 0 border-radius: $rad-inner @@ -103,7 +103,7 @@ left: -0.45rem transform: translateY(-50%) - color: #000000 + color: RGB($bg-100) &:hover > svg diff --git a/gallery/templates/group.html b/gallery/templates/group.html index 9014fb9..caa5313 100644 --- a/gallery/templates/group.html +++ b/gallery/templates/group.html @@ -199,7 +199,7 @@ } @media (max-width: 800px) { .banner-filter { - background: linear-gradient(180deg, rgba({{ images.0.colours.0.0 }}, {{ images.0.colours.0.1 }}, {{ images.0.colours.0.2 }}, 0.8), + background: linear-gradient(180deg, rgba({{ images.0.colours.0.0 }}, {{ images.0.colours.0.1 }}, {{ images.0.colours.0.2 }}, 1), rgba({{ images.0.colours.1.0 }}, {{ images.0.colours.1.1 }}, {{ images.0.colours.1.2 }}, 0.5)) !important; } } @@ -223,9 +223,9 @@ {% if images.0.alt %}{{ images.0.alt }}{% else %}Group Banner{% endif %}