Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Programme: add design updates #7474

Merged
merged 6 commits into from
Nov 20, 2023
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
2 changes: 1 addition & 1 deletion messagerie/patterns/404.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a couple of changes like this to Messagerie that I can't seem to revert. I think my linter is fixing some spacing issues on a pre-commit hook, it seems to run even if I skip the hook. They're only spacing changes so I think they're OK to keep.

2 changes: 1 addition & 1 deletion messagerie/patterns/archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
20 changes: 10 additions & 10 deletions messagerie/patterns/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
<!-- wp:paragraph {"align":"center"} -->
<p class="has-text-align-center">
<?php
/* Translators: WordPress link. */
$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'messagerie' ) ) . '" rel="nofollow">WordPress</a>';
echo sprintf(
esc_html__( 'Designed with %1$s', 'messagerie' ),
$wordpress_link
);
?>
</p>
<?php
/* Translators: WordPress link. */
$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'messagerie' ) ) . '" rel="nofollow">WordPress</a>';
echo sprintf(
esc_html__( 'Designed with %1$s', 'messagerie' ),
$wordpress_link
);
?>
</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:group -->
</div>
<!-- /wp:group -->
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion messagerie/patterns/home.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion messagerie/patterns/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion messagerie/patterns/page.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion messagerie/patterns/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion messagerie/patterns/single.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
<!-- /wp:comments -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /--></div>
<!-- /wp:group -->
<!-- /wp:group -->
Binary file added programme/assets/fonts/evolventa_normal_400.ttf
Binary file not shown.
Binary file added programme/assets/fonts/evolventa_normal_700.ttf
Binary file not shown.
Binary file removed programme/assets/fonts/evolventa_normal_700.woff
Binary file not shown.
Binary file added programme/assets/fonts/inter_normal_500.ttf
Binary file not shown.
Binary file removed programme/assets/fonts/inter_normal_600.ttf
Binary file not shown.
28 changes: 20 additions & 8 deletions programme/parts/header-minimal.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
<!-- wp:group {"align":"wide","style":{"border":{"color":null,"style":null,"width":null,"top":{"color":"var:preset|color|primary","style":"solid","width":"2.1rem"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--primary);border-top-style:solid;border-top-width:2.1rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"7rem","top":"4.2rem"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="padding-top:4.2rem;padding-bottom:7rem"><!-- wp:group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group"><!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
<div class="wp-block-group alignfull">
<!-- wp:group {"align":"wide","style":{"border":{"color":null,"style":null,"width":null,"top":{"color":"var:preset|color|foreground","style":"solid","width":"2.1rem"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--foreground);border-top-style:solid;border-top-width:2.1rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"6.4rem","top":"4.2rem"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="padding-top:4.2rem;padding-bottom:6.4rem"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
<div class="wp-block-group"><!-- wp:site-title /-->

<!-- wp:pattern {"slug":"programme/big-header"} /-->

<!-- wp:site-logo {"width":128,"shouldSyncIcon":false} /--></div>
<!-- wp:heading {"level":1,"style":{"typography":{"lineHeight":"1","fontSize":"4rem"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} -->
<h1 class="wp-block-heading has-primary-color has-text-color has-link-color" style="font-size:4rem;line-height:1">of Mainland</h1>
<!-- /wp:heading --></div>
<!-- /wp:group --></div>
<!-- /wp:column -->

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
<div class="wp-block-group alignfull"><!-- wp:paragraph {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"blockGap":"0rem"}},"textColor":"foreground"} -->
<p class="has-foreground-color has-text-color" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px">Subscriptions and Propaganda Office<br>Valley Fortress St, 6</p>
<!-- /wp:paragraph -->

<!-- wp:site-logo {"width":64,"shouldSyncIcon":false} /--></div>
<!-- /wp:group --></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
25 changes: 25 additions & 0 deletions programme/parts/header-pages.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!-- wp:group {"align":"wide","style":{"border":{"color":null,"style":null,"width":null,"top":{"color":"var:preset|color|foreground","style":"solid","width":"2.1rem"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--foreground);border-top-style:solid;border-top-width:2.1rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"6.4rem","top":"4.2rem"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="padding-top:4.2rem;padding-bottom:6.4rem"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
<div class="wp-block-group"><!-- wp:site-title /-->

<!-- wp:heading {"level":1,"style":{"typography":{"lineHeight":"1","fontSize":"4rem"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} -->
<h1 class="wp-block-heading has-primary-color has-text-color has-link-color" style="font-size:4rem;line-height:1">of Mainland</h1>
<!-- /wp:heading --></div>
<!-- /wp:group --></div>
<!-- /wp:column -->

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
<div class="wp-block-group alignfull"><!-- wp:paragraph {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"blockGap":"0rem"}},"textColor":"foreground"} -->
<p class="has-foreground-color has-text-color" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px">Subscriptions and Propaganda Office<br>Valley Fortress St, 6</p>
<!-- /wp:paragraph -->

<!-- wp:site-logo {"width":64,"shouldSyncIcon":false} /--></div>
<!-- /wp:group --></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
14 changes: 9 additions & 5 deletions programme/parts/header.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<!-- wp:group {"align":"wide","style":{"border":{"color":null,"style":null,"width":null,"top":{"color":"var:preset|color|foreground","style":"solid","width":"2.1rem"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--foreground);border-top-style:solid;border-top-width:2.1rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"4.2rem","top":"4.2rem"}}},"layout":{"type":"constrained"}} -->
<!-- wp:group {"align":"wide","style":{"border":{"color":null,"style":null,"width":null,"top":{"color":"var:preset|color|primary","style":"solid","width":"2.1rem"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="border-top-color:var(--wp--preset--color--primary);border-top-style:solid;border-top-width:2.1rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"4.2rem","top":"4.2rem"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide" style="padding-top:4.2rem;padding-bottom:4.2rem"><!-- wp:group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group"><!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
<div class="wp-block-group alignfull">
<div class="wp-block-group alignfull"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
<div class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"fontSize":"6.4rem","lineHeight":"0.9"}}} /-->

<!-- wp:pattern {"slug":"programme/big-header"} /-->
<!-- wp:heading {"level":1,"style":{"typography":{"lineHeight":"0.9"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} -->
<h1 class="wp-block-heading has-primary-color has-text-color has-link-color" style="line-height:0.9">of Mainland</h1>
<!-- /wp:heading --></div>
<!-- /wp:group -->

<!-- wp:site-logo {"width":128,"shouldSyncIcon":false} /--></div>
<!-- wp:site-logo {"width":128,"shouldSyncIcon":true} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
Expand Down
8 changes: 5 additions & 3 deletions programme/patterns/404.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@

?>

<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
<div class="wp-block-group alignwide"><!-- wp:group {"style":{"spacing":{"padding":{"bottom":"2.1rem"}}},"layout":{"type":"default"}} -->
<div class="wp-block-group" style="padding-bottom:2.1rem"><!-- wp:group {"style":{"spacing":{"padding":{"bottom":"2.1rem"},"blockGap":"0rem"}},"layout":{"type":"flex","orientation":"vertical"}} -->
<div class="wp-block-group" style="padding-bottom:2.1rem"><!-- wp:heading {"textAlign":"left","textColor":"primary"} -->
<h2 class="wp-block-heading has-text-align-left has-primary-color has-text-color" id="oops-that-page-can-t-be-found"><?php echo esc_html__( 'Oops! That page cant be found.', 'programme' ); ?></h2>
<div class="wp-block-group" style="padding-bottom:2.1rem"><!-- wp:heading {"textAlign":"left","textColor":"primary","anchor":"oops-that-page-can-t-be-found"} -->
<h2 class="wp-block-heading has-text-align-left has-primary-color has-text-color" id="oops-that-page-can-t-be-found"><?php echo esc_html__( 'Oops! That page can&rsquo;t be found.', 'programme' ); ?></h2>
<!-- /wp:heading -->

<!-- wp:heading -->
Expand All @@ -31,4 +32,5 @@
<!-- wp:search {"showLabel":false,"width":100,"widthUnit":"%","buttonPosition":"button-inside","buttonUseIcon":true,"style":{"border":{"radius":"0px","top":{"color":"var:preset|color|secondary","style":"solid","width":"2px"},"right":{"color":"var:preset|color|secondary","style":"solid","width":"2px"},"bottom":{"color":"var:preset|color|secondary","style":"solid","width":"2px"},"left":{"color":"var:preset|color|secondary","style":"solid","width":"2px"}}},"textColor":"background"} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
18 changes: 0 additions & 18 deletions programme/patterns/big-header.php

This file was deleted.

19 changes: 0 additions & 19 deletions programme/patterns/search.php

This file was deleted.

Binary file modified programme/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading