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

Sync/private repo #7574

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions aldente/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Al Dente is a blog theme perfect for blogs whose posts are categorised, for exam

== Changelog ==

= 1.0.3 =
* Al Dente: Set as inactive (#7414)

= 1.0.2 =
* Al Dente: Change the markup of the sidebar to aside (#7281)

Expand Down
2 changes: 1 addition & 1 deletion aldente/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: Al Dente is a blog theme perfect for blogs whose posts are categori
Requires at least: 6.0
Tested up to: 6.2.2
Requires PHP: 5.7
Version: 1.0.2
Version: 1.0.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: aldente
Expand Down
Binary file modified barnett/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions exmoor/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Exmoor is a business themethat has a landing page style front page.

== Changelog ==

= 1.0.5 =
* Exmoor: Set as inactive (#7415)

= 1.0.4 =
* Small tweaks to force update following `style-variations` tag fix (#7209)

Expand Down
2 changes: 1 addition & 1 deletion exmoor/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: Exmoor is a business theme
Requires at least: 6.0
Tested up to: 6.2
Requires PHP: 5.7
Version: 1.0.4
Version: 1.0.5
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: exmoor
Expand Down
8 changes: 6 additions & 2 deletions lodestar/components/page/content-front-page-panels.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@
$post_thumbnail_id = get_post_thumbnail_id( $post->ID );

$thumbnail_attributes = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'lodestar-featured-image' );
//Calculate aspect ratio: h / w * 100%
$ratio = $thumbnail_attributes[2] / $thumbnail_attributes[1] * 100;

$ratio = 0;
if ( false !== $thumbnail_attributes ) {
//Calculate aspect ratio: h / w * 100%
$ratio = $thumbnail_attributes[2] / $thumbnail_attributes[1] * 100;
}
?>

<div class="panel-image" style="background-image: url(<?php echo esc_url( $thumbnail[0] ); ?>);">
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"deploy:theme": "node ./theme-utils.mjs deploy-theme",
"deploy:zip": "node ./theme-utils.mjs build-com-zip",
"deploy:land": "node ./theme-utils.mjs land-diff",
"pull:all": "node ./theme-utils.mjs pull-all-themes",
"core:pull": "node ./theme-utils.mjs pull-core-themes",
"core:push": "node ./theme-utils.mjs push-core-themes",
"core:sync": "node ./theme-utils.mjs sync-core-theme",
Expand Down
15 changes: 12 additions & 3 deletions radcliffe-2/contact-info/contact-info-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@
*/
function radcliffe_2_contact_info( $section ) {
$location = get_theme_mod( 'radcliffe_2_contact_info_location', 'header' );
$address = get_option( 'site_contact_info' )['address'] ?: get_theme_mod( 'radcliffe_2_contact_info_address', '' );
$phone = get_option( 'site_contact_info' )['phone'] ?: get_theme_mod( 'radcliffe_2_contact_info_phone', '' );
$email = get_option( 'site_contact_info' )['email'] ?: get_theme_mod( 'radcliffe_2_contact_info_email', '' );

$contact = get_option( 'site_contact_info' );
if ( is_array( $contact ) ) {
$address = $contact['address'];
$phone = $contact['phone'];
$email = $contact['email'];
} else {
$address = get_theme_mod( 'radcliffe_2_contact_info_address', '' );
$phone = get_theme_mod( 'radcliffe_2_contact_info_phone', '' );
$email = get_theme_mod( 'radcliffe_2_contact_info_email', '' );
}

$email = $email ? antispambot( $email ) : '';
$hours = get_theme_mod( 'radcliffe_2_contact_info_hours', '' );

Expand Down
25 changes: 18 additions & 7 deletions radcliffe-2/inc/logo-resizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,25 @@ function logo_awesomeness_customize_logo_resize( $html ) {
function logo_awesomeness_min_max( $short, $long, $short_max, $long_max, $percent, $min ){
$max = [];
$size = [];
$ratio = ( $long / $short );
$max['long'] = ( $long_max >= $long ) ? $long : $long_max;
$max['short'] = ( $short_max >= ( $max['long'] / $ratio ) ) ? floor( $max['long'] / $ratio ) : $short_max;

$ppp = ( $max['short'] - $min ) / 100;

$size['short'] = round( $min + ( $percent * $ppp ) );
$size['long'] = round( $size['short'] / ( $short / $long ) );
$ratio = 0;
$max['long'] = 0;
$max['short'] = 0;
$size['short'] = 0;
$size['long'] = 0;
if (
is_int( $long )
&& is_int( $short )
) {
$ratio = ( $long / $short );
$max['long'] = ( $long_max >= $long ) ? $long : $long_max;
$max['short'] = ( $short_max >= ( $max['long'] / $ratio ) ) ? floor( $max['long'] / $ratio ) : $short_max;

$ppp = ( $max['short'] - $min ) / 100;

$size['short'] = round( $min + ( $percent * $ppp ) );
$size['long'] = round( $size['short'] / ( $short / $long ) );
}

return $size;
}
Expand Down
10 changes: 5 additions & 5 deletions seedlet/inc/wpcom.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ function seedlet_wpcom_setup() {

$wpcom_colors_array = get_theme_mod( 'colors_manager' );
if ( ! empty( $wpcom_colors_array ) ) {
$primary = $wpcom_colors_array['colors']['link'];
$secondary = $wpcom_colors_array['colors']['fg1'];
$foreground = $wpcom_colors_array['colors']['txt'];
$tertiary = $wpcom_colors_array['colors']['fg2'];
$background = $wpcom_colors_array['colors']['bg'];
$primary = $wpcom_colors_array['colors']['link'] ?? '';
$secondary = $wpcom_colors_array['colors']['fg1'] ?? '';
$foreground = $wpcom_colors_array['colors']['txt'] ?? '';
$tertiary = $wpcom_colors_array['colors']['fg2'] ?? '';
$background = $wpcom_colors_array['colors']['bg'] ?? '';

/**
* De-register original editor color palette in favor of the wpcom implementation
Expand Down
6 changes: 5 additions & 1 deletion spiel/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ GNU General Public License for more details.

This theme bundles the following third-party resources:

All the images seen on the screenshot.png were generated with AI using Midjourney and DALL-E.
Copy link
Member

Choose a reason for hiding this comment

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

These changes should be kept too, they're from another recent PR: #7554

Newsreader Font
Licensed under SIL Open Font License, 1.1 (http://scripts.sil.org/OFL)
Source: https://fonts.google.com/specimen/Newsreader

All the images seen on the screenshot.png is by Takashi Irie.

Orbitron Font
Copyright 2018 The Orbitron Project Authors (https://github.com/theleagueof/orbitron), with Reserved Font Name: "Orbitron".
Expand Down
3 changes: 3 additions & 0 deletions startfit/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ StartFit is a business theme perfect for a personal fitness training service.

== Changelog ==

= 1.0.3 =
* StartFit: Set as inactive (#7417)

= 1.0.2 =
* StartFit: Remove css font size from Latest Posts block (#7315)
* StartFit: Remove css font sizes from Latest Comments block (#7314)
Expand Down
2 changes: 1 addition & 1 deletion startfit/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: StartFit is a business theme perfect for a personal fitness trainin
Requires at least: 6.0
Tested up to: 6.3
Requires PHP: 5.7
Version: 1.0.2
Version: 1.0.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: startfit
Expand Down
19 changes: 19 additions & 0 deletions theme-utils.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ const commands = {
additionalArgs: '<theme-slug>',
run: (args) => checkoutCoreTheme(args?.[1])
},
"pull-all-themes": {
helpText: 'Use rsync to copy all public theme files from your sandbox to your local machine.',
run: pullAllThemes
},
"pull-core-themes": {
helpText: 'Use rsync to copy all public CORE theme files from your sandbox to your local machine. CORE themes are any of the Twenty<whatever> themes.',
run: pullCoreThemes
Expand Down Expand Up @@ -910,6 +914,21 @@ async function checkoutCoreTheme(theme) {
`);
}

async function pullAllThemes() {
console.log("Pulling ALL themes from sandbox.");
let allThemes = await getActionableThemes();
for (let theme of allThemes) {
try {
await executeCommand(`
rsync -avr --no-p --no-times --delete -m --exclude-from='.sandbox-ignore' wpcom-sandbox:${sandboxPublicThemesFolder}/${theme}/ ./${theme}/
`, true);
}
catch (err) {
console.log('Error pulling:', err);
}
}
}

async function pullCoreThemes() {
console.log("Pulling CORE themes from sandbox.");
for (let theme of coreThemes) {
Expand Down
2 changes: 1 addition & 1 deletion trellick/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @package trellick
* @since trellick 1.0
*/
declare( strict_types = 1 );
Copy link
Member

Choose a reason for hiding this comment

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

I think these changes to Trellick should be kept. They're from this recent PR: #7570



if ( ! function_exists( 'trellick_support' ) ) :

Expand Down
2 changes: 0 additions & 2 deletions trellick/patterns/404.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
* Slug: trellick/404
* Inserter: no
*/
declare( strict_types = 1 );
Copy link
Member

Choose a reason for hiding this comment

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

This should be kept too.

?>

<!-- wp:heading {"level":1,"fontSize":"medium","anchor":"oops-that-page-can-t-be-found"} -->
<h1 class="wp-block-heading has-medium-font-size" id="oops-that-page-can-t-be-found"><?php echo esc_html__( 'Nothing found. Maybe try a search?', 'trellick' ); ?></h1>
<!-- /wp:heading -->
2 changes: 0 additions & 2 deletions trellick/patterns/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
* Block Types: core/template-part/footer
* Inserter: no
*/
declare( strict_types = 1 );
?>

<!-- wp:paragraph {"style":{"spacing":{"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}},"fontSize":"x-small"} -->
<p class="has-x-small-font-size" style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0px"><?php
/* Translators: WordPress link. */
Expand Down
2 changes: 0 additions & 2 deletions trellick/patterns/no-results-content.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
* Slug: trellick/no-results-content
* Inserter: no
*/
declare( strict_types = 1 );
?>

<!-- wp:paragraph -->
<p><?php echo esc_html_x( 'Nothing found. Try again with some different keywords.', 'Message explaining that there are no results returned from a search', 'trellick' ); ?></p>
<!-- /wp:paragraph -->
1 change: 0 additions & 1 deletion trellick/patterns/post-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Slug: trellick/post-list
* Categories: featured
*/
declare( strict_types = 1 );
?>

<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
Expand Down
1 change: 0 additions & 1 deletion trellick/patterns/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Slug: trellick/search
* Inserter: no
*/
declare( strict_types = 1 );
?>

<!-- wp:search {"label":"","showLabel":false,"placeholder":"<?php echo esc_html_x( 'Search...', 'This is a placeholder text in a search field', 'trellick' ); ?>","buttonText":"Search","buttonUseIcon":true} /-->
1 change: 0 additions & 1 deletion trellick/patterns/sidebar.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Slug: trellick/sidebar
* Categories: featured
*/
declare( strict_types = 1 );
?>

<!-- wp:group {"layout":{"type":"default"}} -->
Expand Down
38 changes: 3 additions & 35 deletions trellick/readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=== Trellick ===
Contributors: Automattic
Requires at least: 6.0
Copy link
Member

Choose a reason for hiding this comment

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

All of these changes should be kept.

Tested up to: 6.4
Requires at least: 5.8
Tested up to: 6.2
Requires PHP: 5.7
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -41,36 +41,4 @@ This theme bundles the following third-party resources:

Public Sans Font
Licensed under SIL Open Font License, 1.1 (http://scripts.sil.org/OFL)
Source: https://fonts.google.com/specimen/Public+Sans

"Bumblebee drawing, vintage insect illustration."
Public Domain
https://www.rawpixel.com/image/6327280/image-public-domain-vintage-illustrations-bee

"Plate (ca.1936) by Margaret Stottlemeyer. Original from The National Gallery of Art. Digitally enhanced by rawpixel."
Public Domain
https://www.rawpixel.com/image/3340417/free-illustration-image-vintage-antique-art

"Irises (1890–1900) by Kogyo Tsukioka. Original from The Rijksmuseum. Digitally enhanced by rawpixel."
Public Domain
https://www.rawpixel.com/image/3320287/free-illustration-image-artwork-public-domain-print-cc0

"Roman head with helmet (1876–1924) drawing in high resolution by Gerrit Willem Dijsselhof. Original from the Rijksmuseum. Digitally enhanced by rawpixel."
Public Domain
https://www.rawpixel.com/image/3077149/free-illustration-image-antique-drawing-sculpture

"Space story. Original public domain image from Wikimedia Commons"
Public Domain
https://www.rawpixel.com/image/3283859/free-photo-image-pattern-fractal-space

"Hand drawn rufous milkcap mushroom. Original from Biodiversity Heritage Library. Digitally enhanced by rawpixel."
Public Domain
https://www.rawpixel.com/image/2880233/free-illustration-image-mushroom-watercolor-vintage

"Menselijk oog met een afwijking (1836–1912) print in high resolution by Isaac Weissenbruch. Original from The Rijksmuseum. Digitally enhanced by rawpixel."
Public Domain
https://www.rawpixel.com/image/2742839/free-illustration-image-vintage-eye

"Edgar Degas's Orchestra Musicians (1872) famous painting. Original from Wikimedia Commons."
Public Domain
https://www.rawpixel.com/image/7726921/image-art-public-domain-edgar-degas
Source: https://fonts.google.com/specimen/Public+Sans
21 changes: 10 additions & 11 deletions trellick/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@ Theme URI: https://wordpress.com/theme/trellick/
Author: Automattic
Author URI: https://automattic.com/
Description: Trellick is a raw, brutalist blog theme that strips away the polished veneer of the samey web design to show the untamed essence of the digital realm.
Requires at least: 6.0
Tested up to: 6.4
Requires at least: 5.8
Tested up to: 6.2
Requires PHP: 5.7
Version: 1.0.2
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: trellick
Tags: blog, three-columns, block-patterns, block-styles, featured-images, full-site-editing, rtl-language-support, style-variations, template-editing, translation-ready, one-column, news
*/

/*
Tags: blog, three-columns, wide-blocks, block-patterns, block-styles, custom-background, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, style-variations, template-editing, theme-options, threaded-comments, translation-ready, one-column, news
*//*
* Control the hover stylings of outline block style.
* Unnecessary once block styles are configurable via theme.json
* https://github.com/WordPress/gutenberg/issues/42794
Expand All @@ -35,12 +33,13 @@ a {
}

/*
* Navigation Block
* Reset the padding from List block
* https://github.com/WordPress/gutenberg/issues/50486
* Avatar Block
* Fix border radius setting for the avatar block
* https://github.com/WordPress/gutenberg/issues/48253
*/
.wp-block-navigation ul {
padding: unset;
.wp-block-avatar a,
.wp-block-avatar img {
border-radius: inherit;
}

/*
Expand Down
Loading
Loading