diff --git a/alves/package.json b/alves/package.json
index b06f36b4aa..138d5764ea 100755
--- a/alves/package.json
+++ b/alves/package.json
@@ -1,6 +1,6 @@
{
"name": "alves",
- "version": "1.5.19",
+ "version": "1.5.20",
"description": "Alves",
"bugs": {
"url": "https://github.com/Automattic/themes/issues"
diff --git a/alves/sass/style-child-theme.scss b/alves/sass/style-child-theme.scss
index 84a322e3a6..42c1a21f9a 100644
--- a/alves/sass/style-child-theme.scss
+++ b/alves/sass/style-child-theme.scss
@@ -5,7 +5,7 @@ Author: Automattic
Author URI: https://automattic.com/
Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
Requires at least: WordPress 4.9.6
-Version: 1.5.19
+Version: 1.5.20
License: GNU General Public License v2 or later
License URI: LICENSE
Template: varia
diff --git a/alves/style-editor.css b/alves/style-editor.css
index 784e960c1a..ab89b4f450 100644
--- a/alves/style-editor.css
+++ b/alves/style-editor.css
@@ -297,6 +297,11 @@ object {
max-width: 100%;
}
+/* Center-align getty image embeds */
+.getty.embed.image {
+ display: block !important;
+}
+
/**
* Blocks
* - These styles replace key Gutenberg Block styles for fonts, colors, and
diff --git a/alves/style-rtl.css b/alves/style-rtl.css
index f290446411..63c12681cb 100644
--- a/alves/style-rtl.css
+++ b/alves/style-rtl.css
@@ -1,12 +1,12 @@
@charset "UTF-8";
/*
Theme Name: Alves
-Theme URI: https://github.com/Automattic/themes/varia
+Theme URI: https://wordpress.com/theme/alves
Author: Automattic
Author URI: https://automattic.com/
Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
Requires at least: WordPress 4.9.6
-Version: 1.5.16
+Version: 1.5.19
License: GNU General Public License v2 or later
License URI: LICENSE
Template: varia
@@ -1153,6 +1153,11 @@ object {
max-width: 100%;
}
+/* Center-align getty image embeds */
+.getty.embed.image {
+ display: block !important;
+}
+
/**
* Blocks
* - These styles replace key Gutenberg Block styles for fonts, colors, and
diff --git a/alves/style.css b/alves/style.css
index de73fc306e..fbee3ab8b1 100644
--- a/alves/style.css
+++ b/alves/style.css
@@ -6,7 +6,7 @@ Author: Automattic
Author URI: https://automattic.com/
Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
Requires at least: WordPress 4.9.6
-Version: 1.5.19
+Version: 1.5.20
License: GNU General Public License v2 or later
License URI: LICENSE
Template: varia
@@ -1153,6 +1153,11 @@ object {
max-width: 100%;
}
+/* Center-align getty image embeds */
+.getty.embed.image {
+ display: block !important;
+}
+
/**
* Blocks
* - These styles replace key Gutenberg Block styles for fonts, colors, and
diff --git a/antonia/readme.txt b/antonia/readme.txt
index 2b1d00aaca..277aba6369 100644
--- a/antonia/readme.txt
+++ b/antonia/readme.txt
@@ -12,6 +12,12 @@ Antonia is a theme for selling products with the help of payments block.
== Changelog ==
+= 0.0.4 =
+* Typography fixes (#6260)
+
+= 0.0.3 =
+* Migrate antonia fonts to new Blockbase format (#6268)
+
= 0.0.2 =
* Update theme url (#6076)
diff --git a/antonia/style.css b/antonia/style.css
index 4075cf1217..be8863d24b 100644
--- a/antonia/style.css
+++ b/antonia/style.css
@@ -7,7 +7,7 @@ Description: Antonia is a theme for selling products with the help of payments b
Requires at least: 5.8
Tested up to: 5.9
Requires PHP: 5.7
-Version: 0.0.2
+Version: 0.0.4
License: GNU General Public License v2 or later
License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
Template: blockbase
diff --git a/antonia/theme.json b/antonia/theme.json
index d26a851f11..3cbf0009d1 100644
--- a/antonia/theme.json
+++ b/antonia/theme.json
@@ -11,13 +11,15 @@
"blocks": {
"core/heading": {
"typography": {
+ "fontFamily": "var:preset|font-family|dm-sans",
"fontStyle": "normal",
- "lineHeight": "1.4",
- "fontWeight": "300"
+ "lineHeight": "1.3",
+ "fontWeight": "700"
}
},
"core/post-title": {
"typography": {
+ "fontFamily": "var:preset|font-family|dm-sans",
"lineHeight": "1.4"
}
},
@@ -28,6 +30,7 @@
}
},
"typography": {
+ "fontFamily": "var:preset|font-family|inter",
"fontStyle": "normal",
"fontWeight": "400",
"fontSize": "var:preset|font-size|small"
@@ -69,24 +72,6 @@
"name": "Tertiary"
}
]
- },
- "typography": {
- "fontFamilies": [
- {
- "fontFamily": "\"Inter\", sans-serif",
- "slug": "body-font",
- "name": "Body (Inter)",
- "google": "family=Inter:wght@100..900",
- "fontSlug": "inter"
- },
- {
- "fontFamily": "\"DM Sans\", sans-serif",
- "slug": "heading-font",
- "name": "Heading (DM Sans)",
- "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700",
- "fontSlug": "dm-sans"
- }
- ]
}
}
}
diff --git a/appleton/readme.txt b/appleton/readme.txt
index e911b92dfb..4c5b1cd418 100644
--- a/appleton/readme.txt
+++ b/appleton/readme.txt
@@ -12,6 +12,9 @@ Appleton is a theme for creative professionals, such as photographers, designers
== Changelog ==
+= 0.0.5 =
+* Blockbase 3 (#6167)
+
= 0.0.4 =
* Appleton: Fix case on screenshot.png file. (#6051)
diff --git a/appleton/style.css b/appleton/style.css
index 5d8dc2f98a..ccb8d2881b 100644
--- a/appleton/style.css
+++ b/appleton/style.css
@@ -7,7 +7,7 @@ Description: Appleton is a theme for creative professionals, such as photographe
Requires at least: 5.8
Tested up to: 5.9
Requires PHP: 5.7
-Version: 0.0.4
+Version: 0.0.5
License: GNU General Public License v2 or later
License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
Template: blockbase
diff --git a/appleton/theme.json b/appleton/theme.json
index cbc99c7007..48995a603a 100644
--- a/appleton/theme.json
+++ b/appleton/theme.json
@@ -28,6 +28,7 @@
}
},
"typography": {
+ "fontFamily": "var:preset|font-family|inter",
"fontStyle": "normal",
"fontWeight": "400",
"fontSize": "var:preset|font-size|small"
@@ -74,24 +75,6 @@
"name": "Tertiary"
}
]
- },
- "typography": {
- "fontFamilies": [
- {
- "fontFamily": "\"Inter\", sans-serif",
- "slug": "body-font",
- "name": "Body (Inter)",
- "google": "family=Inter:wght@100..900",
- "fontSlug": "inter"
- },
- {
- "fontFamily": "\"Inter\", sans-serif",
- "slug": "heading-font",
- "name": "Heading (Inter)",
- "google": "family=Inter:wght@100..900",
- "fontSlug": "inter"
- }
- ]
}
}
}
diff --git a/arbutus/block-templates/page.html b/arbutus/block-templates/page.html
index 7e9321180f..22959f79a4 100644
--- a/arbutus/block-templates/page.html
+++ b/arbutus/block-templates/page.html
@@ -3,7 +3,7 @@
' . __( 'Color customization for this theme is now available exclusively in the Full Site Editor Global Styles panel.
Featured Palettes can now be found in the Full Site Editor as Theme Variations.', 'blockbase' ) . '
' . __( 'Your theme needs to be updated before you can customize fonts', 'blockbase' ) . '
-' . $this->generate_deprecation_message() . '
+Proudly Powered by WordPress
- + ', ); diff --git a/blockbase/inc/social-navigation.php b/blockbase/inc/social-navigation.php index a7f8517143..ad0a64d8a7 100644 --- a/blockbase/inc/social-navigation.php +++ b/blockbase/inc/social-navigation.php @@ -13,8 +13,21 @@ function blockbase_condition_to_render_social_menu( $block_content, $block ) { return false; } - // The block should have a social links attribute. - if ( empty( $block['attrs']['__unstableSocialLinks'] ) ) { + // The block should have an unstable location attribute. + if ( empty( $block['attrs']['__unstableLocation'] ) ) { + return false; + } + + // The block should be empty (no custom menu assigned) + if ( ! empty( $block['attrs']['navigationMenuId'] ) || ! empty( $block['attrs']['ref'] ) ) { + return false; + } + + // The block should have the class 'social-links'. + if ( empty( $block['attrs']['className'] ) ) { + return false; + } + if ( ! str_contains( $block['attrs']['className'], 'social-links' ) ) { return false; } @@ -31,11 +44,8 @@ function blockbase_theme_has_navigation_social_links_settings( $theme_data ) { } function get_social_menu_as_social_links_block( $block ) { - if ( empty( $block['attrs']['__unstableSocialLinks'] ) ) { - return false; - } - $social_links_location = $block['attrs']['__unstableSocialLinks']; + $social_links_location = 'social'; $nav_menu_locations = get_nav_menu_locations(); $social_menu_id = $nav_menu_locations[ $social_links_location ]; $class_name = 'is-style-logos-only'; diff --git a/blockbase/package.json b/blockbase/package.json index 2903e6b83f..b3deab2828 100644 --- a/blockbase/package.json +++ b/blockbase/package.json @@ -1,6 +1,6 @@ { "name": "blockbase", - "version": "2.0.39", + "version": "3.0.2", "description": "Blank Parent Theme", "bugs": { "url": "https://github.com/Automattic/themes/issues/new?label=[Theme]%20Blockbase" diff --git a/blockbase/block-template-parts/footer.html b/blockbase/parts/footer.html similarity index 100% rename from blockbase/block-template-parts/footer.html rename to blockbase/parts/footer.html diff --git a/blockbase/block-template-parts/header-centered.html b/blockbase/parts/header-centered.html similarity index 100% rename from blockbase/block-template-parts/header-centered.html rename to blockbase/parts/header-centered.html diff --git a/blockbase/block-template-parts/header-default.html b/blockbase/parts/header-default.html similarity index 76% rename from blockbase/block-template-parts/header-default.html rename to blockbase/parts/header-default.html index b06304df99..630a0355f3 100644 --- a/blockbase/block-template-parts/header-default.html +++ b/blockbase/parts/header-default.html @@ -16,7 +16,7 @@ - + diff --git a/blockbase/block-template-parts/header-linear.html b/blockbase/parts/header-linear.html similarity index 83% rename from blockbase/block-template-parts/header-linear.html rename to blockbase/parts/header-linear.html index d8e51191cc..ba575ec8a5 100644 --- a/blockbase/block-template-parts/header-linear.html +++ b/blockbase/parts/header-linear.html @@ -16,7 +16,7 @@ - + diff --git a/blockbase/block-template-parts/header-minimal.html b/blockbase/parts/header-minimal.html similarity index 86% rename from blockbase/block-template-parts/header-minimal.html rename to blockbase/parts/header-minimal.html index 658d6587aa..859b2f54a0 100644 --- a/blockbase/block-template-parts/header-minimal.html +++ b/blockbase/parts/header-minimal.html @@ -18,7 +18,7 @@ - + diff --git a/blockbase/block-template-parts/header-rounded-logo.html b/blockbase/parts/header-rounded-logo.html similarity index 82% rename from blockbase/block-template-parts/header-rounded-logo.html rename to blockbase/parts/header-rounded-logo.html index a7635dd0fa..6be4ced97c 100644 --- a/blockbase/block-template-parts/header-rounded-logo.html +++ b/blockbase/parts/header-rounded-logo.html @@ -16,7 +16,7 @@ - + diff --git a/blockbase/block-template-parts/header-wide.html b/blockbase/parts/header-wide.html similarity index 77% rename from blockbase/block-template-parts/header-wide.html rename to blockbase/parts/header-wide.html index 0ac41cc372..88ab3ee22c 100644 --- a/blockbase/block-template-parts/header-wide.html +++ b/blockbase/parts/header-wide.html @@ -16,7 +16,7 @@ - + diff --git a/blockbase/block-template-parts/header.html b/blockbase/parts/header.html similarity index 100% rename from blockbase/block-template-parts/header.html rename to blockbase/parts/header.html diff --git a/blockbase/block-template-parts/post-meta-icons.html b/blockbase/parts/post-meta-icons.html similarity index 100% rename from blockbase/block-template-parts/post-meta-icons.html rename to blockbase/parts/post-meta-icons.html diff --git a/blockbase/block-template-parts/post-meta.html b/blockbase/parts/post-meta.html similarity index 100% rename from blockbase/block-template-parts/post-meta.html rename to blockbase/parts/post-meta.html diff --git a/blockbase/patterns/comments.php b/blockbase/patterns/comments.php new file mode 100644 index 0000000000..433344a4bc --- /dev/null +++ b/blockbase/patterns/comments.php @@ -0,0 +1,61 @@ + + +Proudly Powered by WordPress
- -Club 6 West 25th St, NY 10010
+info@cl.ub
+ + + ++12345678910
+Powered by WordPress
+ + + + +