Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-70: ProTX & A2CPS: Cleanup Templates & Add Standard Template #73

Merged
merged 9 commits into from
Aug 31, 2021

Conversation

wesleyboar
Copy link
Member

@wesleyboar wesleyboar commented Aug 30, 2021

Overview / Issues

Changes

See https://github.com/TACC/Core-CMS-Resources/pull/73/commits.

Testing

  1. Have ProTX and A2CPS environments to test on:
  2. Update local secrets: rename "Fullwidth" to "Full Width" in _CMS_TEMPLATES.
  3. Ensure local instance of ProTX homepage has "Full Width" template.
  4. Ensure local instance of ProTX homepage still loads the same ProTX custom assets as pre-prod.*†

* One known discrepancy is site.fonts.css which is an asset that did not exist in main branch since last deploy of ProTX.
† The style differences are caused by main branch's new typography since last deploy of ProTX.

Screenshots

Site Template Change Screenshot Notes
ProTX Full Width only rename GH-70 ProTX Fullwidth - Template GH-70 ProTX Fullwidth - CSS Load rename pending FP-1189
ProTX Standard new N/A no immediate usage planned
A2CPS Full Width only rename GH-70 A2CPS Fullwidth - Template GH-70 A2CPS Fullwidth - CSS Load rename pending FP-1189
A2CPS Standard new N/A no immediate usage planned

Notes

Known Issues

ProTX

  • Custom Stylesheet is Empty... Why Maintain Templates for It?

    I believe it will not be empty in the very near future. I will likely need to add the header background color change to ProTX custom CSS, because Themes via Settings (Light Header Navbar) Core-CMS#191 will not be finished soon.

A2CPS

  • Subheading Text is Capitalized on Localhost

    This is a bug where the PR GH-98: Typography Core-CMS#312 did not account for the PR GH-245/FP-1097: v1–v2 Migration Stylesheet (via submod) Core-CMS#274. It is fixed on A2CPS and Frontera with a snippet. A snippet may be enough to hold the fix until new pages are built. If not, I'll let it bite me in the ass and solve it when it hurts. (I want to too much effort spent on "migrated" pages/styles.)

    Site Template Change Screenshot Notes
    A2CPS Full Width heading fix GH-70 A2CPS H4 Text - CSS Fix GH-70 A2CPS H4 Text - Snippet Fix unrelated to PR

This prepares custom assets for include by upcoming standard template.
The core fullwidth template already does most of what this one did.
This prepares custom assets for include by upcoming standard template.
The core fullwidth template already does most of what this one did.
This stylesheet is empty and has always been empty.

It was a placeholder that we officially do not need now.
@wesleyboar wesleyboar force-pushed the task/GH-70-protx-a2cps-fullwidth-standard-templates branch from 3a82668 to 27ea0f8 Compare August 30, 2021 23:36
wesleyboar added a commit to TACC/Core-CMS that referenced this pull request Aug 31, 2021
See TACC/Core-CMS-Resources#73 as of:
- this commits timestamp
- 27ea0f8
@wesleyboar wesleyboar marked this pull request as ready for review August 31, 2021 01:06
@wesleyboar wesleyboar merged commit 50882bb into main Aug 31, 2021
@wesleyboar wesleyboar deleted the task/GH-70-protx-a2cps-fullwidth-standard-templates branch August 31, 2021 01:08
@wesleyboar
Copy link
Member Author

wesleyboar commented Aug 31, 2021

Self-merged, because:

  • well-tested, especially A2CPS (deployed to pprd)
  • tested twice (this is my second PR for this)
  • thoroughly documented
  • limited reviewers available
  • bad practice on my part for this repo

wesleyboar added a commit that referenced this pull request Aug 31, 2021
As of GH-73, this component is maintained in Core.
wesleyboar added a commit that referenced this pull request Aug 31, 2021
This allows Bootstrap 4 blockquotes to be replaced by TACC blockquote.
wesleyboar added a commit that referenced this pull request Aug 31, 2021
wesleyboar added a commit that referenced this pull request Aug 31, 2021
wesleyboar added a commit that referenced this pull request Aug 31, 2021
wesleyboar added a commit that referenced this pull request Sep 1, 2021
wesleyboar added a commit that referenced this pull request Sep 1, 2021
wesleyboar added a commit that referenced this pull request Sep 30, 2021
wesleyboar added a commit that referenced this pull request Sep 30, 2021
wesleyboar added a commit that referenced this pull request Oct 8, 2021
…tyles of the following:

commit ca3d537
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 16:59:29 2021 -0500

    GH-93: Fix bug from intro of `x-overlay--` mixin

    Bug Source:
    - TACC/Core-CMS#368
        - TACC/Core-CMS#361
            - 6d253e1...522c296#diff-5894bbc

commit 57a0e5a
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 13:30:20 2021 -0500

    Major: Use `%x-overlay--` not `.x-overlay--`

    That class usage is undesirable and to be removed in Core-CMS.

commit a0f968e
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 13:18:33 2021 -0500

    GH-93: Fix: Do NOT load migrate CSS on homepage

    Also fixed in #69.

commit 6b16f93
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 12:53:07 2021 -0500

    GH-93: Isolate banner image tweaks, fix 300px bug

commit 4eb1b94
Merge: a7328b5 147ee85
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 12:24:49 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit a7328b5
Merge: fd1eb8f 7356817
Author: Wesley Bomar <[email protected]>
Date:   Tue Sep 28 16:59:33 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fd1eb8f
Author: Wesley Bomar <[email protected]>
Date:   Wed Sep 1 16:09:35 2021 -0500

    Revert "Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c"

    This reverts commit 57e159b.

commit 436068f
Merge: fa1a998 50882bb
Author: Wesley Bomar <[email protected]>
Date:   Tue Aug 31 13:58:18 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fa1a998
Merge: db9a390 4e69e60
Author: Wesley Bomar <[email protected]>
Date:   Thu Aug 26 17:00:00 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit db9a390
Merge: 291dbda 23ab68f
Author: Wesley Bomar <[email protected]>
Date:   Mon Aug 16 17:04:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 291dbda
Author: Wesley Bomar <[email protected]>
Date:   Fri Aug 13 05:51:54 2021 -0500

    GH-93: Avoid title color bug with upcoming PR #312

    Ensure heading turns white.

commit 1d81729
Merge: a1be40e e3f7c1a
Author: Wesley Bomar <[email protected]>
Date:   Fri Aug 13 05:50:02 2021 -0500

    Merge branch 'site/frontera/main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit e3f7c1a
Author: Wesley Bomar <[email protected]>
Date:   Thu Aug 12 22:53:26 2021 -0500

    Squashed merge of main at commit 23ab68f

commit 9c83643
Merge: 472a98d 4330d0c
Author: Wesley Bomar <[email protected]>
Date:   Mon Aug 9 11:34:51 2021 -0500

    Merge branch 'main' into site/frontera/main

commit 472a98d
Author: Wesley Bomar <[email protected]>
Date:   Wed Aug 4 12:57:44 2021 -0500

    Squashed merge of quick/support-and-move-snippets at commit c06c7cd

commit 57e159b
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 13:05:43 2021 -0500

    Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c

commit a89d59e
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 13:02:40 2021 -0500

    Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles at commit a1be40e

commit a1be40e
Merge: 7204143 4330d0c
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 12:45:31 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 7204143
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 17:23:20 2021 -0500

    GH-93: Frontera: Plugin-less style … snippet — Fix

commit 0709f20
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 17:02:23 2021 -0500

    GH-93: Match plugin-less styles to plugins tyles

commit 68357a3
Merge: 184a2ab 2b0c7ba
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 16:57:21 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 184a2ab
Author: Wesley Bomar <[email protected]>
Date:   Thu Jun 24 20:45:28 2021 -0500

    WIP: GH-93: Drop old styles for new global styles

    GH-93: Move horz outline-offset to Frontera s-home

    GH-93: Frontera: banner: Use old s-article-preview

    GH-93: Frontera: Cleanup s-home as GH-93 completes

    GH-93: Frontera: Demote Deprecated Core Styles

    Also, update markup to be accurate for for a class within these styles.

    GH-93: Frontera: Noop: Clean up deprecated styles
wesleyboar added a commit that referenced this pull request Nov 12, 2021
…tyles of the following:

commit 64e25a1
Merge: 71992da 28193da
Author: Wesley Bomar <[email protected]>
Date:   Fri Nov 12 17:34:46 2021 -0600

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 71992da
Merge: 3819af9 4e51b1a
Author: Wesley Bomar <[email protected]>
Date:   Thu Nov 4 12:01:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 3819af9
Merge: ca3d537 40e4816
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 14 16:31:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit ca3d537
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 16:59:29 2021 -0500

    GH-93: Fix bug from intro of `x-overlay--` mixin

    Bug Source:
    - TACC/Core-CMS#368
        - TACC/Core-CMS#361
            - 6d253e1...522c296#diff-5894bbc

commit 57a0e5a
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 13:30:20 2021 -0500

    Major: Use `%x-overlay--` not `.x-overlay--`

    That class usage is undesirable and to be removed in Core-CMS.

commit a0f968e
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 13:18:33 2021 -0500

    GH-93: Fix: Do NOT load migrate CSS on homepage

    Also fixed in #69.

commit 6b16f93
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 12:53:07 2021 -0500

    GH-93: Isolate banner image tweaks, fix 300px bug

commit 4eb1b94
Merge: a7328b5 147ee85
Author: Wesley Bomar <[email protected]>
Date:   Thu Oct 7 12:24:49 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit a7328b5
Merge: fd1eb8f 7356817
Author: Wesley Bomar <[email protected]>
Date:   Tue Sep 28 16:59:33 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fd1eb8f
Author: Wesley Bomar <[email protected]>
Date:   Wed Sep 1 16:09:35 2021 -0500

    Revert "Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c"

    This reverts commit 57e159b.

commit 436068f
Merge: fa1a998 50882bb
Author: Wesley Bomar <[email protected]>
Date:   Tue Aug 31 13:58:18 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fa1a998
Merge: db9a390 4e69e60
Author: Wesley Bomar <[email protected]>
Date:   Thu Aug 26 17:00:00 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit db9a390
Merge: 291dbda 23ab68f
Author: Wesley Bomar <[email protected]>
Date:   Mon Aug 16 17:04:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 291dbda
Author: Wesley Bomar <[email protected]>
Date:   Fri Aug 13 05:51:54 2021 -0500

    GH-93: Avoid title color bug with upcoming PR #312

    Ensure heading turns white.

commit 1d81729
Merge: a1be40e e3f7c1a
Author: Wesley Bomar <[email protected]>
Date:   Fri Aug 13 05:50:02 2021 -0500

    Merge branch 'site/frontera/main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit e3f7c1a
Author: Wesley Bomar <[email protected]>
Date:   Thu Aug 12 22:53:26 2021 -0500

    Squashed merge of main at commit 23ab68f

commit 9c83643
Merge: 472a98d 4330d0c
Author: Wesley Bomar <[email protected]>
Date:   Mon Aug 9 11:34:51 2021 -0500

    Merge branch 'main' into site/frontera/main

commit 472a98d
Author: Wesley Bomar <[email protected]>
Date:   Wed Aug 4 12:57:44 2021 -0500

    Squashed merge of quick/support-and-move-snippets at commit c06c7cd

commit 57e159b
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 13:05:43 2021 -0500

    Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c

commit a89d59e
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 13:02:40 2021 -0500

    Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles at commit a1be40e

commit a1be40e
Merge: 7204143 4330d0c
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 30 12:45:31 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 7204143
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 17:23:20 2021 -0500

    GH-93: Frontera: Plugin-less style … snippet — Fix

commit 0709f20
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 17:02:23 2021 -0500

    GH-93: Match plugin-less styles to plugins tyles

commit 68357a3
Merge: 184a2ab 2b0c7ba
Author: Wesley Bomar <[email protected]>
Date:   Tue Jul 20 16:57:21 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 184a2ab
Author: Wesley Bomar <[email protected]>
Date:   Thu Jun 24 20:45:28 2021 -0500

    WIP: GH-93: Drop old styles for new global styles

    GH-93: Move horz outline-offset to Frontera s-home

    GH-93: Frontera: banner: Use old s-article-preview

    GH-93: Frontera: Cleanup s-home as GH-93 completes

    GH-93: Frontera: Demote Deprecated Core Styles

    Also, update markup to be accurate for for a class within these styles.

    GH-93: Frontera: Noop: Clean up deprecated styles
wesleyboar added a commit that referenced this pull request Mar 10, 2022
As of GH-73, this component is maintained in Core.
wesleyboar added a commit that referenced this pull request Mar 10, 2022
This allows Bootstrap 4 blockquotes to be replaced by TACC blockquote.
wesleyboar added a commit that referenced this pull request Mar 10, 2022
wesleyboar added a commit that referenced this pull request Mar 10, 2022
wesleyboar added a commit that referenced this pull request Mar 10, 2022
The code undone here is from "GH-73: …" commits which do not belong:
- 702e0a1
- 39457c8
- 2848d6d
- 9c2a2f7
- 4fe6ad7
- 25f3575
- 03154f9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ProTX & A2CPS: New Fullwidth & Standard Templates
1 participant