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.

Sign up for GitHub

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

Jump to bottom

Fix/v3.7.0 major bugs a.k.a. After/tup 271 #507

Merged
merged 26 commits into from
Jul 6, 2022
Merged

Fix/v3.7.0 major bugs a.k.a. After/tup 271 #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c7b5022
feat(tup-271): use TACC/tup-ui:/libs/core-styles
wesleyboar Jun 1, 2022
3ddba4f
fix(tup-271): simplify PR diff
wesleyboar Jun 1, 2022
37dfdd6
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 2, 2022
965ebfe
feat: install core-styles via npm at v0.6.1-alpha
wesleyboar Jun 2, 2022
6fba99d
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 2, 2022
3bf8c72
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 2, 2022
05f57cb
docs(README): change all [Core Styles] links
wesleyboar Jun 2, 2022
f074e50
feat: install [email protected]
wesleyboar Jun 3, 2022
b04347b
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 3, 2022
faa472b
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 23, 2022
98c67fd
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 23, 2022
f8ded3b
Merge branch 'task/tup-271-move-core-styles-to-monorepo' of github.co…
wesleyboar Jun 23, 2022
1a3267f
chore(core-styles): install 0.6.0-beta
wesleyboar Jun 23, 2022
2c32fc8
Merge branch 'main' into task/tup-271-move-core-styles-to-monorepo
wesleyboar Jun 23, 2022
6661dba
fix(core-styles): template sample markup symlinks
wesleyboar Jun 24, 2022
fc551b9
Merge branch 'main' into after/tup-271
wesleyboar Jun 27, 2022
975299e
After/tup 271 fp 1663 system spec figure styles (#503)
wesleyboar Jun 28, 2022
5cf53ca
After/tup 271 fp 1666 frontera header hidden (#505)
wesleyboar Jun 28, 2022
f5d6cdb
Merge branch 'main' into after/tup-271
wesleyboar Jun 29, 2022
28cbee6
After/tup 271 fp 1665 excess space above footer (#506)
wesleyboar Jul 6, 2022
1e61c93
Merge branch 'main' into after/tup-271
wesleyboar Jul 6, 2022
11f4a23
chore(core-styles): install 0.6.0
wesleyboar Jul 6, 2022
4ea4e4f
chore(core-styles): v3.7.11
wesleyboar Jul 6, 2022
fb2cf21
fix(changelog): typo, 3.7._ to 3.7.11
wesleyboar Jul 6, 2022
464daa9
fix(protx): wrong path to core-styles theme
wesleyboar Jul 6, 2022
066f0a3
fix(tup): wrong path to core-styles theme
wesleyboar Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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",
wesleyboar marked this conversation as resolved.
Show resolved Hide resolved
"minimist": "^1.2.6"
},
"repository": "[email protected]:TACC/Core-CMS.git",
Expand Down
7 changes: 0 additions & 7 deletions taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 %}">
wesleyboar marked this conversation as resolved.
Show resolved Hide resolved
{% 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
2 changes: 1 addition & 1 deletion taccsite_custom
Open in desktop
Submodule taccsite_custom updated 3 files
+0 −11 a2cps-cms/static/a2cps-cms/css/src/_migrations/v1_v2/a2cps.css
+1 −1 protx-cms/static/protx-cms/css/.postcssrc.yml
+1 −1 tup-cms/static/tup-cms/css/.postcssrc.yml