Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions themes/osi/assets/css/editor-style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/osi/assets/css/editor-style.css.map

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions themes/osi/assets/scss/_5_objects.layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@
.alignfull {
@extend %alignfull;
}
.alignwide.email-block {
max-width: none !important;
}
}
}

Expand All @@ -107,9 +104,6 @@
.alignfull {
@extend %alignfull;
}
.alignwide.email-block {
max-width: none !important;
}
}

.license-comments {
Expand Down
19 changes: 18 additions & 1 deletion themes/osi/assets/scss/_6_components.footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
}
.footer-main, .footer-credits {
padding: $smallPadding 0;
padding: 0 0 $smallPadding;
}

.footer-credits {
Expand Down Expand Up @@ -51,6 +51,23 @@
}
}

.footer-newsletter {
display: flow-root;
padding: 4em $midPadding 0;

> * {
margin-left: auto;
margin-right: auto;
max-width: calc(#{$boxedMax} - (2 * #{$maxPadding}));
}

.alignwide {
margin-left: auto;
margin-right: auto;
width: auto;
}
}

.footer--inner {
@include clearfix();
padding: 0 $midPadding;
Expand Down
8 changes: 8 additions & 0 deletions themes/osi/assets/scss/_8_overrides.templates.scss
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,14 @@ footer.ai-footer {
background-color: #1B1B1B;
}

.ai-footer .footer-newsletter {
color: $Nwhite;

h2, a {
color: inherit;
}
}

.page-template-ai-wide {
.wrapper {
background-color: rgb(246, 247, 249);
Expand Down
1 change: 1 addition & 0 deletions themes/osi/footer-ai.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

<footer id="colophon" class="footer site-footer ai-footer" role="contentinfo">
<?php echo do_shortcode( do_blocks( '<!-- wp:block {"ref":' . absint( $footer_block_id ) . '} /-->' ) ); ?>
<?php get_template_part( 'template-parts/footer-newsletter' ); ?>
<section class="footer-credits">
<div class="footer--inner">
<div class="widgetized-footer footer--widgets wp-block-columns alignwide">
Expand Down
4 changes: 1 addition & 3 deletions themes/osi/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
*/

$footerclass = is_active_sidebar( 'sidebar-footer' ) ? 'widgetized-footer footer--widgets' : 'standard-footer';
if ( is_blog() ) :
get_template_part( 'template-parts/email-block' );
endif;
?>

<footer id="colophon" class="footer site-footer" role="contentinfo">
Expand All @@ -23,6 +20,7 @@
</section>
</div>
<?php endif; ?>
<?php get_template_part( 'template-parts/footer-newsletter' ); ?>
<section class="footer-main">
<div class="footer--inner">
<div class="<?php echo esc_attr( $footerclass ); ?> wp-block-columns alignwide">
Expand Down
30 changes: 23 additions & 7 deletions themes/osi/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/osi/style.css.map

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions themes/osi/template-parts/content-board-member.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,5 @@
<div class="entry-content post--content">
<?php the_content(); ?>
</div><!-- .entry-content -->
<section class="alignwide email-block">
<?php // get_template_part( 'template-parts/nav-postname-pager' ); ?>
<?php // get_template_part( 'template-parts/email-block' ); ?>
</section>

</article><!-- #post-<?php the_ID(); ?> -->
8 changes: 0 additions & 8 deletions themes/osi/template-parts/email-block.php

This file was deleted.

14 changes: 14 additions & 0 deletions themes/osi/template-parts/footer-newsletter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
/**
* Newsletter section in the footer, edited at Appearance > Block Patterns.
*
* @package osi
*/

$newsletter_pattern = get_page_by_path( 'newsletter-subscribe', OBJECT, 'coblocks_pattern' );

if ( $newsletter_pattern && 'publish' === $newsletter_pattern->post_status ) : ?>
<section class="footer-newsletter">
<?php echo do_shortcode( do_blocks( $newsletter_pattern->post_content ) ); ?>
</section>
<?php endif; ?>
Loading