Update variations after merge (#5192)

This commit is contained in:
Ben Dwyer 2021-12-14 11:47:42 +00:00 committed by GitHub
parent 87c87b9364
commit 2f5c429e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 155 additions and 35 deletions

View file

@ -1,6 +1,6 @@
{
"name": "geologist",
"version": "1.0.18",
"version": "1.0.19",
"description": "",
"main": "style.css",
"dependencies": {},

View file

@ -1,6 +1,6 @@
{
"name": "geologist",
"version": "1.0.18",
"version": "1.0.19",
"description": "",
"main": "style.css",
"dependencies": {},

View file

@ -1,6 +1,6 @@
{
"name": "geologist",
"version": "1.0.18",
"version": "1.0.19",
"description": "",
"main": "style.css",
"dependencies": {},

View file

@ -1,6 +1,6 @@
{
"name": "geologist",
"version": "1.0.18",
"version": "1.0.19",
"description": "",
"main": "style.css",
"dependencies": {},

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```

View file

@ -1,3 +0,0 @@
<!-- wp:spacer {"height":160} -->
<div style="height:160px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

View file

@ -1,5 +1,9 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
<main class="wp-block-group">
<!-- wp:pattern {"slug":"blockbase/404"} /-->

View file

@ -1,5 +1,9 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header","layout":{"inherit":true}} /-->
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
<main class="wp-block-query">
<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->

View file

@ -1,7 +1,7 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var(--wp--custom--gap--vertical)"}}}} -->
<main class="wp-block-group" style="margin-top: var(--wp--custom--gap--vertical)">
<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"}}}} -->
<main class="wp-block-group" style="margin-top:0">
<!-- wp:post-content {"layout":{"inherit":true}} /-->
</main>

View file

@ -1,5 +1,9 @@
<!-- wp:template-part {"slug":"header-minimal","tagName":"header"} /-->
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
<main class="wp-block-query">

View file

@ -1,7 +1,7 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
<!-- wp:spacer {"height":170} -->
<div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:group {"tagName":"main"} -->

View file

@ -1,5 +1,9 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
<main class="wp-block-group">

View file

@ -1,5 +1,9 @@
<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
<!-- wp:spacer {"height":110} -->
<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:group {"tagName":"main"} -->
<main class="wp-block-group">

View file

@ -15,7 +15,7 @@ return array(
<!-- wp:columns {"align":"wide"} -->
<div class="wp-block-columns alignwide"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontWeight":"300"}},"fontSize":"large"} -->
<h3 class="has-large-font-size" style="font-weight:300">' . esc_html__( 'Gary Han is a award-winning creative director, designer, photographer and visual artist based in Singapore.', 'videomaker' ) . '</h3>
<h3 class="has-large-font-size" style="font-weight:300">' . esc_html__( 'Mary Han is a award-winning creative director, designer, photographer and visual artist based in Singapore.', 'videomaker' ) . '</h3>
<!-- /wp:heading --></div>
<!-- /wp:column --></div>
<!-- /wp:columns -->

View file

@ -13,7 +13,7 @@ return array(
<!-- /wp:spacer -->
<!-- wp:paragraph {"align":"center","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size">' . esc_html__( 'Man Working at Dawn', 'videomaker' ) . '</p>
<p class="has-text-align-center has-large-font-size">' . esc_html__( 'Working at Dawn', 'videomaker' ) . '</p>
<!-- /wp:paragraph -->
<!-- wp:columns {"isStackedOnMobile":false} -->

View file

@ -13,7 +13,7 @@ return array(
<!-- /wp:spacer -->
<!-- wp:paragraph {"align":"center","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"medium"} -->
<p class="has-text-align-center has-medium-font-size" style="line-height:1.3">' . esc_html__( 'Based on the novel Man Working at Dawn” by', 'videomaker' ) . '</p>
<p class="has-text-align-center has-medium-font-size" style="line-height:1.3">' . esc_html__( 'Based on the novel Working at Dawn” by', 'videomaker' ) . '</p>
<!-- /wp:paragraph -->
<!-- wp:paragraph {"align":"center","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"large"} -->
@ -29,7 +29,7 @@ return array(
<!-- /wp:paragraph -->
<!-- wp:paragraph {"align":"center","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size" style="line-height:1.3">' . wp_kses_post( __( 'AUGUSTA SMITH<br>DAN ANDREWS<br>GARY HAN', 'videomaker' ) ) . '</p>
<p class="has-text-align-center has-large-font-size" style="line-height:1.3">' . wp_kses_post( __( 'AUGUSTA SMITH<br>AMBER ANDREWS<br>MARY HAN', 'videomaker' ) ) . '</p>
<!-- /wp:paragraph -->
<!-- wp:spacer {"height":20} -->
@ -41,7 +41,7 @@ return array(
<!-- /wp:paragraph -->
<!-- wp:paragraph {"align":"center","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size" style="line-height:1.3">' . esc_html__( 'GARY HAN', 'videomaker' ) . '</p>
<p class="has-text-align-center has-large-font-size" style="line-height:1.3">' . esc_html__( 'MARY HAN', 'videomaker' ) . '</p>
<!-- /wp:paragraph -->
<!-- wp:spacer {"height":50} -->

View file

@ -31,7 +31,7 @@ return array(
<!-- /wp:paragraph -->
<!-- wp:paragraph {"align":"center","textColor":"foreground","style":{"typography":{"lineHeight":"1"}}} -->
<p class="has-text-align-center has-foreground-color has-text-color" style="line-height:1">' . wp_kses_post( __( 'A Film by <strong>Gary Han</strong>', 'videomaker' ) ) . '</p>
<p class="has-text-align-center has-foreground-color has-text-color" style="line-height:1">' . wp_kses_post( __( 'A Film by <strong>Mary Han</strong>', 'videomaker' ) ) . '</p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->
@ -64,7 +64,7 @@ return array(
<!-- wp:columns {"align":"wide"} -->
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"100%"} -->
<div class="wp-block-column" style="flex-basis:100%"><!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"12px"}}} -->
<p class="has-text-align-center" style="font-size:12px">' . esc_html__( 'Videomaker Collective Presents In Association with HANO Direction by Dan Andrews Screenplay by Augusta Smith Camera Diego Cruz, Helen Smith-Andrews and Dan Andrews Art Philip Mizrahi Production Romana Arakelyan Operators Syd Wyatt and Cameron Madeira Behind the Camera Diego Cruz Color Editing and Post-Production Philip Mizrahi and Tony Sánchez Videomaker Collective Presents In Association with HANO Direction by Dan Andrews Screenplay by Augusta Smith Camera Diego Cruz, Helen Smith-Andrews and Dan Andrews Art Philip Mizrahi Production Romana Arakelyan Operators Syd Wyatt and Cameron Madeira Behind the Camera Diego Cruz Color Editing and Post-Production Philip Mizrahi and Tony Sánchez', 'videomaker' ) . '</p>
<p class="has-text-align-center" style="font-size:12px">' . esc_html__( 'Videomaker Collective Presents In Association with HANO Direction by Amber Andrews Screenplay by Augusta Smith Camera Diego Cruz, Helen Smith-Andrews and Amber Andrews Art Philip Mizrahi Production Romana Arakelyan Operators Syd Wyatt and Cameron Madeira Behind the Camera Diego Cruz Color Editing and Post-Production Philip Mizrahi and Tony Sánchez Videomaker Collective Presents In Association with HANO Direction by Amber Andrews Screenplay by Augusta Smith Camera Diego Cruz, Helen Smith-Andrews and Amber Andrews Art Philip Mizrahi Production Romana Arakelyan Operators Syd Wyatt and Cameron Madeira Behind the Camera Diego Cruz Color Editing and Post-Production Philip Mizrahi and Tony Sánchez', 'videomaker' ) . '</p>
<!-- /wp:paragraph --></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></div>

View file

@ -17,7 +17,7 @@ return array(
<!-- wp:column -->
<div class="wp-block-column"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":1.4}},"fontSize":"extra-small"} -->
<p class="has-text-align-right has-extra-small-font-size" style="line-height:1.4">'. esc_html__( '© Gary Han 2021', 'videomaker' ) . '<br>' . esc_html__( 'Creative Director', 'videomaker' ) . '</p>
<p class="has-text-align-right has-extra-small-font-size" style="line-height:1.4">'. esc_html__( '© Mary Han 2021', 'videomaker' ) . '<br>' . esc_html__( 'Creative Director', 'videomaker' ) . '</p>
<!-- /wp:paragraph --></div>
<!-- /wp:column --></div>
<!-- /wp:columns -->',

View file

@ -38,7 +38,7 @@ return array(
<!-- /wp:embed -->
<!-- wp:heading {"level":4,"className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
<h4 class="wp-embed-aspect-16-9 wp-has-aspect-ratio">' . esc_html__( 'Man Working at Dawn', 'videomaker' ) . '</h4>
<h4 class="wp-embed-aspect-16-9 wp-has-aspect-ratio">' . esc_html__( 'Working at Dawn', 'videomaker' ) . '</h4>
<!-- /wp:heading --></div>
<!-- /wp:column -->

View file

@ -18,7 +18,7 @@ return array(
<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:46.67%"><!-- wp:site-title /-->
<!-- wp:heading {"level":3,"style":{"typography":{"fontWeight":"300"}}} -->
<h3 style="font-weight:300">' . esc_html__( 'Augusta Smith', 'videomaker' ) . '<br>' . esc_html__( 'Dan Andrews', 'videomaker' ) . '<br>' . esc_html__( 'Syd Wyatt', 'videomaker' ) . '<br>' . esc_html__( 'Philip Mizrahi', 'videomaker' ) . '<br>' . esc_html__( 'Tony Sánchez', 'videomaker' ) . '<br>' . esc_html__( 'Romana Arak', 'videomaker' ) . '</h3>
<h3 style="font-weight:300">' . esc_html__( 'Augusta Smith', 'videomaker' ) . '<br>' . esc_html__( 'Amber Andrews', 'videomaker' ) . '<br>' . esc_html__( 'Syd Wyatt', 'videomaker' ) . '<br>' . esc_html__( 'Philip Mizrahi', 'videomaker' ) . '<br>' . esc_html__( 'Tony Sánchez', 'videomaker' ) . '<br>' . esc_html__( 'Romana Arak', 'videomaker' ) . '</h3>
<!-- /wp:heading --></div>
<!-- /wp:column -->

View file

@ -17,7 +17,7 @@ return array(
<!-- /wp:embed -->
<!-- wp:heading {"level":4,"style":{"spacing":{"margin":{"bottom":"10px"}}}} -->
<h4 style="margin-bottom:10px">' . esc_html__( 'Man Working at Dawn', 'videomaker' ) . '</h4>
<h4 style="margin-bottom:10px">' . esc_html__( 'Working at Dawn', 'videomaker' ) . '</h4>
<!-- /wp:heading -->
<!-- wp:paragraph -->

View file

@ -21,7 +21,7 @@ return array(
<!-- wp:group -->
<div class="wp-block-group">
<!-- wp:heading {"level":4} -->
<h4>' . esc_html__( 'Man Working at Dawn', 'videomaker' ) . '</h4>
<h4>' . esc_html__( 'Working at Dawn', 'videomaker' ) . '</h4>
<!-- /wp:heading -->
<!-- wp:paragraph -->

View file

@ -23,7 +23,7 @@ return array(
<div class="wp-block-column">
<!-- wp:heading {"level":4} -->
<h4>' . esc_html__( 'Man Working at Dawn', 'videomaker' ) . '</h4>
<h4>' . esc_html__( 'Working at Dawn', 'videomaker' ) . '</h4>
<!-- /wp:heading -->
</div>

View file

@ -14,6 +14,6 @@ return array(
</div></figure>
<!-- /wp:embed -->
<!-- wp:paragraph {"fontSize":"small"} -->
<p class="has-small-font-size">' . esc_html__( 'As nations under the present system are driven to compete with one another for the markets of the world, and as firms or the captains of industry have to scramble for their share of the profits of the markets, so also have the workers to compete with each other—for livelihood.', 'videomaker' ) . '<br><br><br><br><strong>' . esc_html__( 'Direction', 'videomaker' ) . '</strong><br>' . esc_html__( 'Dan Andrews', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Screenplay', 'videomaker' ) . '</strong><br>' . esc_html__( 'Augusta Smith', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Actors', 'videomaker' ) . '</strong><br>' . esc_html__( 'Akachukwu Elba', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Camera', 'videomaker' ) . '</strong><br>' . esc_html__( 'Diego Cruz, Helen Smith-Andrews and Dan Andrews', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Art', 'videomaker' ) . '</strong><br>' . esc_html__( 'Philip Mizrahi', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Production', 'videomaker' ) . '</strong><br>' . esc_html__( 'Romana Arakelyan', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Operators', 'videomaker' ) . '</strong><br>' . esc_html__( 'Syd Wyatt and Cameron Madeira', 'videomaker' ) . '<br>' . esc_html__( 'Behind the Camera: Diego Cruz', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Color Editing and Post-Production', 'videomaker' ) . '<br></strong>' . esc_html__( 'Philip Mizrahi and Tony Sánchez', 'videomaker' ) . '</p>
<p class="has-small-font-size">' . esc_html__( 'As nations under the present system are driven to compete with one another for the markets of the world, and as firms or the captains of industry have to scramble for their share of the profits of the markets, so also have the workers to compete with each other—for livelihood.', 'videomaker' ) . '<br><br><br><br><strong>' . esc_html__( 'Direction', 'videomaker' ) . '</strong><br>' . esc_html__( 'Amber Andrews', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Screenplay', 'videomaker' ) . '</strong><br>' . esc_html__( 'Augusta Smith', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Actors', 'videomaker' ) . '</strong><br>' . esc_html__( 'Akachukwu Elba', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Camera', 'videomaker' ) . '</strong><br>' . esc_html__( 'Diego Cruz, Helen Smith-Andrews and Amber Andrews', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Art', 'videomaker' ) . '</strong><br>' . esc_html__( 'Philip Mizrahi', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Production', 'videomaker' ) . '</strong><br>' . esc_html__( 'Romana Arakelyan', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Operators', 'videomaker' ) . '</strong><br>' . esc_html__( 'Syd Wyatt and Cameron Madeira', 'videomaker' ) . '<br>' . esc_html__( 'Behind the Camera: Diego Cruz', 'videomaker' ) . '<br><br><strong>' . esc_html__( 'Color Editing and Post-Production', 'videomaker' ) . '<br></strong>' . esc_html__( 'Philip Mizrahi and Tony Sánchez', 'videomaker' ) . '</p>
<!-- /wp:paragraph -->',
);

View file

@ -1,6 +1,6 @@
{
"name": "videomaker",
"version": "1.0.3",
"version": "1.0.5",
"description": "",
"main": "style.css",
"dependencies": {},

View file

@ -120,10 +120,11 @@
"google": "family=Inter:wght@100..900"
},
{
"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
"fontSlug": "system-font",
"fontFamily": "\"Inter\", serif",
"fontSlug": "inter",
"slug": "heading-font",
"name": "Headings (System Font)"
"name": "Headings (Inter)",
"google": "family=Inter:wght@100..900"
}
],
"fontSizes": [

View file

@ -23,4 +23,21 @@ For a variation in that folder `/variations/geologist/geologist-banana`
* Next the contents of `/variations/geologist/geologist-banana` will be copied to `/geologist-banana`
* Lastly the theme.json files in `/geologist` and `/variations/geologist/geologist-banana` will be merged.
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
Any resource in the /variations folder will replace the resources in the source theme (with the exception of theme.json);
### Template Mods
A variation can have a `template-mods.json` file that lists strings in the templates to replace. The use-case this mechanism was build
for was so that the variation theme could have a different header by defining that in one place. There are plenty of gaps in this
implementation but should cover the basic use-cases we need.
The format for this file is:
```
[
{
"from": "STRING TO REPLACE",
"to": "STRING TO BE USED AS REPLACEMENT"
}
]
```