From 277e2b8c6c88071ad13db4e59afe72fc0329c1e2 Mon Sep 17 00:00:00 2001 From: FredericoAndrade Date: Mon, 2 Dec 2024 18:28:02 +0100 Subject: [PATCH] cleanup header and subheader style, added newsletter to single careers page, made FAQs in success page admin-defined. --- .../includes/render_gallery_items.php | 3 +- wp-content/plugins/wt-gallery/wt-gallery.php | 1 - .../acf-json/group_66c31ce4f23ac.json | 90 ++++++++++++++- .../acf-json/group_66f52c6b91b45.json | 108 ------------------ .../includes/events-filter.php | 1 - .../modules/main-content--archive-success.php | 43 ++++--- .../blankslate-child/single-careers.php | 1 + .../themes/blankslate-child/stylus/main.css | 102 +++++++++++------ .../stylus/require/2024-fundraiser.styl | 13 +-- .../blankslate-child/stylus/require/404.styl | 3 +- .../stylus/require/archive-success.styl | 44 ++++--- .../stylus/require/careers.styl | 2 +- .../stylus/require/gallery.styl | 1 + .../stylus/require/global.styl | 6 + .../stylus/require/header.styl | 7 ++ .../stylus/require/template-events-page.styl | 27 ++--- .../stylus/require/template-faq-page.styl | 1 + .../template-archive-success.php | 5 +- 18 files changed, 245 insertions(+), 213 deletions(-) delete mode 100644 wp-content/themes/blankslate-child/acf-json/group_66f52c6b91b45.json diff --git a/wp-content/plugins/wt-gallery/includes/render_gallery_items.php b/wp-content/plugins/wt-gallery/includes/render_gallery_items.php index 0f38f6b7..bd800539 100644 --- a/wp-content/plugins/wt-gallery/includes/render_gallery_items.php +++ b/wp-content/plugins/wt-gallery/includes/render_gallery_items.php @@ -32,7 +32,8 @@ function render_gallery_items($query, $atts, $gallery_id, $paged, $data_attribut wp_reset_postdata(); - return ob_get_clean(); + $output = ob_get_clean(); + return $output; } function generate_gallery_pagination($query, $gallery_id, $paged) { diff --git a/wp-content/plugins/wt-gallery/wt-gallery.php b/wp-content/plugins/wt-gallery/wt-gallery.php index 0b8c85ab..81e6aeb5 100644 --- a/wp-content/plugins/wt-gallery/wt-gallery.php +++ b/wp-content/plugins/wt-gallery/wt-gallery.php @@ -157,7 +157,6 @@ function custom_gallery($atts) { $output = '
'; - // Set up title if ($query->have_posts()) { if ($atts['title']) { $output .= '

'.$atts['title'].'

'; diff --git a/wp-content/themes/blankslate-child/acf-json/group_66c31ce4f23ac.json b/wp-content/themes/blankslate-child/acf-json/group_66c31ce4f23ac.json index 17d25df1..8d5b0a4d 100644 --- a/wp-content/themes/blankslate-child/acf-json/group_66c31ce4f23ac.json +++ b/wp-content/themes/blankslate-child/acf-json/group_66c31ce4f23ac.json @@ -174,12 +174,98 @@ "bidirectional_target": [] } ] + }, + { + "key": "field_674b0e404f609", + "label": "Custom FAQ posts", + "name": "custom_faq_posts", + "aria-label": "", + "type": "group", + "instructions": "", + "required": 0, + "conditional_logic": 0, + "wrapper": { + "width": "", + "class": "", + "id": "" + }, + "layout": "block", + "sub_fields": [ + { + "key": "field_674b1039182a8", + "label": "Custom Gallery ID", + "name": "custom_gallery_id", + "aria-label": "", + "type": "text", + "instructions": "", + "required": 0, + "conditional_logic": 0, + "wrapper": { + "width": "", + "class": "", + "id": "" + }, + "default_value": "", + "maxlength": "", + "placeholder": "", + "prepend": "", + "append": "" + }, + { + "key": "field_674b1040182a9", + "label": "Custom Gallery Title", + "name": "custom_gallery_title", + "aria-label": "", + "type": "text", + "instructions": "", + "required": 0, + "conditional_logic": 0, + "wrapper": { + "width": "", + "class": "", + "id": "" + }, + "default_value": "", + "maxlength": "", + "placeholder": "", + "prepend": "", + "append": "" + }, + { + "key": "field_674b1045182aa", + "label": "Custom Gallery Post", + "name": "custom_gallery_post", + "aria-label": "", + "type": "post_object", + "instructions": "", + "required": 0, + "conditional_logic": 0, + "wrapper": { + "width": "", + "class": "", + "id": "" + }, + "post_type": [ + "faq" + ], + "post_status": [ + "publish" + ], + "taxonomy": "", + "return_format": "object", + "multiple": 1, + "allow_null": 0, + "bidirectional": 0, + "ui": 1, + "bidirectional_target": [] + } + ] } ], "location": [ [ { - "param": "post_template", + "param": "page_template", "operator": "==", "value": "template-archive-success.php" } @@ -194,5 +280,5 @@ "active": true, "description": "", "show_in_rest": 0, - "modified": 1727352801 + "modified": 1732980478 } diff --git a/wp-content/themes/blankslate-child/acf-json/group_66f52c6b91b45.json b/wp-content/themes/blankslate-child/acf-json/group_66f52c6b91b45.json deleted file mode 100644 index 15aef804..00000000 --- a/wp-content/themes/blankslate-child/acf-json/group_66f52c6b91b45.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "key": "group_66f52c6b91b45", - "title": "Post type: FAQ", - "fields": [ - { - "key": "field_66f52c6b1e9c8", - "label": "Short Answer", - "name": "short_answer", - "aria-label": "", - "type": "wysiwyg", - "instructions": "", - "required": 0, - "conditional_logic": 0, - "wrapper": { - "width": "", - "class": "", - "id": "" - }, - "default_value": "", - "tabs": "all", - "toolbar": "full", - "media_upload": 1, - "delay": 0 - }, - { - "key": "field_66f52cabc07c9", - "label": "Related Links", - "name": "related_links", - "aria-label": "", - "type": "repeater", - "instructions": "", - "required": 0, - "conditional_logic": 0, - "wrapper": { - "width": "", - "class": "", - "id": "" - }, - "layout": "table", - "pagination": 0, - "min": 0, - "max": 0, - "collapsed": "", - "button_label": "Add Row", - "rows_per_page": 20, - "sub_fields": [ - { - "key": "field_66f52cb9c07ca", - "label": "Link Text", - "name": "link_text", - "aria-label": "", - "type": "text", - "instructions": "", - "required": 0, - "conditional_logic": 0, - "wrapper": { - "width": "", - "class": "", - "id": "" - }, - "default_value": "", - "maxlength": "", - "placeholder": "", - "prepend": "", - "append": "", - "parent_repeater": "field_66f52cabc07c9" - }, - { - "key": "field_66f52cbec07cb", - "label": "URL", - "name": "url", - "aria-label": "", - "type": "url", - "instructions": "", - "required": 0, - "conditional_logic": 0, - "wrapper": { - "width": "", - "class": "", - "id": "" - }, - "default_value": "", - "placeholder": "", - "parent_repeater": "field_66f52cabc07c9" - } - ] - } - ], - "location": [ - [ - { - "param": "post_type", - "operator": "==", - "value": "faq" - } - ] - ], - "menu_order": 0, - "position": "normal", - "style": "default", - "label_placement": "top", - "instruction_placement": "label", - "hide_on_screen": "", - "active": true, - "description": "", - "show_in_rest": 0, - "modified": 1727345566 -} diff --git a/wp-content/themes/blankslate-child/includes/events-filter.php b/wp-content/themes/blankslate-child/includes/events-filter.php index 3ade4286..a70922e8 100644 --- a/wp-content/themes/blankslate-child/includes/events-filter.php +++ b/wp-content/themes/blankslate-child/includes/events-filter.php @@ -14,7 +14,6 @@ function format_event_date_with_proximity($date_string) { elseif ($days_difference < 0) $proximity = " Last $day_of_week, "; else $proximity = " Today, "; } - return $proximity . $event_date->format('j F Y, gA'); } diff --git a/wp-content/themes/blankslate-child/modules/main-content--archive-success.php b/wp-content/themes/blankslate-child/modules/main-content--archive-success.php index cf7ec382..e46113a1 100644 --- a/wp-content/themes/blankslate-child/modules/main-content--archive-success.php +++ b/wp-content/themes/blankslate-child/modules/main-content--archive-success.php @@ -1,17 +1,26 @@ -
-

Frequently Asked Questions

-
-
-

When will my video by available on the website?
- We typically archive videos within one week of submission. You will receive an email when your video has been archived. After that, your video should be viewable on the website within 24-48 hours!

-
-
-

Will my video by published on YouTube?
- All videos are added to our website, but not all are added to our YouTube channel. We prioritize videos that have good audio quality and limited background noise.

-
-
-

Can I change my video information after submission?
- Yes, if you would like to change your licensing selection or submit subtitles for your video, please send us an email at hello@wikitongues.org.

-
-
-
\ No newline at end of file +'; + echo '

Frequently Asked Questions

'; + echo ''; + echo '
'; +} +?> \ No newline at end of file diff --git a/wp-content/themes/blankslate-child/single-careers.php b/wp-content/themes/blankslate-child/single-careers.php index e35990f8..3df175d8 100644 --- a/wp-content/themes/blankslate-child/single-careers.php +++ b/wp-content/themes/blankslate-child/single-careers.php @@ -71,4 +71,5 @@ endwhile; endif; +include('modules/newsletter.php'); get_footer(); diff --git a/wp-content/themes/blankslate-child/stylus/main.css b/wp-content/themes/blankslate-child/stylus/main.css index add261d5..3b1f0cdb 100644 --- a/wp-content/themes/blankslate-child/stylus/main.css +++ b/wp-content/themes/blankslate-child/stylus/main.css @@ -210,6 +210,13 @@ body.logged-in[data-alert="true"] .wt_header { .wt_header__logo { flex-grow: initial; } +.wt_header__logo a { + display: inline-block; + padding: 0; +} +.wt_header__logo a:hover { + background: none; +} .wt_header__logo--light { display: none; } @@ -1468,32 +1475,43 @@ body.search-results .wt_header__nav>ul>li:first-of-type:hover .sub-menu { .wt_archive__faq { display: flex; flex-direction: column; + max-width: 1140px; + margin: 0 auto; } .wt_archive__faq h1 { - margin: 0 auto 6rem; + margin: 0 auto 2.4rem; width: 100%; - max-width: 600px; font-style: normal; font-stretch: normal; color: #101010; font-family: 'Schnyder Wide M Web'; font-weight: 300; - font-size: 6.08rem; - font-size: 4.9rem; - text-align: center; + font-size: 3.2rem; } -.wt_archive__faq section { +.wt_archive__faq h2 { + font-style: normal; + font-stretch: normal; + color: #101010; + font-family: 'Graphik Web'; + font-weight: 700; + font-size: 1.6rem; + line-height: 1.3; + text-align: left; + margin: 0; +} +.wt_archive__faq ul { width: 100%; max-width: 1140px; margin: 0 auto 3rem; column-count: 3; column-gap: 16px; } -.wt_archive__faq section article { +.wt_archive__faq ul li { float: left; width: 100%; + list-style-type: none; } -.wt_archive__faq section article p { +.wt_archive__faq ul li p { margin: 0 auto 3rem; width: 100%; max-width: 600px; @@ -1505,7 +1523,7 @@ body.search-results .wt_header__nav>ul>li:first-of-type:hover .sub-menu { font-size: 1.6rem; line-height: 1.3; } -.wt_archive__faq section article p strong { +.wt_archive__faq ul li p strong { font-style: normal; font-stretch: normal; color: #101010; @@ -1516,7 +1534,7 @@ body.search-results .wt_header__nav>ul>li:first-of-type:hover .sub-menu { min-height: 3.3em; display: inline-block; } -.wt_archive__faq section article p a { +.wt_archive__faq ul li p a { font-style: normal; font-stretch: normal; color: #3814a5; @@ -1530,12 +1548,12 @@ body.search-results .wt_header__nav>ul>li:first-of-type:hover .sub-menu { margin: -2px -4px; border-radius: 4px; } -.wt_archive__faq section article p a:hover { +.wt_archive__faq ul li p a:hover { background: #d4cce0; mix-blend-mode: darken; } -h1.success_cta { - margin: 12rem auto; +div.success_cta h1 { + margin: 12rem auto 0; width: 100%; max-width: 1140px; font-style: normal; @@ -1547,14 +1565,25 @@ h1.success_cta { text-align: center; font-size: 4.9rem; } -h1.success_cta a { +div.success_cta h2 { + font-style: normal; + font-stretch: normal; + color: #101010; + font-family: 'Schnyder Wide M Web'; + font-weight: 300; + font-size: 3.2rem; + margin: 0 auto 12rem; + width: 100%; + text-align: center; +} +div.success_cta h2 a { text-decoration: none; color: #3814a5; padding: 4px 8px; margin: -4px -8px; border-radius: 8px; } -h1.success_cta a:hover { +div.success_cta h2 a:hover { background: #d4cce0; mix-blend-mode: darken; } @@ -2879,6 +2908,7 @@ text font-weight: 300; font-size: 6.08rem; font-size: 3rem; + text-align: left; margin: 1.6rem 0; padding-bottom: 1rem; border-bottom: 2px solid #d4cce0; @@ -3104,41 +3134,40 @@ text font-style: normal; font-stretch: normal; color: #101010; - font-family: 'Graphik Web'; - font-weight: 700; - font-size: 1.6rem; - line-height: 1.3; + font-family: 'Schnyder Wide M Web'; + font-weight: 300; + font-size: 6.08rem; + font-size: 2.6rem; } .page-template-events-page .event-list .event-entry h3, -.page-template-events-page .event-list .event-entry p { - margin-bottom: 16px; +.page-template-events-page .event-list .event-entry .event-details { + margin-bottom: 8px; } .page-template-events-page .event-list .event-entry .event-details { + margin-left: 1.6rem; display: inline-block; } .page-template-events-page .event-list .event-entry .event-details p { float: left; + color: #6f6f6f; } .page-template-events-page .event-list .event-entry .event-details p:first-of-type { - margin-right: 1.6em; + margin-right: 1.6rem; } .page-template-events-page .event-list .event-entry .event-description { - margin-left: 1.6em; + margin-left: 1.6rem; } .page-template-events-page .event-list .event-entry a { + display: inline-block; text-decoration: none; - font-weight: bold; - color: #3814a5; -} -.page-template-events-page .event-list .event-entry:hover { - background: #d4cce0; - color: #3814a5; -} -.page-template-events-page .event-list .event-entry:hover h3 { color: #3814a5; + padding: 8px 12px; + margin: 4px 0px; + border-radius: 4px; } .page-template-events-page .event-list .event-entry:hover a { - color: #3814a5; + background: #3814a5; + color: #fffcef; } @media (max-width: 768px) { .page-template-events-page .event-list .event-entry { @@ -3156,8 +3185,7 @@ text color: #101010; font-family: 'Schnyder Wide M Web'; font-weight: 300; - font-size: 6.08rem; - font-size: 4rem; + font-size: 3.2rem; margin-bottom: 1.6rem; } .page-template-template-giving-campaign-24 .content p { @@ -3603,8 +3631,7 @@ text color: #101010; font-family: 'Schnyder Wide M Web'; font-weight: 300; - font-size: 6.08rem; - font-size: 3rem; + font-size: 3.2rem; margin-bottom: 1.5rem; } #page-404 a { @@ -3654,6 +3681,7 @@ text font-weight: 700; font-size: 1.6rem; line-height: 1.3; + text-align: left; margin-bottom: 1.5rem; border-bottom: 2px solid #d4cce0; padding-bottom: 12px; @@ -4128,7 +4156,7 @@ text } .career-post { max-width: 1140px; - margin: 89px auto 0; + margin: 58px auto 0; padding: 4.8rem 0; } .career-post h1 { diff --git a/wp-content/themes/blankslate-child/stylus/require/2024-fundraiser.styl b/wp-content/themes/blankslate-child/stylus/require/2024-fundraiser.styl index c3771758..b9cbf3f8 100644 --- a/wp-content/themes/blankslate-child/stylus/require/2024-fundraiser.styl +++ b/wp-content/themes/blankslate-child/stylus/require/2024-fundraiser.styl @@ -5,8 +5,7 @@ $aspect-ratio = 1.185185185 margin 0 auto 64px h1 - text--header($black) - font-size 4rem + text--subheader($black) margin-bottom 1.6rem p @@ -126,12 +125,4 @@ $aspect-ratio = 1.185185185 border-bottom none p - text--body($black) - - // &:nth-of-type(odd) - // .thumbnail - // float right - - // section - // padding-right 16px - // padding-left 0 + text--body($black) \ No newline at end of file diff --git a/wp-content/themes/blankslate-child/stylus/require/404.styl b/wp-content/themes/blankslate-child/stylus/require/404.styl index bf827aa5..cf4703ea 100644 --- a/wp-content/themes/blankslate-child/stylus/require/404.styl +++ b/wp-content/themes/blankslate-child/stylus/require/404.styl @@ -10,8 +10,7 @@ text-align center h1 - text--header($black) - font-size 3rem + text--subheader($black) margin-bottom 1.5rem a diff --git a/wp-content/themes/blankslate-child/stylus/require/archive-success.styl b/wp-content/themes/blankslate-child/stylus/require/archive-success.styl index a1e2f3fe..7d3df93a 100644 --- a/wp-content/themes/blankslate-child/stylus/require/archive-success.styl +++ b/wp-content/themes/blankslate-child/stylus/require/archive-success.styl @@ -14,25 +14,30 @@ &__faq display flex flex-direction column + max-width $content + margin 0 auto h1 - margin 0 auto 6rem + margin 0 auto 2.4rem width 100% - max-width 600px - text--header($black) - font-size 4.9rem - text-align center + text--subheader($black) - section + h2 + text--strong($black) + text-align left + margin 0 + + ul width 100% max-width $content margin 0 auto 3rem column-count 3 column-gap 16px - article + li float left width 100% + list-style-type none p margin 0 auto 3rem @@ -49,16 +54,23 @@ text--body($blue) anchor($blue, 2px) -h1.success_cta - margin 12rem auto - width 100% - max-width $content - text--header($black) - text-align center - font-size 4.9rem +div.success_cta + h1 + margin 12rem auto 0 + width 100% + max-width $content + text--header($black) + text-align center + font-size 4.9rem + + h2 + text--subheader($black) + margin 0 auto 12rem + width 100% + text-align center - a - anchor($blue, 4px) + a + anchor($blue, 4px) @media all and (max-width:$mobile) .page-template-template-archive-success diff --git a/wp-content/themes/blankslate-child/stylus/require/careers.styl b/wp-content/themes/blankslate-child/stylus/require/careers.styl index 9f35f895..c58ad767 100644 --- a/wp-content/themes/blankslate-child/stylus/require/careers.styl +++ b/wp-content/themes/blankslate-child/stylus/require/careers.styl @@ -49,7 +49,7 @@ .career-post max-width $content - margin 89px auto 0 + margin 58px auto 0 padding 4.8rem 0 h1 diff --git a/wp-content/themes/blankslate-child/stylus/require/gallery.styl b/wp-content/themes/blankslate-child/stylus/require/gallery.styl index 2386cb57..a17082b5 100644 --- a/wp-content/themes/blankslate-child/stylus/require/gallery.styl +++ b/wp-content/themes/blankslate-child/stylus/require/gallery.styl @@ -21,6 +21,7 @@ $aspect-ratio = 16/9 h2 text--strong($black) + text-align left margin-bottom 1.5rem border-bottom 2px solid $lightPurple padding-bottom 12px diff --git a/wp-content/themes/blankslate-child/stylus/require/global.styl b/wp-content/themes/blankslate-child/stylus/require/global.styl index e9a40d7b..f96725b0 100644 --- a/wp-content/themes/blankslate-child/stylus/require/global.styl +++ b/wp-content/themes/blankslate-child/stylus/require/global.styl @@ -40,6 +40,12 @@ text--header(a) font-weight 300 font-size 6.08rem +text--subheader(a) + text--base(a) + font-family 'Schnyder Wide M Web' + font-weight 300 + font-size 3.2rem + text--body(a) text--base(a) font-family 'Graphik Web' diff --git a/wp-content/themes/blankslate-child/stylus/require/header.styl b/wp-content/themes/blankslate-child/stylus/require/header.styl index 644827fb..25cfbdd4 100644 --- a/wp-content/themes/blankslate-child/stylus/require/header.styl +++ b/wp-content/themes/blankslate-child/stylus/require/header.styl @@ -123,6 +123,13 @@ body &__logo flex-grow initial + a + display inline-block + padding 0 + + &:hover + background none + &--light display none diff --git a/wp-content/themes/blankslate-child/stylus/require/template-events-page.styl b/wp-content/themes/blankslate-child/stylus/require/template-events-page.styl index cc7d4895..f68f99c0 100644 --- a/wp-content/themes/blankslate-child/stylus/require/template-events-page.styl +++ b/wp-content/themes/blankslate-child/stylus/require/template-events-page.styl @@ -45,37 +45,38 @@ flex 1 1 calc(50% - 1rem) h3 - text--strong($black) + text--header($black) + font-size 2.6rem - h3,p - margin-bottom 16px + h3, .event-details + margin-bottom 8px .event-details + margin-left 1.6rem display inline-block p float left + color $darkGrey &:first-of-type - margin-right 1.6em + margin-right 1.6rem .event-description - margin-left 1.6em + margin-left 1.6rem a + display inline-block text-decoration none - font-weight bold color $blue + padding 8px 12px + margin 4px 0px + border-radius 4px &:hover - background $lightPurple - color $blue - - h3 - color $blue - a - color $blue + background $blue + color $parchment @media (max-width: $mobile) .page-template-events-page diff --git a/wp-content/themes/blankslate-child/stylus/require/template-faq-page.styl b/wp-content/themes/blankslate-child/stylus/require/template-faq-page.styl index c6ae34e4..fd9981d2 100644 --- a/wp-content/themes/blankslate-child/stylus/require/template-faq-page.styl +++ b/wp-content/themes/blankslate-child/stylus/require/template-faq-page.styl @@ -23,6 +23,7 @@ h2 text--header($black) font-size 3rem + text-align left margin 1.6rem 0 padding-bottom 1rem border-bottom 2px solid $lightPurple diff --git a/wp-content/themes/blankslate-child/template-archive-success.php b/wp-content/themes/blankslate-child/template-archive-success.php index ce474338..fb75bddd 100644 --- a/wp-content/themes/blankslate-child/template-archive-success.php +++ b/wp-content/themes/blankslate-child/template-archive-success.php @@ -4,9 +4,8 @@ $page_banner = get_field('archive_success_banner'); include( 'modules/banner--main.php' ); -include( 'modules/main-content--archive-success.php' ); -$thumbnail_carousel = get_field('thumbnail_carousel'); +include( 'modules/main-content--archive-success.php' ); // Success page FAQ if ( have_rows( 'custom_gallery_posts' ) ) { while ( have_rows( 'custom_gallery_posts') ) { @@ -34,7 +33,7 @@ } } -echo '

Have more to say? Submit another video here.

'; +echo '

Have more to say?


Submit another video here.

'; include( 'modules/newsletter.php' );