From a6f54a1208c543992878e2ab44c4ecb88ea08325 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 1 Sep 2021 13:45:27 -0500 Subject: [PATCH] Squashed merge of task/GH-83-callout-element of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 93d7a0abeb3a78f92b5ff8a8d3bcb0aa888bc83d Author: Wesley Bomar Date: Wed Sep 1 13:35:03 2021 -0500 GH-83: Style Tweask to Match Design - Different padding for narrow screens. - Different text alignment for narrow screens. - Bolder font for descriptions. commit 2b23df8b6cabf91200205e06675afdf09120b4f3 Merge: 1f2d736 8e4b58e Author: Wesley Bomar Date: Wed Sep 1 12:53:06 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 8e4b58e3b2e7f3108a722d91350d477532fb8a11 Merge: 97f7df0 2aca7e6 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Wed Sep 1 12:10:40 2021 -0500 Merge pull request #278 from TACC/quick/support-plugins-unadulterated-by-bootstrap--for-main commit 1f2d736131fc40a706c31026c613cfe053501f48 Merge: 75a6ece 97f7df0 Author: Wesley Bomar Date: Tue Aug 31 13:12:42 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 75a6ecebd1e9cc68626885f427422b060c67b3db Author: Wesley Bomar Date: Mon Aug 30 09:51:01 2021 -0500 GH-83: Fix: Ensure 0001 taccsite_callout migration See d01c8cf for details. commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin --- .../css/src/_imports/components/c-callout.css | 11 +++++++++-- .../css/src/_imports/tools/x-article-link.css | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css b/taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css index 2b167c41d..c933e898b 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css @@ -37,8 +37,6 @@ Styleguide Components.Callout .c-callout { display: grid; - - padding: 20px; } .c-callout--has-figure { /* See @media queries */ @@ -53,6 +51,10 @@ Styleguide Components.Callout .c-callout__desc { grid-area: desc; } @media only screen and (--narrow-and-above) { + .c-callout { + padding: 20px; + text-align: left; + } .c-callout--has-figure { grid-template-rows: auto 1fr; grid-template-columns: auto 1fr; @@ -66,6 +68,10 @@ Styleguide Components.Callout } @media only screen and (--narrow-and-below) { + .c-callout { + padding: 20px 40px; + text-align: center; + } .c-callout--has-figure { grid-template-areas: 'figure' @@ -120,6 +126,7 @@ Styleguide Components.Callout } .c-callout__desc { font-size: var(--global-font-size--large); + font-weight: var(--medium); color: var(--global-color-primary--xx-light); } diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-article-link.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-article-link.css index 986b236ac..9ed9c334b 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-article-link.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-article-link.css @@ -43,3 +43,8 @@ Styleguide Tools.ExtendsAndMixins.ArticleLink %x-article-link-active { outline: 1px dotted var(--global-color-accent--normal); } + +/* To give link active state feedback */ +%x-article-link-active { + outline: 1px dotted var(--global-color-accent--normal); +}