diff --git a/CHANGELOG.md b/CHANGELOG.md index e1dceec08..e57697980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/package-lock.json b/package-lock.json index e7bc5dd09..ea71fd412 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@tacc/core-cms", - "version": "3.7.0", + "version": "3.7.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@tacc/core-cms", - "version": "3.7.0", + "version": "3.7.11", "license": "MIT", "devDependencies": { - "@tacc/core-styles": "^0.6.0-beta", + "@tacc/core-styles": "^0.6.0", "minimist": "^1.2.6" }, "engines": { @@ -62,9 +62,9 @@ } }, "node_modules/@tacc/core-styles": { - "version": "0.6.0-beta", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.6.0-beta.tgz", - "integrity": "sha512-y8AGbm5LnPxsBBJCwnV9fTDpGthAidkKD2n/BUIziUnB4c9zHI1WKdKI3a2lM5dNq3vzOFVgGWmhW0xEZFnk+Q==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.6.0.tgz", + "integrity": "sha512-qNfPtpta3k4Jmff4xt5JRvkOPD85VX10r/ip24f7ATXqDNZUMe/3v1+sAf1O6tiHcLqp7UdPnINRf0NrME7fnQ==", "dev": true, "dependencies": { "commander": "^9.0.0", @@ -3937,9 +3937,9 @@ } }, "@tacc/core-styles": { - "version": "0.6.0-beta", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.6.0-beta.tgz", - "integrity": "sha512-y8AGbm5LnPxsBBJCwnV9fTDpGthAidkKD2n/BUIziUnB4c9zHI1WKdKI3a2lM5dNq3vzOFVgGWmhW0xEZFnk+Q==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.6.0.tgz", + "integrity": "sha512-qNfPtpta3k4Jmff4xt5JRvkOPD85VX10r/ip24f7ATXqDNZUMe/3v1+sAf1O6tiHcLqp7UdPnINRf0NrME7fnQ==", "dev": true, "requires": { "commander": "^9.0.0", diff --git a/package.json b/package.json index 5a2a49b51..64537165b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tacc/core-cms", - "version": "3.7.0", + "version": "3.7.11", "license": "MIT", "author": "TACC ACI WMA ", "description": "The TACC ACI-WMA Core CMS codebase used by TACC Portals.", @@ -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": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css index 7fee9e53a..7c0c5d157 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css @@ -20,10 +20,3 @@ body { /* min-height: 100%; */ /* position: relative; */ } - -/* … */ - -footer { - /* … */ - margin-top: 1em; -} diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 27ea07893..ed6942229 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -17,7 +17,6 @@ /* 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 */ @@ -25,7 +24,6 @@ @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"); diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html index 8cf8582b7..0c9d1ae6f 100755 --- a/taccsite_cms/templates/base.html +++ b/taccsite_cms/templates/base.html @@ -46,14 +46,14 @@ {% render_block "css" %} - + {% cms_toolbar %} -
+
{% include "header.html" %}
-
+
{% block content %} {# To allow extra Container in page structure by hiding extra padding #} @@ -70,7 +70,7 @@ {% endblock content %}
-