Skip to content

Commit

Permalink
Merge branch 'develop' into package-lock/version2
Browse files Browse the repository at this point in the history
  • Loading branch information
emeaguiar committed Jun 1, 2021
2 parents a03a4f9 + b731d37 commit c179e14
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion plugin/assets/fonts/icons.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugin/material-design.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Material Design
* Plugin URI: https://github.com/material-components/material-design-for-wordpress
* Description: The official Material Design plugin for WordPress. Customize your site’s navigation, colors, typography, and shapes, use Material Components, and choose from over 1,000 Google Fonts and Material Design icons. From the team behind Google’s open-source design system.
* Version: 0.2.0
* Version: 0.3.0
* Author: Material Design
* Author URI: http://material.io
* License: Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion plugin/php/block-patterns/logos.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

return [
'title' => __( 'Logos', 'material-design' ),
'content' => "<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\" /></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image -->\n<figure class=\"wp-block-image size-large\"><img src=\"$logo\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns -->",
'content' => "<!-- wp:group {\"align\":\"wide\"} -->\n<div class=\"wp-block-group alignwide\"><div class=\"wp-block-group__inner-container\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":4} -->\n<h4 class=\"has-text-align-center\">Trusted by our beloved clients</h4>\n<!-- /wp:heading -->\n\n<!-- wp:columns {\"align\":\"wide\"} -->\n<div class=\"wp-block-columns alignwide\"><!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large is-style-default\"} -->\n<figure class=\"wp-block-image size-large is-style-default\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"className\":\"size-large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"http://localhost:8088/wp-content/plugins/material-design/assets/images/logo-place-holder.png\" alt=\"\"/></figure>\n<!-- /wp:image --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div></div>\n<!-- /wp:group -->",
'viewportWidth' => 800,
'categories' => [ 'material' ],
'description' => __( 'Logos pattern.', 'material-design' ),
Expand Down
2 changes: 1 addition & 1 deletion plugin/php/block-patterns/pricing.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

return [
'title' => __( 'Pricing', 'material-design' ),
'content' => "<!-- wp:group -->\n<div class=\"wp-block-group\"><div class=\"wp-block-group__inner-container\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":4} -->\n<h4 class=\"has-text-align-center\">Pricing</h4>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Perform this action in no time, Satisfaction guaranteed.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column {\"width\":\"\"} -->\n<div class=\"wp-block-column\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":5} -->\n<h5 class=\"has-text-align-center\">Price title</h5>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Price Subtitle Description.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\",\"style\":{\"color\":{\"background\":\"#f0f0f0\"},\"typography\":{\"fontSize\":26}}} -->\n<p class=\"has-text-align-center has-background\" style=\"background-color:#f0f0f0;font-size:26px\">$ 9.99 / mo</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">First feature included<br>Second feature included<br>Third feature included<br>Fourth feature included<br>Fifth feature included</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:material/buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-material-buttons aligncenter\"><!-- wp:material/button {\"iconPosition\":\"none\"} -->\n<div class=\"wp-block-material-button\" id=\"block-material-button-0\"><button class=\"mdc-button mdc-button--raised\"><div class=\"mdc-button__ripple\"></div><span class=\"mdc-button__label\">But now</span></button></div>\n<!-- /wp:material/button --></div>\n<!-- /wp:material/buttons --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":5} -->\n<h5 class=\"has-text-align-center\">Price title</h5>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Price Subtitle Description.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\",\"style\":{\"typography\":{\"fontSize\":26},\"color\":{\"background\":\"#f0f0f0\"}}} -->\n<p class=\"has-text-align-center has-background\" style=\"background-color:#f0f0f0;font-size:26px\">$ 9.99 / mo</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">First feature included<br>Second feature included<br>Third feature included<br>Fourth feature included<br>Fifth feature included</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:material/buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-material-buttons aligncenter\"><!-- wp:material/button {\"iconPosition\":\"none\"} -->\n<div class=\"wp-block-material-button\" id=\"block-material-button-0\"><button class=\"mdc-button mdc-button--raised\"><div class=\"mdc-button__ripple\"></div><span class=\"mdc-button__label\">But now</span></button></div>\n<!-- /wp:material/button --></div>\n<!-- /wp:material/buttons --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div></div>\n<!-- /wp:group -->", // phpcs:ignore WordPressVIPMinimum.Security.Mustache.OutputNotation
'content' => "<!-- wp:group -->\n<div class=\"wp-block-group\"><div class=\"wp-block-group__inner-container\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":4} -->\n<h4 class=\"has-text-align-center\">Pricing</h4>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Perform this action in no time, Satisfaction guaranteed.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column {\"width\":\"\"} -->\n<div class=\"wp-block-column\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":5} -->\n<h5 class=\"has-text-align-center\">Price title</h5>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Price Subtitle Description.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\",\"style\":{\"color\":{\"background\":\"#f0f0f0\"},\"typography\":{\"fontSize\":26}}} -->\n<p class=\"has-text-align-center has-background\" style=\"background-color:#f0f0f0;font-size:26px\">$ 9.99 / mo</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">First feature included<br>Second feature included<br>Third feature included<br>Fourth feature included<br>Fifth feature included</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:material/buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-material-buttons aligncenter\"><!-- wp:material/button {\"iconPosition\":\"none\"} -->\n<div class=\"wp-block-material-button\" id=\"block-material-button-0\"><button class=\"mdc-button mdc-button--raised\"><div class=\"mdc-button__ripple\"></div><span class=\"mdc-button__label\">Buy now</span></button></div>\n<!-- /wp:material/button --></div>\n<!-- /wp:material/buttons --></div>\n<!-- /wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:heading {\"textAlign\":\"center\",\"level\":5} -->\n<h5 class=\"has-text-align-center\">Price title</h5>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">Price Subtitle Description.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\",\"style\":{\"typography\":{\"fontSize\":26},\"color\":{\"background\":\"#f0f0f0\"}}} -->\n<p class=\"has-text-align-center has-background\" style=\"background-color:#f0f0f0;font-size:26px\">$ 9.99 / mo</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph {\"align\":\"center\"} -->\n<p class=\"has-text-align-center\">First feature included<br>Second feature included<br>Third feature included<br>Fourth feature included<br>Fifth feature included</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:material/buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-material-buttons aligncenter\"><!-- wp:material/button {\"iconPosition\":\"none\"} -->\n<div class=\"wp-block-material-button\" id=\"block-material-button-0\"><button class=\"mdc-button mdc-button--raised\"><div class=\"mdc-button__ripple\"></div><span class=\"mdc-button__label\">Buy now</span></button></div>\n<!-- /wp:material/button --></div>\n<!-- /wp:material/buttons --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div></div>\n<!-- /wp:group -->", // phpcs:ignore WordPressVIPMinimum.Security.Mustache.OutputNotation
'viewportWidth' => 800,
'categories' => [ 'material' ],
'description' => __( 'Pricing pattern with 2 product description.', 'material-design' ),
Expand Down
11 changes: 6 additions & 5 deletions plugin/readme.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

<!-- DO NOT EDIT THIS FILE; it is auto-generated from readme.txt -->
# Material Design for WordPress

![Banner](wp-assets/banner-1544x500.png)
The official Material Design plugin for WordPress. Customize your site’s navigation, colors, typography, and shapes, use Material Components, and choose from over 1,000 Google Fonts and Material Design icons. From the team behind Google’s open-source design system.

**Contributors:** [google](https://profiles.wordpress.org/google), [materialdesign](https://profiles.wordpress.org/materialdesign), [xwp](https://profiles.wordpress.org/xwp)
**Requires at least:** 5.2
**Tested up to:** 5.7
**Stable tag:** 0.2.0
**License:** [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
**Contributors:** [google](https://profiles.wordpress.org/google), [materialdesign](https://profiles.wordpress.org/materialdesign), [xwp](https://profiles.wordpress.org/xwp)
**Requires at least:** 5.2
**Tested up to:** 5.7.2
**Stable tag:** 0.3.0
**License:** [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)

## Description ##

Expand Down
4 changes: 2 additions & 2 deletions plugin/readme.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
=== Material Design for WordPress ===
Contributors: google, materialdesign, xwp
Requires at least: 5.2
Tested up to: 5.7
Stable tag: 0.2.0
Tested up to: 5.7.2
Stable tag: 0.3.0
License: Apache License, Version 2.0
License URI: https://www.apache.org/licenses/LICENSE-2.0

Expand Down
12 changes: 6 additions & 6 deletions theme/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
![Banner](wp-assets/banner-1544x500.png)
The official Material Design Theme for WordPress.

**Contributors:** [google](https://profiles.wordpress.org/google), [materialdesign](https://profiles.wordpress.org/materialdesign), [xwp](https://profiles.wordpress.org/xwp)
**Requires at least:** 5.0
**Tested up to:** 5.7
**Stable tag:** 0.2.0
**License:** [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
**Requires PHP:** 5.6
**Contributors:** [google](https://profiles.wordpress.org/google), [materialdesign](https://profiles.wordpress.org/materialdesign), [xwp](https://profiles.wordpress.org/xwp)
**Requires at least:** 5.0
**Tested up to:** 5.7.2
**Stable tag:** 0.3.0
**License:** [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
**Requires PHP:** 5.6

## Description ##

Expand Down
2 changes: 1 addition & 1 deletion theme/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: google, materialdesign, xwp
Requires at least: 5.0
Tested up to: 5.6
Requires PHP: 5.6
Stable tag: 0.2.0
Stable tag: 0.3.0
License: Apache License, Version 2.0
License URI: https://www.apache.org/licenses/LICENSE-2.0

Expand Down
4 changes: 2 additions & 2 deletions theme/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Theme URI: https://github.com/material-components/material-design-for-wordpress
Author: Material Design
Author URI: https://material.io/
Description: The official Material Design theme for WordPress – from the team behind Google’s open-source design system. Apply Material Design principles and Material Theming to your site, and customize its style. Pair this with the official Material Design for WordPress plugin to customize your site’s navigation, colors, typography, and shapes, use Material Components, and choose from over 1,000 Google Fonts and Material Design icons.
Version: 0.2.0
Version: 0.3.0
License: Apache License, Version 2.0
License URI: https://www.apache.org/licenses/LICENSE-2.0
Text Domain: material-design-google
Tested up to: 5.7
Tested up to: 5.7.2
Requires PHP: 5.6
Tags: blog, custom-colors, custom-logo, custom-menu, featured-images, full-width-template, one-column, threaded-comments, accessibility-ready, footer-widgets, editor-style, sticky-post, translation-ready, rtl-language-support, block-styles, wide-blocks
Expand Down

0 comments on commit c179e14

Please sign in to comment.