Skip to content

Commit a19f46f

Browse files
committed
Squashed merge of task/GH-83-callout-element of the following:
commit 93d7a0a Author: Wesley Bomar <[email protected]> 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 2b23df8 Merge: 1f2d736 8e4b58e Author: Wesley Bomar <[email protected]> Date: Wed Sep 1 12:53:06 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 8e4b58e Merge: 97f7df0 2aca7e6 Author: W. Bomar <[email protected]> Date: Wed Sep 1 12:10:40 2021 -0500 Merge pull request #278 from TACC/quick/support-plugins-unadulterated-by-bootstrap--for-main commit 1f2d736 Merge: 75a6ece 97f7df0 Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 13:12:42 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 2aca7e6 Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194e Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8 Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0 Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e67 Merge: 7c617af 97f7df0 Author: Wesley Bomar <[email protected]> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df0 Merge: 08e09e7 afa0672 Author: W. Bomar <[email protected]> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa0672 Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec86 Merge: b9f976d 08e09e7 Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7 Merge: e80de90 15cafe8 Author: W. Bomar <[email protected]> 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 15cafe8 Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467c Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 75a6ece Author: Wesley Bomar <[email protected]> Date: Mon Aug 30 09:51:01 2021 -0500 GH-83: Fix: Ensure 0001 taccsite_callout migration See d01c8cf for details. commit 7c617af Merge: 0ddc50a e80de90 Author: Wesley Bomar <[email protected]> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit fa185d0 Author: Wesley Bomar <[email protected]> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f Author: Wesley Bomar <[email protected]> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e2 Author: Wesley Bomar <[email protected]> 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 1a57226 Author: Wesley Bomar <[email protected]> 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 e80de90 Merge: 2689b8b bbef103 Author: W. Bomar <[email protected]> Date: Tue Aug 24 08:40:16 2021 -0500 Merge pull request #326 from TACC/hotfix/GH-75-data-list-field-desc-db-migration commit bbef103 Author: Wesley Bomar <[email protected]> Date: Tue Aug 24 08:15:54 2021 -0500 GH-75: Hotfix: Add missing (small) db migration commit 0ddc50a Merge: d662f24 2689b8b Author: Wesley Bomar <[email protected]> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <[email protected]> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9e Merge: eda34fa 1d50a7b Author: Wesley Bomar <[email protected]> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34fa Merge: 11f735c d0a5151 Author: Wesley Bomar <[email protected]> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c Author: Wesley Bomar <[email protected]> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dc Author: Wesley Bomar <[email protected]> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 7837451 Author: Wesley Bomar <[email protected]> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f Author: Wesley Bomar <[email protected]> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c Author: Wesley Bomar <[email protected]> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin
1 parent 425187f commit a19f46f

File tree

1 file changed

+9
-2
lines changed
  • taccsite_cms/static/site_cms/css/src/_imports/components

1 file changed

+9
-2
lines changed

taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ Styleguide Components.Callout
3737

3838
.c-callout {
3939
display: grid;
40-
41-
padding: 20px;
4240
}
4341
.c-callout--has-figure {
4442
/* See @media queries */
@@ -53,6 +51,10 @@ Styleguide Components.Callout
5351
.c-callout__desc { grid-area: desc; }
5452

5553
@media only screen and (--narrow-and-above) {
54+
.c-callout {
55+
padding: 20px;
56+
text-align: left;
57+
}
5658
.c-callout--has-figure {
5759
grid-template-rows: auto 1fr;
5860
grid-template-columns: auto 1fr;
@@ -66,6 +68,10 @@ Styleguide Components.Callout
6668
}
6769

6870
@media only screen and (--narrow-and-below) {
71+
.c-callout {
72+
padding: 20px 40px;
73+
text-align: center;
74+
}
6975
.c-callout--has-figure {
7076
grid-template-areas:
7177
'figure'
@@ -120,6 +126,7 @@ Styleguide Components.Callout
120126
}
121127
.c-callout__desc {
122128
font-size: var(--global-font-size--large);
129+
font-weight: var(--medium);
123130
color: var(--global-color-primary--xx-light);
124131
}
125132

0 commit comments

Comments
 (0)