From e1cda280eed9a8cf2ff6b6c21a72e1a53f546d0b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 15 Mar 2022 13:48:54 -0500 Subject: [PATCH 1/4] FP-1378: Rename Ver, Match
Notes, Clean Up --- .../css/src/_imports/elements/html-elements.css | 8 -------- .../css/src/_imports/settings/props.space.css | 6 ------ .../texascale-org/css/src/_imports/trumps/u-swallow.css | 4 ++-- .../texascale-org/css/src/page.dispatches-frontera.css | 5 ++--- texascale-org/static/texascale-org/css/src/site.css | 1 - 5 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css b/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css index 60bac3df..1add40b0 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css +++ b/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css @@ -1,11 +1,3 @@ -/* ELEMENTS: Content Sectioning */ - -main, -/* NOTE: Using ID until it is replaced with `main` */ -#content-wrap { - padding-bottom: var(--global-space-beneath-main-content); -} - /* ELEMENTS: Content Sectioning: Headings - `h1` = story titles diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css deleted file mode 100644 index b6d104d9..00000000 --- a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css +++ /dev/null @@ -1,6 +0,0 @@ -/* CUSTOM PROPERTY SETTINGS: Space */ - -:root { - /* Project specific */ - --global-space-beneath-main-content: 45px; -} diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css b/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css index bec20d23..1565419f 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css +++ b/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css @@ -11,6 +11,6 @@ Style guide: Trumps.Utilities.Border */ .u-swallow--space-beneath-main-content { - padding-bottom: var(--global-space-beneath-main-content); - margin-bottom: calc( -1 * var(--global-space-beneath-main-content) ); + padding-bottom: var(--global-space--above-footer); + margin-bottom: calc( -1 * var(--global-space--above-footer) ); } diff --git a/texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css b/texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css index 9dd9e189..c99f7cc6 100644 --- a/texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css +++ b/texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css @@ -4,9 +4,8 @@ /* ELEMENTS: (Content) Sectioning Elements */ /* Overwrite `_imports/elements/sectioning.css` */ -main, -/* NOTE: Using ID until it is replaced with `main` */ -#content-wrap { +main /* SEE: https://github.com/TACC/Core-CMS/pull/151 */, +#content-wrap /* HACK: Using ID selector until
exists */ { padding-bottom: 0; } diff --git a/texascale-org/static/texascale-org/css/src/site.css b/texascale-org/static/texascale-org/css/src/site.css index cc89f7f6..740a4b75 100644 --- a/texascale-org/static/texascale-org/css/src/site.css +++ b/texascale-org/static/texascale-org/css/src/site.css @@ -5,7 +5,6 @@ /* SETTINGS */ @import url("_imports/settings/props.font.css"); -@import url("_imports/settings/props.space.css"); @import url("_imports/settings/props.border.css"); /* GENERICS */ From 9c76909cce554bddbdc022330f3512433a8912e5 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Sun, 24 Apr 2022 18:52:46 -0500 Subject: [PATCH 2/4] feat(fp-1378): global space --beneath-main-content - set equal to --section-gap - replace -beneath-main-content and --above-footer --- .../css/src/_imports/elements/html-elements.css | 2 +- .../texascale-org/css/src/_imports/settings/props.space.css | 5 +++++ .../texascale-org/css/src/_imports/trumps/u-swallow.css | 4 ++-- texascale-org/static/texascale-org/css/src/site.css | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css b/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css index 78785e7f..430acefb 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css +++ b/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css @@ -1,7 +1,7 @@ /* ELEMENTS: Content Sectioning */ main { - padding-bottom: var(--global-space-beneath-main-content); + padding-bottom: var(--global-space--beneath-main-content); } /* ELEMENTS: Content Sectioning: Headings diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css new file mode 100644 index 00000000..742bdd23 --- /dev/null +++ b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css @@ -0,0 +1,5 @@ +/* https://github.com/TACC/Core-Styles/blob/main/source/_imports/settings/props.space.css */ + +:root { + --global-space--beneath-main-content: var(--global-space--section-gap); +} diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css b/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css index 1565419f..14c502a2 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css +++ b/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css @@ -11,6 +11,6 @@ Style guide: Trumps.Utilities.Border */ .u-swallow--space-beneath-main-content { - padding-bottom: var(--global-space--above-footer); - margin-bottom: calc( -1 * var(--global-space--above-footer) ); + padding-bottom: var(--global-space--beneath-main-content); + margin-bottom: calc( -1 * var(--global-space--beneath-main-content) ); } diff --git a/texascale-org/static/texascale-org/css/src/site.css b/texascale-org/static/texascale-org/css/src/site.css index aa021417..97ebd768 100644 --- a/texascale-org/static/texascale-org/css/src/site.css +++ b/texascale-org/static/texascale-org/css/src/site.css @@ -5,6 +5,7 @@ /* SETTINGS */ @import url("_imports/settings/props.font.css"); +@import url("_imports/settings/props.space.css"); @import url("_imports/settings/props.border.css"); /* GENERICS */ From 558dcb0146614bd2979fa643b803911e4714e2b8 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 May 2022 17:02:37 -0500 Subject: [PATCH 3/4] fix(fp-1378): fix outdated url --- .../texascale-org/css/src/_imports/settings/props.space.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css index 742bdd23..47d55783 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css +++ b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css @@ -1,4 +1,4 @@ -/* https://github.com/TACC/Core-Styles/blob/main/source/_imports/settings/props.space.css */ +/* https://github.com/TACC/Core-Styles/blob/main/source/_imports/settings/space.css */ :root { --global-space--beneath-main-content: var(--global-space--section-gap); From b374137dfdab833dd14af81c2eba0478051184f8 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 3 May 2022 17:05:42 -0500 Subject: [PATCH 4/4] chore(fp-1378): revert comment edit, not time yet --- .../texascale-org/css/src/_imports/settings/props.space.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css index 47d55783..79ad9894 100644 --- a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css +++ b/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css @@ -1,4 +1,4 @@ -/* https://github.com/TACC/Core-Styles/blob/main/source/_imports/settings/space.css */ +/* CUSTOM PROPERTY SETTINGS: Space */ :root { --global-space--beneath-main-content: var(--global-space--section-gap);