Skip to content

Commit

Permalink
Fix/v3.7.0 major bugs a.k.a. After/tup 271 (#507)
Browse files Browse the repository at this point in the history
* feat(tup-271): use TACC/tup-ui:/libs/core-styles

* fix(tup-271): simplify PR diff

* feat: install core-styles via npm at v0.6.1-alpha

* docs(README): change all [Core Styles] links

* feat: install [email protected]

* chore(core-styles): install 0.6.0-beta

* fix(core-styles): template sample markup symlinks

* After/tup 271  fp 1663 system spec figure styles (#503)

* fix(core-styles): s-system-specs unset figure css

* fix(core-styles): no figure css (only .figure css)

- Do not load elements/figure.css.
- Load core-styles that deleted elements/figure.css (and moved its styles).

* fix(core-styles): update temporary pacakge url

* chore: inconsequential change to bust docker cache

* Revert "chore: inconsequential change to bust docker cache"

This reverts commit bd61cdc.

* chore(core-styles): v0.6.0-beta.1

* After/tup 271  fp 1666 frontera header hidden (#505)

* chore(core-styles): v0.6.0-beta.2

* fix: fp-1666 no load what v0.6.0-beta.1 deleted

FP-1666 uses v0.6.0-beta.2 which includes v0.6.0-beta.1.

This eases deploy and testing of FP-1663, FP-1666, and FP-1665.

But v0.6.0-beta.1 removed 'elements/figure.css'; build error on load.

Must not merge FP-1666 (v0.6.0-beta.2) before FP-1663 (v0.6.0-beta.1).

* After/tup 271 fp 1665 excess space above footer (#506)

* fix: load fa icons even if no portal (#504)

We do not want FA icons, but there is at least one usage.

Usage: Frontera homepage, "(→) See All News"

* feat(css): drop .o-site for simple sticky footer trick

1. Do not use o-site class in markup and do not import o-site styles.
2. Install core-styles that makes footer sticky in a simpler way.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(css, submod): migration, no add footer margin

FP-1665 will fix end-of-page padding fro old and new sites.

Thus, no need for old solution, which would add excess space.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(core-styles): load latest for fp-1665

For: https://jira.tacc.utexas.edu/browse/FP-1665

* chore(core-styles): v0.6.0-beta.3 (via gitpkg)

Install @tacc/v0.6.0-beta.3 via https://gitpkg.now.sh to test FP-1665.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(core-styles): v0.6.0-beta.3 (via gitpkg) new

* fix(core-styles): v0.6.0-beta.3 (via gitpkg), 3rd

* fix(core-styles): v0.6.0-beta.3 (via npm)

* chore(submod): merged TACC/Core-CMS-Resources#147

TACC/Core-CMS-Resources#147

For: #506

* chore(core-styles): install 0.6.0

* chore(core-styles): v3.7.11

* fix(changelog): typo, 3.7._ to 3.7.11

* fix(protx): wrong path to core-styles theme

* fix(tup): wrong path to core-styles theme
  • Loading branch information
wesleyboar authored Jul 6, 2022
1 parent 2c3526b commit fb3615f
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 26 deletions.
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.7.11] - 2022-07-06: v3.7.0 Fixes, New Core-Styles, ECEP/TUP/Frontera Tweaks

### Added

- Task/ecepweb-205-logos (#509)
- feat(frontera): accent color vars (d5748c9)
- TUP-271: [update to latest core-styles] (#495, #496, #489, #494, a49d9e7, d3f0a0b)

### Changed

- FP-1550: Document Custom Text in Admin UI (#467)
- feat(tup-151): center news articles (#488)
- chore(core-styles): build css via JS not CLI (#497)
- docs(README): [update npm link & core-styles] (981e7f9, ad0306b, a3a0acb, 4249f5b)

### Fixed

- Fix/v3.7.0 major bugs a.k.a. After/tup 271 (#507)
- fix(node): allow greater node & npm versions
- Bugfix/fp 1542 do not use a2cps url (#493)
- fix: load fa icons even if no portal (#504)

### Removed

- feat(tup): no LDAP (#499)

## [3.7.0] - 2022-05-13: Patterns, News/Blog App, SciVis & APCD, Improvements

### Added
Expand Down Expand Up @@ -382,7 +408,8 @@ formerly known as v2.5.2 published on Thu Jul 1 16:10:38 2021 -0500
## [2.0.0] - 2021-03-31
v2.0.0 Production release as of Mar 31, 2021.

[unreleased]: https://github.com/TACC/Core-CMS/compare/v3.7.0...HEAD
[unreleased]: https://github.com/TACC/Core-CMS/compare/v3.7.11...HEAD
[3.7.11]: https://github.com/TACC/Core-CMS/releases/tag/v3.7.11
[3.7.0]: https://github.com/TACC/Core-CMS/releases/tag/v3.7.0
[3.6.0]: https://github.com/TACC/Core-CMS/releases/tag/v3.6.0
[3.5.2]: https://github.com/TACC/Core-CMS/releases/tag/v3.5.2
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tacc/core-cms",
"version": "3.7.0",
"version": "3.7.11",
"license": "MIT",
"author": "TACC ACI WMA <[email protected]>",
"description": "The TACC ACI-WMA Core CMS codebase used by TACC Portals.",
Expand All @@ -9,7 +9,7 @@
"npm": "^8.5.5"
},
"devDependencies": {
"@tacc/core-styles": "^0.6.0-beta",
"@tacc/core-styles": "^0.6.0",
"minimist": "^1.2.6"
},
"repository": "[email protected]:TACC/Core-CMS.git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,3 @@ body {
/* min-height: 100%; */
/* position: relative; */
}

/* … */

footer {
/* … */
margin-top: 1em;
}
2 changes: 0 additions & 2 deletions taccsite_cms/static/site_cms/css/src/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@

/* ELEMENTS */
/* Bootstrap performs much of this */
@import url("_imports/elements/figure.css");
@import url("_imports/elements/html-elements.css");
/* Load custom element styles within custom element, not here */

/* OBJECTS */
@import url("_imports/objects/o-grid.css");
@import url("_imports/objects/o-offset-content.css");
@import url("_imports/objects/o-section.css");
@import url("_imports/objects/o-site.css");

/* COMPONENTS */
@import url("_imports/components/c-card.css");
Expand Down
8 changes: 4 additions & 4 deletions taccsite_cms/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
{% render_block "css" %}
</head>

<body class="o-site {% block page_type_class %}{% endblock page_type_class %}">
<body class="{% block page_type_class %}{% endblock page_type_class %}">
{% cms_toolbar %}

<header class="o-site__head">
<header>
{% include "header.html" %}
</header>

<main id="cms-content" class="o-site__body">
<main id="cms-content">
{% block content %}

{# To allow extra Container in page structure by hiding extra padding #}
Expand All @@ -70,7 +70,7 @@
{% endblock content %}
</main>

<footer class="c-footer s-footer o-site__foot">
<footer class="c-footer s-footer">
{% block footer %}

{% static_placeholder "footer-content" or %}
Expand Down

0 comments on commit fb3615f

Please sign in to comment.