Skip to content

Commit b0cbc8e

Browse files
alaczekalaczek
authored
Hola: Round of fixes (Automattic#8015)
* Remove unused files. * Add comments pattern * Update single.html Move content of single post from pattern to template * Update post-meta.php Consolidate post meta into single pattern. * Update footer.php Update the translation functions. * Update 404.php Update the translation functions.
1 parent 39e7bc0 commit b0cbc8e

File tree

9 files changed

+102
-184
lines changed

9 files changed

+102
-184
lines changed

‎hola/parts/comments.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!-- wp:pattern {"slug":"hola/comments"} /-->

‎hola/parts/header-minimal.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎hola/patterns/404.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
<!-- wp:group {"layout":{"type":"constrained"}} -->
1919
<div class="wp-block-group"><!-- wp:heading {"textAlign":"left","level":1} -->
20-
<h1 class="wp-block-heading has-text-align-left" id="oops-that-page-can-t-be-found"><?php echo __('Oops! That page can’t be found.', 'hola');?></h1>
20+
<h1 class="wp-block-heading has-text-align-left" id="oops-that-page-can-t-be-found"><?php esc_html_e('Oops! That page can’t be found.', 'hola');?></h1>
2121
<!-- /wp:heading -->
2222

2323
<!-- wp:paragraph -->
24-
<p><?php echo __('It looks like nothing was found at this location.<br>Maybe try a search?', 'hola');?></p>
24+
<p><?php esc_html_e('It looks like nothing was found at this location.', 'hola');?><br /><?php esc_html_e('Maybe try a search?', 'hola');?></p>
2525
<!-- /wp:paragraph -->
2626

2727
<!-- wp:spacer {"height":"var:preset|spacing|30"} -->

‎hola/patterns/footer.php‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,52 @@
1010
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|50","padding":{"bottom":"var:preset|spacing|70","right":"var:preset|spacing|50","left":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
1111
<div class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"var:preset|spacing|40"}},"border":{"top":{"width":"1px","style":"dotted"}}},"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"top","justifyContent":"left"}} -->
1212
<div class="wp-block-group" style="border-top-style:dotted;border-top-width:1px;padding-top:var(--wp--preset--spacing--40)"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
13-
<p class="has-text-align-left has-small-font-size"><?php echo __('<a href="#" target="_blank" rel="noreferrer noopener">Tumblr</a>', 'hola');?></p>
13+
<p class="has-text-align-left has-small-font-size"><a href="#" target="_blank" rel="noreferrer noopener">Tumblr</a></p>
1414
<!-- /wp:paragraph -->
1515

1616
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
17-
<p class="has-text-align-left has-small-font-size"><?php echo __('·', 'hola');?></p>
17+
<p class="has-text-align-left has-small-font-size">·</p>
1818
<!-- /wp:paragraph -->
1919

2020
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
21-
<p class="has-text-align-left has-small-font-size"><?php echo __('<a href="#" target="_blank" rel="noreferrer noopener">Behance</a>', 'hola');?></p>
21+
<p class="has-text-align-left has-small-font-size"><a href="#" target="_blank" rel="noreferrer noopener">Behance</a></p>
2222
<!-- /wp:paragraph -->
2323

2424
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
25-
<p class="has-text-align-left has-small-font-size"><?php echo __('·', 'hola');?></p>
25+
<p class="has-text-align-left has-small-font-size">·</p>
2626
<!-- /wp:paragraph -->
2727

2828
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
29-
<p class="has-text-align-left has-small-font-size"><?php echo __('<a href="#" target="_blank" rel="noreferrer noopener">Mastodon</a>', 'hola');?></p>
29+
<p class="has-text-align-left has-small-font-size"><a href="#" target="_blank" rel="noreferrer noopener">Mastodon</a></p>
3030
<!-- /wp:paragraph -->
3131

3232
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
33-
<p class="has-text-align-left has-small-font-size"><?php echo __('·', 'hola');?></p>
33+
<p class="has-text-align-left has-small-font-size">·</p>
3434
<!-- /wp:paragraph -->
3535

3636
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"small"} -->
37-
<p class="has-text-align-left has-small-font-size"><?php echo __('<a href="#" target="_blank" rel="noreferrer noopener">Linkedin</a>', 'hola');?></p>
37+
<p class="has-text-align-left has-small-font-size"><a href="#" target="_blank" rel="noreferrer noopener">LinkedIn</a></p>
3838
<!-- /wp:paragraph --></div>
3939
<!-- /wp:group -->
4040

4141
<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
42-
<div class="wp-block-group"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fill","flexSize":null}},"fontSize":"small"} -->
43-
<p class="has-text-align-left has-small-font-size"><?php echo __('Get in <a href="#" data-type="mailto" data-id="mailto:">touch</a>.', 'hola');?></p>
42+
<div class="wp-block-group">
43+
<!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fill","flexSize":null}},"fontSize":"small"} -->
44+
<p class="has-text-align-left has-small-font-size"><?php esc_html_e('Get in touch', 'hola');?></p>
4445
<!-- /wp:paragraph -->
4546

4647
<!-- wp:paragraph {"align":"left","fontSize":"small"} -->
47-
<p class="has-text-align-left has-small-font-size"><?php echo __('Designed with <a href="#" target="_blank" rel="noreferrer noopener nofollow">WordPress</a>', 'hola');?></p>
48+
<p class="has-text-align-left has-small-font-size">
49+
<?php
50+
/* Translators: WordPress link. */
51+
$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'hola' ) ) . '" rel="nofollow">WordPress</a>';
52+
echo sprintf(
53+
esc_html__( 'Designed with %1$s', 'hola' ),
54+
$wordpress_link
55+
);
56+
?>
57+
58+
</p>
4859
<!-- /wp:paragraph --></div>
4960
<!-- /wp:group --></div>
5061
<!-- /wp:group -->

‎hola/patterns/header-large.php‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎hola/patterns/header-minimal.php‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎hola/patterns/post-meta.php‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:dotted;border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:columns {"isStackedOnMobile":false,"style":{"spacing":{"blockGap":{"top":"0"}}}} -->
1313
<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column {"width":"15%"} -->
1414
<div class="wp-block-column" style="flex-basis:15%"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"small"} -->
15-
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php echo __('Tags:', 'hola');?></p>
15+
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php esc_html_e('Tags:', 'hola');?></p>
1616
<!-- /wp:paragraph --></div>
1717
<!-- /wp:column -->
1818

@@ -26,13 +26,41 @@
2626
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:dotted;border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:columns {"isStackedOnMobile":false,"style":{"spacing":{"blockGap":{"top":"0"}}}} -->
2727
<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column {"width":"15%"} -->
2828
<div class="wp-block-column" style="flex-basis:15%"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"small"} -->
29-
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php echo __('Date:', 'hola');?></p>
29+
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php esc_html_e('Date:', 'hola');?></p>
3030
<!-- /wp:paragraph --></div>
3131
<!-- /wp:column -->
3232

3333
<!-- wp:column {"width":"85%"} -->
3434
<div class="wp-block-column" style="flex-basis:85%"><!-- wp:post-date {"isLink":true,"fontSize":"small"} /--></div>
3535
<!-- /wp:column --></div>
3636
<!-- /wp:columns --></div>
37+
<!-- /wp:group -->
38+
39+
<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"border":{"top":{"color":"var:preset|color|tertiary","style":"dotted","width":"1px"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
40+
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:dotted;border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:columns {"isStackedOnMobile":false,"style":{"spacing":{"blockGap":{"top":"0"}}}} -->
41+
<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column {"width":"15%"} -->
42+
<div class="wp-block-column" style="flex-basis:15%"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"small"} -->
43+
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php esc_html_e('Up next:', 'hola');?></p>
44+
<!-- /wp:paragraph --></div>
45+
<!-- /wp:column -->
46+
47+
<!-- wp:column {"width":"85%"} -->
48+
<div class="wp-block-column" style="flex-basis:85%"><!-- wp:post-navigation-link {"showTitle":true} /--></div>
49+
<!-- /wp:column --></div>
50+
<!-- /wp:columns --></div>
51+
<!-- /wp:group -->
52+
53+
<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"border":{"top":{"color":"var:preset|color|tertiary","style":"dotted","width":"1px"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
54+
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:dotted;border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:columns {"isStackedOnMobile":false,"style":{"spacing":{"blockGap":{"top":"0"}}}} -->
55+
<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column {"width":"15%"} -->
56+
<div class="wp-block-column" style="flex-basis:15%"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"small"} -->
57+
<p class="has-small-font-size" style="font-style:normal;font-weight:700"><?php esc_html_e('Before:', 'hola');?></p>
58+
<!-- /wp:paragraph --></div>
59+
<!-- /wp:column -->
60+
61+
<!-- wp:column {"width":"85%"} -->
62+
<div class="wp-block-column" style="flex-basis:85%"><!-- wp:post-navigation-link {"type":"previous","showTitle":true} /--></div>
63+
<!-- /wp:column --></div>
64+
<!-- /wp:columns --></div>
3765
<!-- /wp:group --></div>
3866
<!-- /wp:group -->

0 commit comments

Comments
 (0)