From f6111f9524140ba8f31ba2dcddada2f5ad48102c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 20 Aug 2024 16:00:27 +0200 Subject: [PATCH 01/27] Config: Init git submodule web-assets branch v2 upgrade --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 0e163fd..428c3f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,6 +3,7 @@ # Please keep this a publicly accessible URL, as it is used for the # automatic deployment. url = https://projects.blender.org/infrastructure/web-assets.git + branch = v2 [submodule "playbooks/shared"] path = playbooks/shared url = https://projects.blender.org/infrastructure/web-playbooks -- 2.30.2 From 3212c4fa6615eb54f90fa161f3a3cd19d22052d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 20 Aug 2024 16:04:45 +0200 Subject: [PATCH 02/27] Chore: Update git submodule assets_shared branch to v2 and version to 2.0.0-alpha.30 --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 41b3c16..f74960d 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 41b3c1678602b71a18f0e29f3abc59a03b878beb +Subproject commit f74960d430061fca60cf4cd8a85276bd47990f0f -- 2.30.2 From 03023ff61d19ddd1c0089a8ce7c5285767d85867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 20 Aug 2024 16:12:40 +0200 Subject: [PATCH 03/27] Config: Change style import partials to import web-assets --- bid_main/static/bid_main/styles/main.sass | 43 ++--------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 3fd52e5..ee63407 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -1,48 +1,9 @@ @import toastr.min -// Import variables. -@import '../../../../assets_shared/src/styles/_media_queries' -@import '../../../../assets_shared/src/styles/_variables' - -/* Import Bootstrap. */ -@import '../../../../assets_shared/src/styles/bootstrap/_functions' -@import '../../../../assets_shared/src/styles/bootstrap/_variables' -@import '../../../../assets_shared/src/styles/bootstrap/_mixins' -@import '../../../../assets_shared/src/styles/bootstrap/_root' -@import '../../../../assets_shared/src/styles/bootstrap/_reboot' -@import '../../../../assets_shared/src/styles/bootstrap/_images' -@import '../../../../assets_shared/src/styles/bootstrap/_grid' -@import '../../../../assets_shared/src/styles/bootstrap/_forms' -@import '../../../../assets_shared/src/styles/bootstrap/_transitions' -@import '../../../../assets_shared/src/styles/bootstrap/_nav' -@import '../../../../assets_shared/src/styles/bootstrap/_navbar' -@import '../../../../assets_shared/src/styles/bootstrap/_media' -@import '../../../../assets_shared/src/styles/bootstrap/_utilities' - -@import '../../../../assets_shared/src/styles/_mixins' -@import '../../../../assets_shared/src/styles/_utilities' - $font-path: '/static/assets/fonts' -@import '../../../../assets_shared/src/styles/_fonts' -@import '../../../../assets_shared/src/styles/_bootstrap_overrides' - -@import '../../../../assets_shared/src/styles/_alert' -@import '../../../../assets_shared/src/styles/_base' -@import '../../../../assets_shared/src/styles/_box' -@import '../../../../assets_shared/src/styles/_button' -@import '../../../../assets_shared/src/styles/_cards' -@import '../../../../assets_shared/src/styles/_code' -@import '../../../../assets_shared/src/styles/_footer' -@import '../../../../assets_shared/src/styles/_forms' -@import '../../../../assets_shared/src/styles/_hero' -@import '../../../../assets_shared/src/styles/_list' -@import '../../../../assets_shared/src/styles/_navigation' -@import '../../../../assets_shared/src/styles/_navigation_global' -@import '../../../../assets_shared/src/styles/_sidebar' -@import '../../../../assets_shared/src/styles/_type' - -@import '_auth' +/* Import Blender Web Assets. */ +@import '../../../../assets_shared/src/styles/main' .bid &-user // .bid-user -- 2.30.2 From fa2c2d0c2960485264fb7e27d76c803ab26c2763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 20 Aug 2024 16:30:05 +0200 Subject: [PATCH 04/27] Chore: Run post web-assets v2 upgrade script bash helper --- bid_main/static/bid_main/styles/_auth.sass | 4 +-- bid_main/static/bid_main/styles/main.sass | 30 +++++++++---------- .../components/oauth_flow_background.html | 2 +- .../components/cannot_request_deletion.html | 2 +- bid_main/templates/bid_main/index.html | 2 +- bid_main/templates/bid_main/profile.html | 2 +- .../templatetags/badges/render_badge.html | 2 +- .../templates/components/forms/label.html | 4 +-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bid_main/static/bid_main/styles/_auth.sass b/bid_main/static/bid_main/styles/_auth.sass index 3098ca3..8d51168 100644 --- a/bid_main/static/bid_main/styles/_auth.sass +++ b/bid_main/static/bid_main/styles/_auth.sass @@ -23,7 +23,7 @@ body.is-auth-page height: unset &:focus - border-color: var(--color-primary) + border-color: var(--color-accent) .blender-logo filter: drop-shadow(2px 0px 15px rgba(0,0,0,0.15)) @@ -40,7 +40,7 @@ body.is-auth-page right: 0 z-index: 1 -.page-background +.page-bg background-size: cover bottom: 0 left: 0 diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index ee63407..f45802f 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -19,7 +19,7 @@ $font-path: '/static/assets/fonts' &-links // .bid-links display: flex - font-size: var(--font-size-small) + font-size: var(--fs-sm) justify-content: space-between +list-unstyled margin: var(--spacer) 0 0 0 @@ -55,7 +55,7 @@ $font-path: '/static/assets/fonts' .app-url color: var(--text-color-secondary) - font-size: var(--font-size-small) + font-size: var(--fs-sm) .app-icon border-radius: var(--border-radius) @@ -96,25 +96,25 @@ $font-path: '/static/assets/fonts' margin: 0 auto 15px position: relative - img, .authorize__app-image_placeholder + img, .authorize__app-img_placeholder height: 100px width: 100px - .authorize__app-image + .authorize__app-img background: #7596d9 margin-right: 20px - .authorize__app-image_placeholder + .authorize__app-img_placeholder background: #7596d9 margin-right: 20px - .authorize__app-image_placeholder_icon + .authorize__app-img_placeholder_icon position: absolute top: 20px left: 33px color: white - .authorize__person-image + .authorize__person-img background: #afd876 .authorize__pictogram__arrow @@ -220,15 +220,15 @@ ul.errorlist h2 i color: var(--color-warning) -.badge-image - --badge-image-size: 64px +.badge-img + --badge-img-size: 64px margin: 0 transition: opacity var(--transition-speed-slow) img border-radius: var(--border-radius-lg) - height: var(--badge-image-size) - width: var(--badge-image-size) + height: var(--badge-img-size) + width: var(--badge-img-size) .badge-info flex: 1 @@ -247,7 +247,7 @@ ul.badges +list-unstyled margin: 0 - .badge-image + .badge-img +margin(3, right) li @@ -261,7 +261,7 @@ ul.badges color: var(--text-color-secondary) opacity: .5 - .badge-image + .badge-img opacity: .3 .toggle-group @@ -290,12 +290,12 @@ ul.badges left: -50% .toggle - background-color: var(--color-primary) + background-color: var(--color-accent) border-radius: 999em padding: 0 &:hover - background-color: var(--color-primary) + background-color: var(--color-accent) &.btn min-height: 30px !important diff --git a/bid_main/templates/bid_main/components/oauth_flow_background.html b/bid_main/templates/bid_main/components/oauth_flow_background.html index 8780c7e..68497fa 100644 --- a/bid_main/templates/bid_main/components/oauth_flow_background.html +++ b/bid_main/templates/bid_main/components/oauth_flow_background.html @@ -1,5 +1,5 @@
-
+
diff --git a/bid_main/templates/bid_main/delete_user/components/cannot_request_deletion.html b/bid_main/templates/bid_main/delete_user/components/cannot_request_deletion.html index 552bef9..e66cbef 100644 --- a/bid_main/templates/bid_main/delete_user/components/cannot_request_deletion.html +++ b/bid_main/templates/bid_main/delete_user/components/cannot_request_deletion.html @@ -1,5 +1,5 @@
-

+

diff --git a/bid_main/templates/bid_main/index.html b/bid_main/templates/bid_main/index.html index 87055ec..d070372 100644 --- a/bid_main/templates/bid_main/index.html +++ b/bid_main/templates/bid_main/index.html @@ -39,7 +39,7 @@ Profile {% endif %}

- {% avatar %} + {% avatar %} {% else %} -
+
{% if not field.is_hidden %} {% include 'components/forms/label.html' %} {% endif %} -- 2.30.2 From 6e822651e429372d529f53d70eefd7c3073277a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 10:56:36 +0200 Subject: [PATCH 12/27] UI: Improve post web-assets v2 upgrade form-check input styles --- bid_main/static/bid_main/styles/main.sass | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 9eeab2f..021aa3d 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -374,6 +374,25 @@ svg.bi \:root --input-color-bg-hover: var(--input-color-bg) +.form-check + align-items: center + display: flex + padding-left: 0 + + // TODO: @web-assets consolidate input checkbox styles + input + &[type="checkbox"] + height: auto + +margin(0, left) + +margin(2, right) + +margin(0, top) + position: static + transform: scale(1.25) + transform-origin: left + + &:hover + cursor: pointer + +media-lg .nav-global-container max-width: 117.0rem \ No newline at end of file -- 2.30.2 From 3880578bf3d142bd34fdd79e149a6363111ac97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:04:42 +0200 Subject: [PATCH 13/27] UI: Post web-assets v2 upgrade implement modular sizing and spacing to partial auth Revise and explicit sizing and spacing values, and implement modular sizing and spacing based on variable spacer to partial auth. --- bid_main/static/bid_main/styles/_auth.sass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bid_main/static/bid_main/styles/_auth.sass b/bid_main/static/bid_main/styles/_auth.sass index 8d51168..a6a8867 100644 --- a/bid_main/static/bid_main/styles/_auth.sass +++ b/bid_main/static/bid_main/styles/_auth.sass @@ -1,5 +1,5 @@ body.is-auth-page - --btn-accent-box-shadow: 0px 4px 10px rgba(0,82,255,.2), 1px 10px 25px rgba(0,82,255,.1) + --btn-accent-box-shadow: 0px var(--spacer-1) var(--spacer-2) rgba(0,82,255,.2), .1rem var(--spacer-2) var(--spacer-4) rgba(0,82,255,.1) .container-main align-items: center @@ -9,14 +9,14 @@ body.is-auth-page justify-content: center .box - backdrop-filter: blur(25px) + backdrop-filter: blur(var(--spacer-4)) background-color: rgba(white, .66) - box-shadow: 0 15px 50px rgba(black, .15) - margin-bottom: 6rem - padding: 2rem + box-shadow: 0 var(--spacer) var(--spacer-5) rgba(black, .15) + margin-bottom: var(--spacer-1) + padding: var(--spacer) .btn-accent - padding-block: .33rem + padding-block: .2rem input.form-control border-color: transparent @@ -26,8 +26,8 @@ body.is-auth-page border-color: var(--color-accent) .blender-logo - filter: drop-shadow(2px 0px 15px rgba(0,0,0,0.15)) - margin: 1rem auto + filter: drop-shadow(.2rem 0 var(--spacer) rgba(0,0,0,0.15)) + margin: var(--spacer-2) auto z-index: 1 form @@ -65,7 +65,7 @@ body.is-auth-page .auth-notes background-color: rgba(black, .05) border-bottom-right-radius: var(--border-radius) - border-left: 4px solid rgba(black, .2) + border-left: var(--spacer-1) solid rgba(black, .2) border-top-right-radius: var(--border-radius) +margin(3, top) +padding(3, left) -- 2.30.2 From a93d19dabd16296d8b28001b684d22f705fee624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:07:43 +0200 Subject: [PATCH 14/27] UI: Change style blender-logo height to modular sizing --- bid_main/static/bid_main/styles/_auth.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bid_main/static/bid_main/styles/_auth.sass b/bid_main/static/bid_main/styles/_auth.sass index a6a8867..7568af9 100644 --- a/bid_main/static/bid_main/styles/_auth.sass +++ b/bid_main/static/bid_main/styles/_auth.sass @@ -60,7 +60,7 @@ body.is-auth-page .blender-logo display: block - width: 250px + height: calc(var(--spacer) * 5) .auth-notes background-color: rgba(black, .05) -- 2.30.2 From a29daf5d4572e51e628301c252c796897fc88f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:20:17 +0200 Subject: [PATCH 15/27] UI: Implement style bg filter blur and noise to floating boxes Implement style bg filter blur and noise to floating boxes, reusing styles from blender-studio. --- bid_main/static/bid_main/styles/_auth.sass | 5 +++-- bid_main/static/bid_main/styles/main.sass | 26 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/bid_main/static/bid_main/styles/_auth.sass b/bid_main/static/bid_main/styles/_auth.sass index 7568af9..f3ddcba 100644 --- a/bid_main/static/bid_main/styles/_auth.sass +++ b/bid_main/static/bid_main/styles/_auth.sass @@ -9,8 +9,9 @@ body.is-auth-page justify-content: center .box - backdrop-filter: blur(var(--spacer-4)) - background-color: rgba(white, .66) + @extend .bg-filter-blur + @extend .bg-noise + box-shadow: 0 var(--spacer) var(--spacer-5) rgba(black, .15) margin-bottom: var(--spacer-1) padding: var(--spacer) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 021aa3d..f253ee3 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -395,4 +395,28 @@ svg.bi +media-lg .nav-global-container - max-width: 117.0rem \ No newline at end of file + max-width: 117.0rem + +/* Utilities. */ +// TODO: make bg filter blur uniform in project +// TODO: @web-assets move to web-assets +.bg-filter-blur + background-color: transparent + backdrop-filter: blur(var(--spacer-4)) + position: relative + + &::before + background-color: var(--box-bg-color) + border-radius: var(--border-radius) + content: "" + height: 100% + left: 0 + opacity: .8 + position: absolute + top: 0 + width: 100% + z-index: -1 + +.bg-noise + // SVG generated at https://fffuel.co/nnnoise + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.dev/svgjs' viewBox='0 0 700 700' width='700' height='700'%3E%3Cdefs%3E%3Cfilter id='nnnoise-filter' x='-20%25' y='-20%25' width='140%25' height='140%25' filterUnits='objectBoundingBox' primitiveUnits='userSpaceOnUse' color-interpolation-filters='linearRGB'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.102' numOctaves='4' seed='15' stitchTiles='stitch' x='0%25' y='0%25' width='100%25' height='100%25' result='turbulence'%3E%3C/feTurbulence%3E%3CfeSpecularLighting surfaceScale='15' specularConstant='0.75' specularExponent='20' lighting-color='%23f5a623' x='0%25' y='0%25' width='100%25' height='100%25' in='turbulence' result='specularLighting'%3E%3CfeDistantLight azimuth='3' elevation='100'%3E%3C/feDistantLight%3E%3C/feSpecularLighting%3E%3CfeColorMatrix type='saturate' values='0' x='0%25' y='0%25' width='100%25' height='100%25' in='specularLighting' result='colormatrix'%3E%3C/feColorMatrix%3E%3C/filter%3E%3C/defs%3E%3Crect width='700' height='700' fill='transparent'%3E%3C/rect%3E%3Crect width='700' height='700' fill='%23f5a623' filter='url(%23nnnoise-filter)'%3E%3C/rect%3E%3C/svg%3E") -- 2.30.2 From 02a78f493eb0040463a67603e7efba604bd3f179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:26:33 +0200 Subject: [PATCH 16/27] UI: Add post web-assets v2 upgrade styel override form- group display --- bid_main/static/bid_main/styles/main.sass | 3 +++ bid_main/templates/components/forms/field.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index f253ee3..71f292a 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -393,6 +393,9 @@ svg.bi &:hover cursor: pointer +.form-group + display: block + +media-lg .nav-global-container max-width: 117.0rem diff --git a/bid_main/templates/components/forms/field.html b/bid_main/templates/components/forms/field.html index 1074855..5d05c08 100644 --- a/bid_main/templates/components/forms/field.html +++ b/bid_main/templates/components/forms/field.html @@ -11,7 +11,7 @@
{{ field.errors }}
{% else %} -
+
{% if not field.is_hidden %} {% include 'components/forms/label.html' %} {% endif %} -- 2.30.2 From baf337b5b89da3e65d6f8a6255549f996852c0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:31:31 +0200 Subject: [PATCH 17/27] UI: Make style input-color-bg lighter than box --- bid_main/static/bid_main/styles/main.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 71f292a..2a74c3a 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -372,6 +372,7 @@ svg.bi /* Web Assets overrides. */ // TODO: @web-assets v2 check --input-color-bg-hover \:root + --input-color-bg: white --input-color-bg-hover: var(--input-color-bg) .form-check -- 2.30.2 From a8e58ea162ec7f45f5e3a9926a6a083ee7cfedf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:43:24 +0200 Subject: [PATCH 18/27] UI: Implement template profile web-assets component file input --- bid_main/templates/bid_main/profile.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bid_main/templates/bid_main/profile.html b/bid_main/templates/bid_main/profile.html index ae16152..f94bea4 100644 --- a/bid_main/templates/bid_main/profile.html +++ b/bid_main/templates/bid_main/profile.html @@ -40,8 +40,10 @@ {% avatar size=128 %} -
- + +
+ +
-- 2.30.2 From dd3e1d64cb2026026eb04d9ae909eb693a560a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 11:51:25 +0200 Subject: [PATCH 19/27] UI: Match form buttons sizing height with inputs --- bid_main/static/bid_main/styles/main.sass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 2a74c3a..014c821 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -375,6 +375,13 @@ svg.bi --input-color-bg: white --input-color-bg-hover: var(--input-color-bg) +form + // TODO: @web-assets check form buttons sizing height + .btn + align-items: center + display: flex + min-height: var(--spacer-5) + .form-check align-items: center display: flex -- 2.30.2 From 1546e1fd0543ce0c650afec81cfbbac6d13b9d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 13:03:47 +0200 Subject: [PATCH 20/27] Fix: Template active_sessions table layout btn placement --- bid_main/static/bid_main/styles/main.sass | 3 +++ bid_main/templates/bid_main/active_sessions.html | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 014c821..babdf98 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -431,3 +431,6 @@ form .bg-noise // SVG generated at https://fffuel.co/nnnoise background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.dev/svgjs' viewBox='0 0 700 700' width='700' height='700'%3E%3Cdefs%3E%3Cfilter id='nnnoise-filter' x='-20%25' y='-20%25' width='140%25' height='140%25' filterUnits='objectBoundingBox' primitiveUnits='userSpaceOnUse' color-interpolation-filters='linearRGB'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.102' numOctaves='4' seed='15' stitchTiles='stitch' x='0%25' y='0%25' width='100%25' height='100%25' result='turbulence'%3E%3C/feTurbulence%3E%3CfeSpecularLighting surfaceScale='15' specularConstant='0.75' specularExponent='20' lighting-color='%23f5a623' x='0%25' y='0%25' width='100%25' height='100%25' in='turbulence' result='specularLighting'%3E%3CfeDistantLight azimuth='3' elevation='100'%3E%3C/feDistantLight%3E%3C/feSpecularLighting%3E%3CfeColorMatrix type='saturate' values='0' x='0%25' y='0%25' width='100%25' height='100%25' in='specularLighting' result='colormatrix'%3E%3C/feColorMatrix%3E%3C/filter%3E%3C/defs%3E%3Crect width='700' height='700' fill='transparent'%3E%3C/rect%3E%3Crect width='700' height='700' fill='%23f5a623' filter='url(%23nnnoise-filter)'%3E%3C/rect%3E%3C/svg%3E") + +.mh-0 + min-height: 0 !important diff --git a/bid_main/templates/bid_main/active_sessions.html b/bid_main/templates/bid_main/active_sessions.html index 889c589..74ec971 100644 --- a/bid_main/templates/bid_main/active_sessions.html +++ b/bid_main/templates/bid_main/active_sessions.html @@ -32,10 +32,10 @@ Active Sessions {{ session.ip }} {{ session.device }} - -
+ + {% csrf_token %} - +
-- 2.30.2 From 4d7146baaec504076984381f866e7d11f8829c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 15:00:57 +0200 Subject: [PATCH 21/27] UI: Change style form-text paddings and fix btn txt alignment --- bid_main/static/bid_main/styles/main.sass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index babdf98..4b8451d 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -375,6 +375,9 @@ svg.bi --input-color-bg: white --input-color-bg-hover: var(--input-color-bg) +.btn + justify-content: center + form // TODO: @web-assets check form buttons sizing height .btn @@ -404,6 +407,11 @@ form .form-group display: block +.form-text + ul + +margin(2, top) + +padding(3, left) + +media-lg .nav-global-container max-width: 117.0rem -- 2.30.2 From 136d4d323e57a6424b039593059b689f12cd1fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 15:02:02 +0200 Subject: [PATCH 22/27] Fix: Auth page container being cropped when inner container y overflows --- bid_main/static/bid_main/styles/_auth.sass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bid_main/static/bid_main/styles/_auth.sass b/bid_main/static/bid_main/styles/_auth.sass index f3ddcba..98df85f 100644 --- a/bid_main/static/bid_main/styles/_auth.sass +++ b/bid_main/static/bid_main/styles/_auth.sass @@ -8,6 +8,10 @@ body.is-auth-page height: 100% justify-content: center + .container + max-height: 100% + overflow-y: auto + .box @extend .bg-filter-blur @extend .bg-noise @@ -43,13 +47,13 @@ body.is-auth-page .page-bg background-size: cover - bottom: 0 + height: 100% left: 0 opacity: .8 pointer-events: none - position: fixed - right: 0 + position: absolute top: 0 + width: 100% &::after background-color: transparent -- 2.30.2 From 8b76fecbbe5e76833c8c768b8e465bef1ac86ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 15:13:20 +0200 Subject: [PATCH 23/27] Fix: Convert explicit size value to modular sizing --- bid_main/static/bid_main/styles/main.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 4b8451d..1dd88cf 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -164,7 +164,7 @@ $font-path: '/static/assets/fonts' padding-left: var(--spacer) li - margin-bottom: 5px + margin-bottom: var(--spacer-1) .btn-chooser padding-bottom: var(--spacer-4) -- 2.30.2 From 9260ef8f1044498a82b066711e15cee23ee5aaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Wed, 21 Aug 2024 15:27:44 +0200 Subject: [PATCH 24/27] UI: Make table data text nowrap Prevent table data content from wrapping to multiple lines. --- bid_main/static/bid_main/styles/main.sass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 1dd88cf..896505f 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -78,6 +78,13 @@ $font-path: '/static/assets/fonts' &:hover color: lighten(var(--color-danger), 10%) + &.box + overflow-x: auto + + td, + th + white-space: nowrap + .app-info display: flex flex: 1 -- 2.30.2 From e9892b3205ebaa7a3147e644882bec9c611fccc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Thu, 22 Aug 2024 10:22:30 +0200 Subject: [PATCH 25/27] UI: Add style overrides footer pages for modular sizing Part of #93590 --- bid_main/static/bid_main/styles/main.sass | 7 +++++++ templates/layout.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bid_main/static/bid_main/styles/main.sass b/bid_main/static/bid_main/styles/main.sass index 896505f..e43398e 100644 --- a/bid_main/static/bid_main/styles/main.sass +++ b/bid_main/static/bid_main/styles/main.sass @@ -385,6 +385,13 @@ svg.bi .btn justify-content: center +.footer-pages + line-height: var(--lh-sm) + + a + +padding(0, y) + +padding(2, x) + form // TODO: @web-assets check form buttons sizing height .btn diff --git a/templates/layout.html b/templates/layout.html index c5ebbf9..8067fb7 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -79,7 +79,7 @@
{% get_flatpages as flatpages %} {% if flatpages %} -
+