Skip to content

Commit

Permalink
Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugin…
Browse files Browse the repository at this point in the history
…s-and-styles--no-reverts
  • Loading branch information
wesleyboar committed Nov 4, 2021
2 parents 92b234e + b9d08f8 commit 7245196
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 60 deletions.
86 changes: 85 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,88 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Bugfix/FP-1277: Extra Margin from Container by User on Standard Template (#370)

## [3.0.7] - 2021-10-26: Hotfixes (mostly for Frontera); Rename Unused Component

### Changed

- task/FP-1260 Rename Component ReadMore to ShowMore (#376)

### Fixed

- FP-1270: Provide Header CSS that Only Docs Needs (#381)
- (UTRC) FP-1234: Add Missing Top Margin for Headings (#359)
- Quick: Complete Core fix for section header colors (#385)
- Hotfix: Local Images for Getting Started Guide (#369)
- `taccsite_custom`
- Hotfix: Frontera: White Text for Home Banner H3's (#100)
- Hotfix: Frontera: (UTRC-356) Homepage Banner Bkgd (x-overlay Mixin Syntax) (#386)

## [3.0.0] - 2021-10-18: Refactor Settings; New Sites & Plugins; v1 CSS; Themes

### Added

- Quick: A2CPS [Site] (#271, #272, #380)
- GH-245/FP-1097: v1–v2 Migration Stylesheet (#274)
- GH-73: Blockquote, Offset [...] Plugins (#275)
- Quick: Support Non-Bootstrap Link & Picture Plugins (#278)
- FP-1097: A2CPS: Add Snippets (#288)
- GH-89: (Minimal) System Monitor Plugin (a.k.a. SysMon) (#297)
- GH-298: Add "See All" Link Component (#300)
- Quick: Support Snippets & Add 1 Useful Snippet (#301)
- GH-75: Data List - Styles / Component / Plugin (#305, #308, #326, #336)
- GH-310: Breadcrumbs [...] (#311)
- GH-310: [...] Standard Template (#311)
- GH-98: Typography (#312, #314, #316, #318)
- GH-83: Callout Plugin (#324)
- GH-88: System Specs Plugin (#323, #330)
- UTRC-356: New UTRC [...] (#367, #368, TACC/Core-CMS-Resources#80)
- Quick: (UTRC-356) Add CSS Mixins for "Overlay" (#362, #368)
- GH-191: Theme (for ProTX Light Header & TACC Blue Header) (#192)
- `taccsite_custom`
- FP-1238/TACC/Core-CMS-Resources#68: Frontera: [...] Add Standard Template (TACC/Core-CMS-Resources#69)
- Quick: Frontera: Save Newsletter Snippets (TACC/Core-CMS-Resources#63)
- TACC/Core-CMS-Resources#70: ProTX & A2CPS: [...] Add Standard Template (TACC/Core-CMS-Resources#73)
- FP-1217: New UTRC Logo (TACC/Core-CMS-Resources#83)
- TACC/Core-CMS-Resources#191: ProTX: Support 'has-dark-logo' theme (TACC/Core-CMS-Resources#87)
- [Texascale: Load Blog a.k.a.] Hotfix: Texascale: Post-FP-1194 Fix (Restore Blog) (#95)

### Changed

- GH-73: [Update Sample Plugin to be Consistent with other Plugins] (#275)
- Quick: Support Variable in x-truncate CSS (#304)
- Quick: GH-253: Tweak Style Guide CSS (#325, #326)
- GH-331: Cleanup Fullwidth Template (#332)
- [Major: Split Settings and Secrets] (#341, #345, #347, #348, TACC/Core-CMS-Resources#77)
- [Quick: Add UTRC Site] (#345, #357)
- [FP-1194: Synchronize User Login between Core Portal and CMS] (#341, #346, #356)
- Quick: (UTRC-356) Migrate Banner Overlay Styles from Core (to Frontera) (#361, #368)
- `taccsite_custom`
- FP-1238/TACC/Core-CMS-Resources#68: Frontera: Cleanup Templates [...] (TACC/Core-CMS-Resources#69)
- Quick: Support & Move Snippets (TACC/Core-CMS-Resources#66)
- TACC/Core-CMS-Resources#70: ProTX & A2CPS: Cleanup Templates [...] (TACC/Core-CMS-Resources#73)

### Fixed

- GH-283/GH-284: Fix Facebook Share Bug (Smaller TACC Logo) (#283)
- Hotfix/FP-1194: Use gettext_lazy Not gettext (fixed tup-cms deploy) (#344)
- FP-1234: Add Missing Top Margin for Headings (#359)
- Hotfix: (UTRC-356) Let Banner Section Padding Match Other Sections (#363, #368)
- Hotfix: (UTRC-356) Avoid Grid Blowout (#365, #368)
- Hotfix: (UTRC-356) Darker Core Body Text (#366, #368)
- Hotfix: Static Images for Getting Started Guide (#369)
- FP-1232: Fix Inconsistent Search Bar Icon Size (#371)
- `taccsite_custom`
- TACC/Core-CMS-Resources#81: Fix Favicons Not Loading (TACC/Core-CMS-Resources#82)

### Removed

- `taccsite_custom`
- GH-89: Remove SysMon Snippet (TACC/Core-CMS-Resources#67)

## [2.5.2] - 2021-07-16: Fix Publish Bug; Texascale 2020; Polish

### Added
Expand Down Expand Up @@ -80,7 +162,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [2.0.0] - 2021-03-31
v2.0.0 Production release as of Mar 31, 2021.

[unreleased]: https://github.com/TACC/Core-CMS/compare/v2.5.2...HEAD
[unreleased]: https://github.com/TACC/Core-CMS/compare/v3.0.7...HEAD
[3.0.7]: https://github.com/TACC/Core-CMS/releases/tag/v3.0.7
[3.0.0]: https://github.com/TACC/Core-CMS/releases/tag/v3.0.0
[2.5.2]: https://github.com/TACC/Core-CMS/releases/tag/v2.5.2
[2.1.1]: https://github.com/TACC/Core-CMS/releases/tag/v2.1.1
[2.1.0]: https://github.com/TACC/Core-CMS/releases/tag/v2.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
border: none;
}

.branding-logo--tall {
height: 35px;
}

/* Specific Brand Logo Selectors */

.branding-nsf {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
Show More
A CSS-only way to support a "Show More…" feature. It requires a container and three children in order:
- state checkbox (must be first)
- target text
- toggle element
.c-show-more--one-line - Truncated text may only be one line tall.
.c-show-more--many-lines - Truncated text may be many lines tall.
Styleguide: Components.ShowMore
*/
@import url("_imports/tools/x-truncate.css");

/* Truncation */

/* Many Lines */
.c-show-more--many-lines .c-show-more__target {
@extend .x-truncate--many-lines;
}
.c-show-more--many-lines .c-show-more__state:checked ~ .c-show-more__target {
@extend .x-untruncate--many-lines;
}

/* One Line */
.c-show-more--one-line .c-show-more__target {
@extend .x-truncate--one-line;
}
.c-show-more--one-line .c-show-more__state:checked ~ .c-show-more__target {
@extend .x-untruncate--one-line;
}

/* Show More / Show Less */

/* State */
.c-show-more__state,
.c-show-more__on-text,
.c-show-more__off-text {
display: none;
}
.c-show-more__state:not(:checked) ~ .c-show-more__toggle .c-show-more__on-text,
.c-show-more__state:checked ~ .c-show-more__toggle .c-show-more__off-text {
display: block;
}

/* Toggle */
.c-show-more__toggle {
cursor: pointer;
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ Styleguide Objects.Section
.o-section--style-dark a {
color: var(--global-color-link-on-dark--normal);
}
.o-section--style-dark h1,
.o-section--style-dark h2,
.o-section--style-dark h3,
.o-section--style-dark h4,
.o-section--style-dark h5,
.o-section--style-dark h6 {
color: var(--global-color-primary--xx-light);
}
/* FAQ: Banners should not touch a border of the following section */
.o-section--style-dark:not(.o-section--banner)
+ .o-section--style-dark:not(.o-section--banner) {
Expand All @@ -110,6 +118,14 @@ Styleguide Objects.Section
.o-section--style-light a {
color: var(--global-color-link-on-light--normal);
}
.o-section--style-light h1,
.o-section--style-light h2,
.o-section--style-light h3,
.o-section--style-light h4,
.o-section--style-light h5,
.o-section--style-light h6 {
color: var(--global-color-primary--xx-dark);
}
/* FAQ: Banners should not touch a border of the following section */
.o-section--style-light:not(.o-section--banner)
+ .o-section--style-light:not(.o-section--banner) {
Expand Down Expand Up @@ -177,8 +193,6 @@ Styleguide Objects.Section

/* Added `.o-section--banner` to require parent modifier class in markup */
.o-section--banner .o-section__banner-image {
position: absolute;
z-index: 1;

/* To size image to cover section dimensions but maintain ratio */
/* CAVEAT: This causes image to overflow beyond section */
Expand All @@ -188,7 +202,9 @@ Styleguide Objects.Section
min-height: 100%;
object-fit: cover;

/* To vertically center image within section */
/* To center image within section */
position: absolute;
z-index: 1;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.icon {
width: 1em;
height: 1em;
font-size: 1.125rem; /* ~18px (16px design * 1.2 design-to-app ratio) (rounded) */
font-size: 1.125em; /* ~18px (16px design * 1.2 design-to-app ratio) (rounded) */
vertical-align: middle;
display: inline-flex; /* `flex` to align `::before`; `inline` to not trigger new line */
/* a modern slimmer alternative to `&::before { display: block; }` */
Expand Down
7 changes: 7 additions & 0 deletions taccsite_cms/static/site_cms/css/src/site.header.docs.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */

/* NOTE: This file exists so User Guide can load header styles only it needs */

/* FAQ: User Guide lacks the vars that _imports/trumps/s-header.css expects */
@import url("_imports/settings/color.css");
@import url("_imports/settings/border.css");
8 changes: 8 additions & 0 deletions taccsite_cms/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,18 @@
<div id="content-wrap" class="o-site__body">
<!-- This block used regardless. -->
{% block content %}

{# To allow extra Container in page structure by hiding extra padding #}
<style type="text/css">
.container > .s-breadcrumbs + .container { padding-inline: 0; }
</style>

{# To wrap breadcrumbs in Container without relying on CMS editor #}
<div class="container">
{% include "nav_cms_breadcrumbs.html" %}
{% placeholder "content" %}
</div>

{% endblock content %}
<!-- End of Block. -->
</div>
Expand Down
5 changes: 1 addition & 4 deletions taccsite_cms/templates/cms_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
<span class="sr-only">Toggle Dropdown</span>
</a>
<div class="dropdown-menu" role="menu" aria-labelledby="navbarDropdown">
{% comment %}
Bootstrap4 does not support submenus, so levels > 1 can't be handled be the main_menu tag and therfore
recursion has been dropped intentionally. Read https://github.com/twbs/bootstrap/pull/6342 for details.
{% endcomment %}
{# Bootstrap4 does not support submenus, so nor do we (and other users). See https://github.com/twbs/bootstrap/pull/6342. #}
{% for grandchild in child.children %}
<a class="dropdown-item{% if grandchild.selected %} active{% endif %}" href="{{ grandchild.attr.redirect_url|default:grandchild.get_absolute_url }}" role="menuitem">
{{ grandchild.get_menu_title|safe }}
Expand Down

0 comments on commit 7245196

Please sign in to comment.