fix(tup-231): move some core-styles back to core-cms #17

wesleyboar · 2022-04-28T17:45:28Z

Overview / Changes

Move back CMS-specific styles from Core-Styles repo to Core-CMS repo.

Background

I moved all styles from Core-CMS to Core-Styles. That included some CMS-specific styles. Now I bring them back to CMS.

Also, better documented current¹ state of <tacc-search-bar>.

Screenshots

N/A

Testing

See TACC/Core-CMS#482.

State changes (improves) via https://github.com/TACC/Core-CMS/issues/101. ↩

Some Core-CMS styles were in Core-Styles repo, because I moved too much. Cause: "FP-1496: CSS Build to Core-Styles" (v3.6.0 Core-Styles)

…-repo

source/_imports/components/c-image-map.css

…-repo

…ithub.com:TACC/Core-Styles into task/TUP-231-cms-css-from-styles-repo-to-cms-repo

source/_imports/elements/tacc-search-bar.md

wesleyboar

notes for reviewers

wesleyboar · 2022-04-28T18:54:56Z

source/_imports/components/django.cms.blog.css

-/*
-Django CMS Blog Components
-
-Components for [Django CMS Blog](https://djangocms-blog.readthedocs.io) UI. These classes are authored in templates of third-party origin, but they have no third-party styles.
-
-Reference:
-
- [Django CMS Blog `.blog-` Class Components](https://github.com/TACC/CORE-cms/tree/main/taccsite_cms/templates/djangocms_blog)
-
-Styleguide Components.DjangoCMS.Blog
-*/


(copied entire file to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:55:21Z

source/_imports/components/django.cms.css

-/*
-Django CMS Components
-
-Components for [Django CMS](https://www.django-cms.org/) UI. No examples
-are provided, because the markup is dynamically generated by a third-party.
-
-Reference:
-
- [Django CMS `.cms-` Class Components](https://github.com/divio/django-cms/tree/release/3.6.x/cms/static/cms/sass/components)
-
-Styleguide Components.DjangoCMS
-*/
-
-/* Prevent excess scrollbar when logged into Django CMS */
-/* NOTE: This code does NOT work */
-/*
-.cms-ready body {
- /* FAQ: CMS dynamically adds `margin-top` to `head` to fit toolbar height *\/
- /* WARNING: If the dynamic(!) header margin changes, then so should this *\/
- /* RFC: Consider creating JavaScript snippet (via CMS?) to solve this *\/
- height: calc(100vh - env(--cms-toolbar-height));
-}
-*/
-
-/* Prevent anchor links from scrolling behind Django CMS header */
-.cms-ready :target {
- scroll-margin-top: env(--cms-toolbar-height);
-}
-
-/* Prevent top-sticking content from scrolling behind Django CMS header */
-.cms-ready .sticky-top /* Bootstrap class */,
-.cms-ready .position-sticky.fixed-top /* Bootstrap class */ {
- top: env(--cms-toolbar-height);
-}


(copied entire file to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:55:34Z

source/_imports/components/django.cms.post.css

-/*
-Django CMS Blog Post Components
-
-Components for [Django CMS Blog Post](https://djangocms-blog.readthedocs.io) UI. These classes are authored in templates of third-party origin, and expanded by us, but they have no third-party styles.
-
-Reference:
-
- [Django CMS Blog `.post-` Class Components](https://github.com/TACC/CORE-cms/tree/main/taccsite_cms/templates/djangocms_blog)
-
-Styleguide Components.DjangoCMS.Post
-*/


(copied entire file to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:56:08Z

source/_imports/generics/fonts.css

-/*
-Fonts
-
-Load standard fonts for a TACC website.
-
-Usage:
- ```
- .something {
- // BentonSans-MediumItalic
- font-family: 'Benton Sans';
- font-weight: 500;
- font-style: italic;
- }
- ```
-
-Reference:
- [Keep Font CSS Simple](https://www.456bereastreet.com/archive/201012/font-face_tip_define_font-weight_and_font-style_to_keep_your_css_simple/)
- [font-weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight)
- [Shared UI - Constants - Font](https://confluence.tacc.utexas.edu/x/cYAZCg)
-
-Styleguide Generics.Fonts
-*/
-
-@font-face {
- font-family: 'Benton Sans';
- src: url("/static/frontera-cms/fonts/archive/BentonSans-Regular.otf") format("opentype");
- font-weight: 400;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'Benton Sans';
- src: url("/static/frontera-cms/fonts/archive/BentonSans-Bold.otf") format("opentype");
- font-weight: 700;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'Benton Sans';
- src: url("/static/frontera-cms/fonts/archive/BentonSans-Medium.otf") format("opentype");
- font-weight: 500;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'Benton Sans';
- src: url("/static/frontera-cms/fonts/archive/BentonSans-MediumItalic.otf") format("opentype");
- font-weight: 500;
- font-style: italic;
- font-display: swap;
-}


(copied entire file to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:57:29Z

source/_imports/settings/color.css

-
- /* Distinct Hues */
-
- /* FAQ: This placeholder accent color came from Portal */
- /* CAVEAT: A standard accent color definition is pending more designs */
- /* NOTE: The new Frontera and TACC designs both have brown and blue accents */
- --global-color-accent--normal: #877453;
-
- /* CAVEAT: Not accessible within paragraph text (edge case as of 2021-08) */
- --global-color-link-on-light--normal: #003399;
- /* WARNING: This color is from Dev not Design (not rendered as of 2021-08) */
- --global-color-link-on-dark--normal: #0088FF;


(copied these CMS-only properties to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:57:50Z

source/_imports/settings/font.css

-
-
-
- /* Family */
-
- --global-font-family--sans: "Benton Sans", "Roboto", sans-serif;
- --global-font-family--serif: Times, sans-serif;
- --global-font-family--mono: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
-
- --global-font-family: var(--global-font-family--sans);
-
- /* Family: Overwrite Boostrap */
-
- --font-family-sans-serif: var(--global-font-family--sans);
- /* CAVEAT: Ineffectual for <code>, <kbd>, <pre>, <samp> */
- --font-family-monospace: var(--global-font-family--mono);
-
-
-


(copied these CMS-only properties to TACC/Core-CMS:/...)

wesleyboar · 2022-04-28T18:57:59Z

source/_imports/settings/space.css

@@ -32,5 +32,4 @@ Styleguide Settings.CustomProperties.Space

 --global-space--list-indent: 40px; /* browser default (Firefox, Edge) */
 --global-space--grid-gap: 15px; /* Bootstrap `.container` & `.row` */
- --global-space--hr-margin: 30px; /* constant unit allows consistency */


(copied this CMS-only properties to TACC/Core-CMS:/...)

taoteg

LGTM.

…-repo

wesleyboar · 2022-05-03T19:34:55Z

Merged in main. Went smooth. Merging because this and Core-CMS PR are approved.

wesleyboar added 2 commits April 28, 2022 12:43

TUP-231: Move CMS CSS from Core Styles to Core CMS

834c62b

Some Core-CMS styles were in Core-Styles repo, because I moved too much. Cause: "FP-1496: CSS Build to Core-Styles" (v3.6.0 Core-Styles)

Merge branch 'main' into task/TUP-231-cms-css-from-styles-repo-to-cms…

4ee56c6

…-repo

wesleyboar mentioned this pull request Apr 28, 2022

TUP-231: Part 1 of N to Core-UI (Fix Core-CMS / Core-Styles Mismatch) TACC/Core-CMS#482

Merged

Merge branch 'main' into task/TUP-231-cms-css-from-styles-repo-to-cms…

53bc28c

…-repo

wesleyboar commented Apr 28, 2022

View reviewed changes

source/_imports/components/c-image-map.css Outdated Show resolved Hide resolved

wesleyboar and others added 4 commits April 28, 2022 13:31

chore(tup-231): revert comment tweak

ba1c4e8

Merge branch 'main' into task/TUP-231-cms-css-from-styles-repo-to-cms…

fdb8b27

…-repo

Merge branch 'task/TUP-231-cms-css-from-styles-repo-to-cms-repo' of g…

fbb71ea

…ithub.com:TACC/Core-Styles into task/TUP-231-cms-css-from-styles-repo-to-cms-repo

fix(tup-231): restore deleted file

4039446

wesleyboar force-pushed the task/TUP-231-cms-css-from-styles-repo-to-cms-repo branch from c6f6e73 to 4039446 Compare April 28, 2022 18:38

fix(tup-231): move tacc-search-bar.html to trumps

9083169

wesleyboar commented Apr 28, 2022

View reviewed changes

source/_imports/elements/tacc-search-bar.md Outdated Show resolved Hide resolved

wesleyboar commented Apr 28, 2022

View reviewed changes

source/_imports/elements/tacc-search-bar.md Outdated Show resolved Hide resolved

wesleyboar and others added 3 commits April 28, 2022 13:51

fix(tup-231): revert unnecessarily editted files

2287e70

docs(tup-231): better tacc-search-bar.md wording

0b55a86

chore(tup-231): delete excess new lines

67ebbb8

wesleyboar force-pushed the task/TUP-231-cms-css-from-styles-repo-to-cms-repo branch from 29bc1ac to 67ebbb8 Compare April 28, 2022 18:52

wesleyboar commented Apr 28, 2022

View reviewed changes

wesleyboar changed the title ~~TUP-231: Move CMS CSS from Core Styles to Core CMS~~ TUP-231: (Part 1 of N) Move CMS CSS from Core Styles to Core CMS Apr 28, 2022

wesleyboar requested review from rstijerina and taoteg April 28, 2022 23:25

wesleyboar changed the title ~~TUP-231: (Part 1 of N) Move CMS CSS from Core Styles to Core CMS~~ TUP-231: Part 1 of N toward Core-UI (Core-CMS / Core-Styles Accuracy) Apr 28, 2022

wesleyboar changed the title ~~TUP-231: Part 1 of N toward Core-UI (Core-CMS / Core-Styles Accuracy)~~ TUP-231: Part 1 of N toward Core-UI (Fix Core-CMS / Core-Styles Inaccuracy) Apr 28, 2022

wesleyboar marked this pull request as ready for review April 28, 2022 23:31

wesleyboar changed the title ~~TUP-231: Part 1 of N toward Core-UI (Fix Core-CMS / Core-Styles Inaccuracy)~~ TUP-231: Part 1 of N to Core-UI (Fix Core-CMS / Core-Styles Inaccuracy) Apr 29, 2022

wesleyboar changed the title ~~TUP-231: Part 1 of N to Core-UI (Fix Core-CMS / Core-Styles Inaccuracy)~~ TUP-231: Part 1 of N to Core-UI (Fix Core-CMS / Core-Styles Mismatch) Apr 29, 2022

docs(tacc-search-bar): battle GitHub markdown

db52973

taoteg approved these changes May 2, 2022

View reviewed changes

Merge branch 'main' into task/TUP-231-cms-css-from-styles-repo-to-cms…

faafdb9

…-repo

wesleyboar merged commit 6c3a984 into main May 3, 2022

wesleyboar deleted the task/TUP-231-cms-css-from-styles-repo-to-cms-repo branch May 3, 2022 19:35

wesleyboar changed the title ~~TUP-231: Part 1 of N to Core-UI (Fix Core-CMS / Core-Styles Mismatch)~~ fix(tup-231): move some core-styles back to core-cms May 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(tup-231): move some core-styles back to core-cms #17

fix(tup-231): move some core-styles back to core-cms #17

wesleyboar commented Apr 28, 2022 •

edited

Loading

wesleyboar left a comment

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

wesleyboar Apr 28, 2022

taoteg left a comment

wesleyboar commented May 3, 2022

fix(tup-231): move some core-styles back to core-cms #17

fix(tup-231): move some core-styles back to core-cms #17

Conversation

wesleyboar commented Apr 28, 2022 • edited Loading

Overview / Changes

Related

Screenshots

Testing

Footnotes

wesleyboar left a comment

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

wesleyboar Apr 28, 2022

Choose a reason for hiding this comment

taoteg left a comment

Choose a reason for hiding this comment

wesleyboar commented May 3, 2022

wesleyboar commented Apr 28, 2022 •

edited

Loading