From e2c43f085f037c583d58857806d7c65093453f6a Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 25 Apr 2024 01:46:18 +0200 Subject: [PATCH 1/5] Set page bottom padding to --page-spacing --- web_src/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 58a5723cb5631..772794d765ac0 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -477,12 +477,12 @@ img.ui.avatar, .full.height { flex-grow: 1; - padding-bottom: 80px; + padding-bottom: var(--page-spacing); } /* add margin below .secondary nav when it is the first child */ .page-content > :first-child.secondary-nav { - margin-bottom: 14px; + margin-bottom: var(--page-spacing); } /* add margin to all pages when there is no .secondary.nav */ From e3cab8bd8f9fb1d54f0b97e5adb639d474676967 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 25 Apr 2025 15:53:22 +0200 Subject: [PATCH 2/5] introduce --page-margin-bottom at 64px --- web_src/css/base.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index eaaac93c50789..bb658c6fe8fb3 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -29,6 +29,7 @@ --checkbox-size: 15px; /* height and width of checkbox and radio inputs */ --page-spacing: 16px; /* space between page elements */ --page-margin-x: 32px; /* minimum space on left and right side of page */ + --page-margin-bottom: 64px; /* space between last page element and footer */ } @media (min-width: 768px) and (max-width: 1200px) { @@ -479,7 +480,7 @@ img.ui.avatar, .full.height { flex-grow: 1; - padding-bottom: var(--page-spacing); + padding-bottom: var(--page-margin-bottom); } .status-page-error { From 5e00bbaec273f18486b81daa9b7c95f8214ebcbb Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 25 Apr 2025 15:55:37 +0200 Subject: [PATCH 3/5] revert unrelated change --- web_src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index bb658c6fe8fb3..d8558c1bf4958 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -504,7 +504,7 @@ img.ui.avatar, /* add margin to all pages when there is no .secondary.nav */ .page-content > :first-child:not(.secondary-nav) { - margin-top: var(--page-spacing); + margin-top: 14px; } /* if .ui.grid is the first child the first grid-column has 'padding-top: 1rem' which we need to compensate here */ From a34c139abf189b860241201615d1aabc866ce4e7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 25 Apr 2025 15:56:05 +0200 Subject: [PATCH 4/5] fix --- web_src/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index d8558c1bf4958..f1fb78543b0fa 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -499,12 +499,12 @@ img.ui.avatar, /* add margin below .secondary nav when it is the first child */ .page-content > :first-child.secondary-nav { - margin-bottom: var(--page-spacing); + margin-bottom: 14px; } /* add margin to all pages when there is no .secondary.nav */ .page-content > :first-child:not(.secondary-nav) { - margin-top: 14px; + margin-top: var(--page-spacing); } /* if .ui.grid is the first child the first grid-column has 'padding-top: 1rem' which we need to compensate here */ From b722ab739809fb917e2446b770deb4235dd4f778 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 25 Apr 2025 17:02:25 +0200 Subject: [PATCH 5/5] use --page-space-bottom --- web_src/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index f1fb78543b0fa..bf7639859d209 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -29,7 +29,7 @@ --checkbox-size: 15px; /* height and width of checkbox and radio inputs */ --page-spacing: 16px; /* space between page elements */ --page-margin-x: 32px; /* minimum space on left and right side of page */ - --page-margin-bottom: 64px; /* space between last page element and footer */ + --page-space-bottom: 64px; /* space between last page element and footer */ } @media (min-width: 768px) and (max-width: 1200px) { @@ -480,7 +480,7 @@ img.ui.avatar, .full.height { flex-grow: 1; - padding-bottom: var(--page-margin-bottom); + padding-bottom: var(--page-space-bottom); } .status-page-error {