diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index e3a42eee3..c0eb7f939 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -10,7 +10,6 @@ - diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css deleted file mode 100644 index 428f829b6..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css +++ /dev/null @@ -1,6 +0,0 @@ -/* TODO: Release TACC/Core-Styles#508. Update Core-CMS then TUP. Remove this… */ -.c-feed-list > :is(div, article) { - /* FAQ: The `flex-grow: 1` makes /use-tacc/training/ lists same height */ - /* CAVEAT: The `flex-grow: 1` breaks max line height (user can see top of next line) */ - flex-grow: unset; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css deleted file mode 100644 index 34a9e3652..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css +++ /dev/null @@ -1,115 +0,0 @@ -/* FAQ: Used on homepage for "User Updates" and "Upcoming Training" */ -/* SEE: https://dev.tup.tacc.utexas.edu/ */ - -/* A list of preview content for articles, documents, or pages. */ - - - -/* Settings */ - -:root { - --global-space--unnamed: 50px; -} - - - -/* Block */ - -.c-feed-list { - display: flex; - flex-direction: column; - - font-size: var(--global-font-size--small); -} - - - -/* Elements */ - -/* Elements: Title */ - -.c-feed-list > :is(h1, h2, h3, h4, h5, h6) { - margin-top: 0; - margin-bottom: 10px; -} - -/* To style "Update" pill in title */ -.c-feed-list .c-pill { - margin-left: 0.5ch; - vertical-align: middle; - transform: translateY(-0.125em); -} - -/* Elements: Items */ - -/* NOTE: `p:has(time)` styles CMS markup, but templates use `time` sans `

` */ - -.c-feed-list > :is(div, article) { - flex-grow: 1; /* to shrink feed title */ - - display: grid; - grid-template-areas: - 'time link' - 'name link' - 'desc link'; - grid-template-columns: 1fr auto; /* to not let short desc make short column */ - - padding-block: 10px; - border-top: var(--global-border-width--normal) solid var(--global-color-primary--dark); -} -.c-feed-list > :is(div, article):last-of-type { - border-bottom: var(--global-border-width--normal) solid var(--global-color-primary--xx-dark); -} -.c-feed-list > :is(div, article) > time, -.c-feed-list > :is(div, article) > p:has(time) { grid-area: time; } -.c-feed-list > :is(div, article) > :is(h1, h2, h3, h4, h5, h6) { grid-area: name; } -.c-feed-list > :is(div, article) > p:not(:has(time, a:only-child)) { grid-area: desc; } -.c-feed-list > :is(div, article) > p:has(a:only-child) { grid-area: link; } - -.c-feed-list > :is(div, article) > :is(h1, h2, h3, h4, h5, h6) { - margin-top: 10px; - margin-bottom: 5px; -} - -/* TODO: Share styles between c-news and c-feed-list (`time:not(…)`) */ -.c-feed-list > :is(div, article) > time:not(:is(h1, h2, h3, h4, h5, h6) *), -.c-feed-list > :is(div, article) > p:has(time):not(:is(h1, h2, h3, h4, h5, h6) *) { - color: var(--global-color-secondary--normal); - font-weight: var(--medium); - text-transform: uppercase; -} -.c-feed-list > :is(div, article) > p:has(time):not(:is(h1, h2, h3, h4, h5, h6) *) { - margin-bottom: unset; -} - -.c-feed-list > :is(div, article) > p:not(:has(time, a:only-child)) { - /* WARNING: Value is guess-n-check; prevents unexplained visibile 3rd line */ - margin-bottom: 1.15rem; - - /* TODO: When migrated to core-styles, use @extend instead */ - /* @extend .x-truncate--many-lines; */ - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - -webkit-line-clamp: var(--lines, 2); -} -.c-feed-list > :is(div, article) > p:has(a:only-child) { - padding-inline: var(--global-space--unnamed); - margin-bottom: unset; - - /* To vertically center content */ - display: flex; - align-items: center; -} - -/* Elements: Link */ - -/* NOTE: `p:has(a:only-child)` is used, but `a:last-child` is desired, but not used until "Link" plugin instance supports an icon before the text. */ - -.c-feed-list > a:last-child, -.c-feed-list > p:has(a:only-child) { - padding-top: 15px; - - font-weight: var(--bold); - font-size: var(--global-font-size--medium) -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css index 95c2219cb..a840366c3 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css @@ -24,11 +24,11 @@ .c-news--read .c-news__header { grid-template-areas: - 'head' - 'subh' - 'cats' - 'tags' - 'attr'; + 'head head' + 'subh subh' + 'cats link' + 'tags tags' + 'attr attr'; } .c-news--read .c-news__title, .c-news--read .c-news__subtitle { diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css index da88e8341..33535d75f 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css @@ -105,7 +105,7 @@ } /* To style tags as "pills" (the UI pattern) */ -.c-news__tags .tags a { +.c-news__tags a { /* TODO: When available in Core-Styles, uncomment this */ /* @extend :--c-pill; */ diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 661def38b..f586393ea 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -14,7 +14,6 @@ /* … */ /* COMPONENTS */ -@import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); /* TRUMPS */