Skip to content

Commit

Permalink
Merge pull request #302 from wikitongues/main
Browse files Browse the repository at this point in the history 
Prod Deploy
  • Loading branch information
@FredericoAndrade
FredericoAndrade authored Feb 4, 2025
2 parents a0953fd + d3a5227 commit c02fb29
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 71 deletions.
125 changes: 98 additions & 27 deletions wp-content/themes/blankslate-child/acf-json/group_624f529b40c49.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,32 +257,6 @@
}
]
},
{
"key": "field_64d159b3dee63",
"label": "Fellow Headshot",
"name": "fellow_headshot",
"aria-label": "",
"type": "image",
"instructions": "",
"required": 0,
"conditional_logic": 0,
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"return_format": "id",
"library": "all",
"min_width": "",
"min_height": "",
"min_size": "",
"max_width": "",
"max_height": "",
"max_size": "",
"mime_types": "",
"allow_in_bindings": 1,
"preview_size": "medium"
},
{
"key": "field_62546d83dc64a",
"label": "Fellow Bio",
Expand Down Expand Up @@ -586,6 +560,103 @@
"rows": "",
"placeholder": "",
"new_lines": ""
},
{
"key": "field_67a2231ef5fb9",
"label": "Main Content",
"name": "main_content",
"aria-label": "",
"type": "flexible_content",
"instructions": "",
"required": 0,
"conditional_logic": 0,
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"layouts": {
"layout_67a223227fc2d": {
"key": "layout_67a223227fc2d",
"name": "text_layout",
"label": "Text Layout",
"display": "block",
"sub_fields": [
{
"key": "field_67a2242b68bad",
"label": "Text Area",
"name": "text_area",
"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
}
],
"min": "",
"max": ""
},
"layout_67a2244268bae": {
"key": "layout_67a2244268bae",
"name": "video_layout",
"label": "Video Layout",
"display": "block",
"sub_fields": [
{
"key": "field_67a2244668bb0",
"label": "Video",
"name": "video",
"aria-label": "",
"type": "url",
"instructions": "",
"required": 0,
"conditional_logic": 0,
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"default_value": "",
"placeholder": ""
},
{
"key": "field_67a23e9a7fde2",
"label": "Video Title",
"name": "video_title",
"aria-label": "",
"type": "text",
"instructions": "",
"required": 0,
"conditional_logic": 0,
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"default_value": "",
"maxlength": "",
"placeholder": "",
"prepend": "",
"append": ""
}
],
"min": "",
"max": ""
}
},
"min": "",
"max": "",
"button_label": "Add Row"
}
],
"location": [
Expand All @@ -606,5 +677,5 @@
"active": true,
"description": "",
"show_in_rest": 0,
"modified": 1738503801
"modified": 1738687505
}
59 changes: 34 additions & 25 deletions wp-content/themes/blankslate-child/acf-json/group_678fbe627d614.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"fields": [
{
"key": "field_679e98a9c94e7",
"label": "Editorial Content",
"name": "editorial_content",
"label": "Main Content",
"name": "main_content",
"aria-label": "",
"type": "flexible_content",
"instructions": "",
Expand All @@ -19,8 +19,8 @@
"layouts": {
"layout_679e98b633bc8": {
"key": "layout_679e98b633bc8",
"name": "text_block",
"label": "Text Block",
"name": "text_layout",
"label": "Text Layout",
"display": "block",
"sub_fields": [
{
Expand Down Expand Up @@ -49,8 +49,8 @@
},
"layout_679e9a6a86159": {
"key": "layout_679e9a6a86159",
"name": "banner",
"label": "Banner",
"name": "banner_layout",
"label": "Banner Layout",
"display": "block",
"sub_fields": [
{
Expand Down Expand Up @@ -178,8 +178,8 @@
},
"layout_679e9a3b7738d": {
"key": "layout_679e9a3b7738d",
"name": "gallery",
"label": "Gallery",
"name": "gallery_layout",
"label": "Gallery Layout",
"display": "block",
"sub_fields": [
{
Expand Down Expand Up @@ -376,16 +376,16 @@
},
"layout_679ea63d73229": {
"key": "layout_679ea63d73229",
"name": "video",
"label": "Video",
"name": "video_layout",
"label": "Video Layout",
"display": "block",
"sub_fields": [
{
"key": "field_679ea6437322f",
"label": "Video",
"name": "video",
"aria-label": "",
"type": "post_object",
"type": "url",
"instructions": "",
"required": 0,
"conditional_logic": 0,
Expand All @@ -394,19 +394,28 @@
"class": "",
"id": ""
},
"post_type": [
"videos"
],
"post_status": [
"publish"
],
"taxonomy": "",
"return_format": "object",
"multiple": 0,
"allow_null": 0,
"bidirectional": 0,
"ui": 1,
"bidirectional_target": []
"default_value": "",
"placeholder": ""
},
{
"key": "field_67a23eb5566c7",
"label": "Video Title",
"name": "video_title",
"aria-label": "",
"type": "text",
"instructions": "",
"required": 0,
"conditional_logic": 0,
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"default_value": "",
"maxlength": "",
"placeholder": "",
"prepend": "",
"append": ""
}
],
"min": "",
Expand Down Expand Up @@ -439,5 +448,5 @@
"active": true,
"description": "",
"show_in_rest": 0,
"modified": 1738497507
"modified": 1738687181
}
4 changes: 4 additions & 0 deletions wp-content/themes/blankslate-child/modules/flexible-content--text-layout.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php
echo '<section class="main-content">';
echo wpautop(wp_kses_post(get_sub_field('text_area')));
echo '</section>';
16 changes: 16 additions & 0 deletions wp-content/themes/blankslate-child/modules/flexible-content--video-layout.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php
$video = get_sub_field('video');
$video_title = get_sub_field('video_title');
$dropbox_link_raw = str_replace("dl=0", "raw=1", $video);
if ( $dropbox_link_raw ) {
?>
<div class="wt_single-videos__embed">
<video width="320" height="240" controls>
<source src="<?php echo $dropbox_link_raw ?>" type="video/mp4">Your browser does not support the video tag.
</video>
<?php
if ( $video_title ) {
echo '<h3>' . $video_title . '</h3>';
};
echo '</div>';
};
15 changes: 15 additions & 0 deletions wp-content/themes/blankslate-child/single-fellows.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@

$fellow_bio = get_field('fellow_bio');

if( have_rows('main_content') ):
while( have_rows('main_content') ) : the_row();

$layout = get_row_layout();

if( $layout == 'text_layout' ):
include( 'modules/flexible-content--text-layout.php' );
elseif( $layout == 'video_layout' ):
include( 'modules/flexible-content--video-layout.php' );
endif;

endwhile;
endif;


if ( $fellow_bio ) {
include( 'modules/fellow-bio.php');
}
Expand Down
40 changes: 35 additions & 5 deletions wp-content/themes/blankslate-child/stylus/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,16 @@ body.search-results .wt_banner--searchbar {
margin: auto;
max-width: 600px;
}
.main-content h2 {
font-style: normal;
font-stretch: normal;
color: #101010;
font-family: 'Schnyder Wide M Web';
font-weight: 300;
font-size: 6.08rem;
font-size: 3rem;
margin: 3rem auto 1.6rem;
}
.main-content h3 {
font-style: normal;
font-stretch: normal;
Expand Down Expand Up @@ -2094,7 +2104,8 @@ body.single-videos .wt_header__nav>ul>li:first-of-type:hover .sub-menu {
font-size: 6.08rem;
}
.wt_single-videos__video,
.wt_single-videos__no-video {
.wt_single-videos__no-video,
.wt_single-videos__embed {
background: #101010;
padding: 4rem 0;
margin-bottom: 6rem;
Expand All @@ -2119,6 +2130,20 @@ body.single-videos .wt_header__nav>ul>li:first-of-type:hover .sub-menu {
}
.wt_single-videos__video {
width: 100%;
}
.wt_single-videos__embed {
width: 1140px;
margin: 0 auto 6.4rem;
border-radius: 4px;
}
.wt_single-videos__embed h3 {
text-align: left;
padding: 16px 0 0 32px;
font-size: 20px;
font-weight: 400;
}
.wt_single-videos__video,
.wt_single-videos__embed {
font-style: normal;
font-stretch: normal;
color: #fffcef;
Expand All @@ -2128,19 +2153,24 @@ body.single-videos .wt_header__nav>ul>li:first-of-type:hover .sub-menu {
line-height: 1.3;
text-align: center;
}
.wt_single-videos__video video {
.wt_single-videos__video video,
.wt_single-videos__embed video {
background: #282828;
width: 100%;
}
.wt_single-videos__video video,
.wt_single-videos__video iframe {
.wt_single-videos__embed video,
.wt_single-videos__video iframe,
.wt_single-videos__embed iframe {
min-height: 31.640625vw;
max-width: 56.25vw;
}
.wt_single-videos__video p {
.wt_single-videos__video p,
.wt_single-videos__embed p {
background: #9581c2;
}
.wt_single-videos__video img {
.wt_single-videos__video img,
.wt_single-videos__embed img {
width: 100%;
height: auto;
}
Expand Down
5 changes: 5 additions & 0 deletions wp-content/themes/blankslate-child/stylus/require/main-content.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
margin auto
max-width 600px

h2
text--header($black)
font-size 3rem
margin 3rem auto 1.6rem

h3
text--strong($black)
margin 1.6rem 0 0
Expand Down
Loading

0 comments on commit c02fb29

Please sign in to comment.