Skip to content

Commit

Permalink
Squashed merge of task/GH-83-callout-element of the following:
Browse files Browse the repository at this point in the history 
commit 93d7a0a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
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 <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 1f2d736
Merge: 75a6ece 97f7df0
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 13:12:42 2021 -0500

    Merge branch 'main' into task/GH-83-callout-element

commit 2aca7e6
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 13:01:15 2021 -0500

    Quick: Mark Bootstrap Link & Image as Depreacted

commit 884194e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 10:58:58 2021 -0500

    Quick: More Comments

commit 31e9da8
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 09:53:25 2021 -0500

    Quick: Explain Try/Catch for Plugin Restoration

commit 7c2f78a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 09:44:28 2021 -0500

    Quick: Better Comments Restoring Generic Plugins

commit 9d018e0
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 09:35:14 2021 -0500

    Quick: Fix Support for Unadulterated Link Plugin

commit 9cf1e67
Merge: 7c617af 97f7df0
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <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 afa0672
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 20:33:44 2021 -0500

    Quick: Update submod → main. Drop Frontera changes

commit 735ec86
Merge: b9f976d 08e09e7
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <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 15cafe8
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 17:40:13 2021 -0500

    Quick: Update submod (ProTX secrets delta)

commit b9f976d
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 15:10:01 2021 -0500

    GH-331: Frontera: Remove now-superfluous comment

commit 2be0bff
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 13:00:58 2021 -0500

    GH-331: Frontera: Load via static, not staticfiles

commit b54467c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 11:49:39 2021 -0500

    GH-331: Frontera: Cleanup Templates & Add Standard

commit 0c4a38f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 11:38:41 2021 -0500

    GH-331: Remove "Full Width" template cruft

commit e60ba1d
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 30 11:38:07 2021 -0500

    GH-331: Rename "Fullwidth" to "Full Width"

commit 75a6ece
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 15:04:29 2021 -0500

    GH-83/GH-321: Show image on narrow windows

commit 66eae8f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 13:35:59 2021 -0500

    GH-321: Fix figure size and note about its resize

commit a7134e2
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
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 5059e02
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 10:07:26 2021 -0500

    GH-83: Require all fields (can't require image)

commit a07957e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 09:48:21 2021 -0500

    GH-83: Add two relevant docs from PR #280

    SEE: #280
    SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/

commit 7ffceeb
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 9767d45
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 acefadf
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 08:10:57 2021 -0500

    GH-83/GH-321: Add missing static template tag load

commit d59c3f6
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 08:07:24 2021 -0500

    GH-83: Squash migrations. Accept GH-321
     as part of GH-83.

commit df1060b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 24 08:01:27 2021 -0500

    GH-83: Add missing helper clean_for_abstract_link

commit 51d3f1d
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 ed0e749
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 20:24:45 2021 -0500

    Quick: Add x-article-link-active mixin

commit 0ddc50a
Merge: d662f24 2689b8b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 18:20:09 2021 -0500

    Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main

commit 1266e4e
Merge: 54fc04a 2689b8b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 18:18:48 2021 -0500

    Merge branch 'main' into task/GH-83-callout-element

commit 54fc04a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 14:05:36 2021 -0500

    GH-83: Quick: Remove temp snippet

commit c24e0f9
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 13:30:29 2021 -0500

    GH-83: Noop: Add markup whitespace for legibility

commit dba3f4b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 23 13:03:37 2021 -0500

    GH-83: Remove leftover templates

commit a15e585
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 20 19:50:15 2021 -0500

    GH-83: Fix Callout Plugin, Update Styles to Match

commit 4fa354c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 20 19:09:41 2021 -0500

    GH-83: Fix Callout Component after Plugin's tweaks

commit c15d766
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 20 18:53:49 2021 -0500

    GH-83: WIP: Callout Plugin

commit c2c96ec
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 20 18:15:25 2021 -0500

    GH-83: Temp: Callout Snippet (Frontera)

commit 82b768f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 20 18:15:02 2021 -0500

    GH-83: Callout Component

commit d662f24
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 6bb1f9e
Merge: eda34fa 1d50a7b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
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 <wbomar@tacc.utexas.edu>
Date:   Fri Jun 25 15:59:59 2021 -0500

    Quick: Improve import caveat comments

commit fe181dc
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jun 25 15:56:21 2021 -0500

    Quick: Support Unadulterated PicturePlugin

commit 7837451
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jun 25 15:52:13 2021 -0500

    Quick: Tweak desc of bootstrap4_djangocms_link

commit 815c68f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jun 25 15:46:03 2021 -0500

    Quick: Move Install Line of Unadulaterated Plugin

commit 520f44c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jun 25 15:45:25 2021 -0500

    Quick: Support Unadulterated LinkPlugin
  • Loading branch information
@wesleyboar
wesleyboar committed Sep 1, 2021
1 parent 0e26b59 commit a6f54a1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
11 changes: 9 additions & 2 deletions taccsite_cms/static/site_cms/css/src/_imports/components/c-callout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ Styleguide Components.Callout

.c-callout {
display: grid;

padding: 20px;
}
.c-callout--has-figure {
/* See @media queries */
Expand All @@ -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;
Expand All @@ -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'
Expand Down Expand Up @@ -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);
}

Expand Down
5 changes: 5 additions & 0 deletions taccsite_cms/static/site_cms/css/src/_imports/tools/x-article-link.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

0 comments on commit a6f54a1

Please sign in to comment.