Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
# Conflicts:
#	readme.txt
  • Loading branch information
faisal-alvi committed Jun 27, 2022
2 parents 6a84c3e + d636a8b commit 46070a2
Show file tree
Hide file tree
Showing 13 changed files with 5,238 additions and 13,199 deletions.
1 change: 1 addition & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/bin
/node_modules
/tests
/assets

# Files
.distignore
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v1
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,18 @@

All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/). Moving forward, this project will (more strictly) adhere to [Semantic Versioning](http://semver.org/).

## [1.1.0] - 2022-03-24
## [1.2.0] - 2022-06-27
### Added
- Dependency security scanning. (props [@jeffpaul.](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84))

### Changed
- Bump WordPress "tested up to" version 6.0. (props [@ajmaurya99](https://github.com/ajmaurya99), [@faisal-alvi](https://github.com/faisal-alvi), [@vikrampm1](https://github.com/vikrampm1) via [#83](https://github.com/10up/publisher-media-kit/pull/83))

### Security
- Upgrade 10up-toolkit to v4 (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@Sidsector9](https://github.com/Sidsector9) via [#85](https://github.com/10up/publisher-media-kit/pull/85))
- Bump eventsource from 1.1.0 to 1.1.1 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@jeffpaul](https://github.com/jeffpaul) via [#86](https://github.com/10up/publisher-media-kit/pull/86))

## [1.1.0] - 2022-04-20
### Added
- Added mobile styling and fixed linting errors (props [@cldhmmr](https://github.com/cldhmmr), [@treykane](https://github.com/treykane), [@faisal-alvi](https://github.com/faisal-alvi), [@sudip-10up](https://github.com/sudip-10up), [@jeffpaul](https://github.com/jeffpaul) via [#72](https://github.com/10up/publisher-media-kit/pull/72))

Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [@cldhmmr](https://github.com/cldhmmr), [Trey Kane @treykane](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [@sudip-10up](https://github.com/sudip-10up), [Karine (@kdo)](https://github.com/kdo).
[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [@cldhmmr](https://github.com/cldhmmr), [Trey Kane @treykane](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [@sudip-10up](https://github.com/sudip-10up), [Karine (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1).

## Libraries

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Twenty Twenty One default theme | Newspack base theme

## Requirements

* PHP 7.2+
* WordPress 5.4+
* PHP Requires: 7.0
* WordPress Requires at least: 5.5

## Theme Compatibility

Expand Down
2 changes: 1 addition & 1 deletion includes/block-patterns/audience-profiles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
// phpcs:ignoreFile
?>
<!-- wp:group {"align":"wide","className":"pmk-audience-profiles"} --><div class="wp-block-group alignwide pmk-audience-profiles"><!-- wp:heading {"textAlign":"center","level":2} --><h2 class="has-text-align-center">Audience Profiles</h2><!-- /wp:heading --><!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide"><!-- wp:column --><div class="wp-block-column"><!-- wp:image {"align":"center","width":60,"height":137} --><div id="block-ad47cc21-f741-4805-a4d7-85e15762d9d9" class="wp-block-image"><figure class="aligncenter is-resized"><img src="/wp-content/plugins/publisher-media-kit/assets/images/icon-woman.png" alt="Female visitors" width="60" height="137"/></figure></div><!-- /wp:image --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center" id="block-80c8c75b-6f07-4ca5-a041-fe48703c3e56">The average female visitor is<br><strong>38 years old</strong></p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column --><div class="wp-block-column"><!-- wp:image {"align":"center","width":60,"height":137} --><div id="block-7db2072f-dbec-47c8-afdb-8e3c78404377" class="wp-block-image"><figure class="aligncenter is-resized"><img src="/wp-content/plugins/publisher-media-kit/assets/images/icon-man.png" alt="Male visitors" width="60" height="137"/></figure></div><!-- /wp:image --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center" id="block-5faaca4c-38a7-4e2f-aee3-a7312df7cd8f">The average male visitor is<br><strong>52 years old</strong></p><!-- /wp:paragraph --></div><!-- /wp:column --></div><!-- /wp:columns --></div><!-- /wp:group -->
<!-- wp:group {"align":"wide","className":"pmk-audience-profiles"} --><div class="wp-block-group alignwide pmk-audience-profiles"><!-- wp:heading {"textAlign":"center","level":2} --><h2 class="has-text-align-center">Audience Profiles</h2><!-- /wp:heading --><!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide"><!-- wp:column --><div class="wp-block-column"><!-- wp:image {"align":"center","width":60,"height":137} --><div id="block-ad47cc21-f741-4805-a4d7-85e15762d9d9" class="wp-block-image"><figure class="aligncenter is-resized"><img src="/wp-content/plugins/publisher-media-kit/dist/images/icon-woman.png" alt="Female visitors" width="60" height="137"/></figure></div><!-- /wp:image --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center" id="block-80c8c75b-6f07-4ca5-a041-fe48703c3e56">The average female visitor is<br><strong>38 years old</strong></p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column --><div class="wp-block-column"><!-- wp:image {"align":"center","width":60,"height":137} --><div id="block-7db2072f-dbec-47c8-afdb-8e3c78404377" class="wp-block-image"><figure class="aligncenter is-resized"><img src="/wp-content/plugins/publisher-media-kit/dist/images/icon-man.png" alt="Male visitors" width="60" height="137"/></figure></div><!-- /wp:image --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center" id="block-5faaca4c-38a7-4e2f-aee3-a7312df7cd8f">The average male visitor is<br><strong>52 years old</strong></p><!-- /wp:paragraph --></div><!-- /wp:column --></div><!-- /wp:columns --></div><!-- /wp:group -->
2 changes: 1 addition & 1 deletion includes/block-patterns/cover-esperanza.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
// phpcs:ignoreFile
?>
<!-- wp:cover {"url":"/wp-content/plugins/publisher-media-kit/assets/images/cover-image.jpeg","id":17,"align":"full","className":"pmk-cover"} --><div class="wp-block-cover alignfull has-background-dim pmk-cover"><img class="wp-block-cover__image-background wp-image-17" alt="" src="/wp-content/plugins/publisher-media-kit/assets/images/cover-image.jpeg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"textAlign":"center","level":1} --><h1 class="has-text-align-center">Media Kit</h1><!-- /wp:heading --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui<br>tortor, porttitor ut enim non, iaculis sagittis dolor.</p><!-- /wp:paragraph --><!-- wp:buttons {"contentJustification":"center"} --><div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"className":"pmk-button is-style-fill"} --><div class="wp-block-button pmk-button is-style-fill"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div></div><!-- /wp:cover -->
<!-- wp:cover {"url":"/wp-content/plugins/publisher-media-kit/dist/images/cover-image.jpeg","id":17,"align":"full","className":"pmk-cover"} --><div class="wp-block-cover alignfull has-background-dim pmk-cover"><img class="wp-block-cover__image-background wp-image-17" alt="" src="/wp-content/plugins/publisher-media-kit/dist/images/cover-image.jpeg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:heading {"textAlign":"center","level":1} --><h1 class="has-text-align-center">Media Kit</h1><!-- /wp:heading --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui<br>tortor, porttitor ut enim non, iaculis sagittis dolor.</p><!-- /wp:paragraph --><!-- wp:buttons {"contentJustification":"center"} --><div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"className":"pmk-button is-style-fill"} --><div class="wp-block-button pmk-button is-style-fill"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div></div><!-- /wp:cover -->
2 changes: 1 addition & 1 deletion includes/block-patterns/cover.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
// phpcs:ignoreFile
?>
<!-- wp:cover {"url":"/wp-content/plugins/publisher-media-kit/assets/images/cover-image.jpeg","id":17,"align":"full","className":"pmk-cover"} --><div class="wp-block-cover alignfull has-background-dim pmk-cover" style="background-image:url(/wp-content/plugins/publisher-media-kit/assets/images/cover-image.jpeg)"><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center">Media Kit</h2><!-- /wp:heading --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui<br>tortor, porttitor ut enim non, iaculis sagittis dolor.</p><!-- /wp:paragraph --><!-- wp:buttons {"align":"center"} --><div class="wp-block-buttons aligncenter"><!-- wp:button {"className":"pmk-button is-style-fill"} --><div class="wp-block-button pmk-button is-style-fill"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div></div><!-- /wp:cover -->
<!-- wp:cover {"url":"/wp-content/plugins/publisher-media-kit/dist/images/cover-image.jpeg","id":17,"align":"full","className":"pmk-cover"} --><div class="wp-block-cover alignfull has-background-dim pmk-cover" style="background-image:url(/wp-content/plugins/publisher-media-kit/dist/images/cover-image.jpeg)"><div class="wp-block-cover__inner-container"><!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center">Media Kit</h2><!-- /wp:heading --><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui<br>tortor, porttitor ut enim non, iaculis sagittis dolor.</p><!-- /wp:paragraph --><!-- wp:buttons {"align":"center"} --><div class="wp-block-buttons aligncenter"><!-- wp:button {"className":"pmk-button is-style-fill"} --><div class="wp-block-button pmk-button is-style-fill"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div></div><!-- /wp:cover -->
2 changes: 1 addition & 1 deletion includes/block-patterns/why-digital.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
// phpcs:ignoreFile
?>
<!-- wp:group {"align":"wide","className":"pmk-why-digital"} --><div class="wp-block-group alignwide pmk-why-digital"><!-- wp:heading {"level":2} --><h2 class="has-text-align-center">Why you should choose digital</h2><!-- /wp:heading --><!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide"><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-source"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-source"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/assets/images/icon-digital-1.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Source</h3><!-- /wp:heading --><!-- wp:paragraph --><p>10up is the leading news source in Sacramento. Making it Northern California’s GO-TO choice to stay informed on anything news, weather, sports &amp; entertainment.</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-visibility"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-visibility"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/assets/images/icon-digital-2.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Visibility</h3><!-- /wp:heading --><!-- wp:paragraph --><p>All ad units across the site have a viewability percentage of 70% of higher, making “above-the-fold” a thing of the past!</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-measure"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-measure"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/assets/images/icon-digital-3.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Measure</h3><!-- /wp:heading --><!-- wp:paragraph --><p>10up has Measurable ROI! Ads on 10up.com have high click-through percentages against industry benchmark rates.</p><!-- /wp:paragraph --></div><!-- /wp:column --></div><!-- /wp:columns --><!-- wp:buttons {"contentJustification":"center"} --><div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"className":"is-style-fill pmk-button"} --><div class="wp-block-button is-style-fill pmk-button"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div><!-- /wp:group -->
<!-- wp:group {"align":"wide","className":"pmk-why-digital"} --><div class="wp-block-group alignwide pmk-why-digital"><!-- wp:heading {"level":2} --><h2 class="has-text-align-center">Why you should choose digital</h2><!-- /wp:heading --><!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide"><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-source"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-source"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/dist/images/icon-digital-1.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Source</h3><!-- /wp:heading --><!-- wp:paragraph --><p>10up is the leading news source in Sacramento. Making it Northern California’s GO-TO choice to stay informed on anything news, weather, sports &amp; entertainment.</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-visibility"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-visibility"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/dist/images/icon-digital-2.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Visibility</h3><!-- /wp:heading --><!-- wp:paragraph --><p>All ad units across the site have a viewability percentage of 70% of higher, making “above-the-fold” a thing of the past!</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column {"className":"pmk-digital-column pmk-digital-column-measure"} --><div class="wp-block-column pmk-digital-column pmk-digital-column-measure"><!-- wp:image {"align":"left","width":35,"height":35} --><figure class="wp-block-image alignleft is-resized"><img src="/wp-content/plugins/publisher-media-kit/dist/images/icon-digital-3.png" alt="Female visitors" width="35" height="35"/></figure><!-- /wp:image --><!-- wp:heading {"level":3} --><h3>Measure</h3><!-- /wp:heading --><!-- wp:paragraph --><p>10up has Measurable ROI! Ads on 10up.com have high click-through percentages against industry benchmark rates.</p><!-- /wp:paragraph --></div><!-- /wp:column --></div><!-- /wp:columns --><!-- wp:buttons {"contentJustification":"center"} --><div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"className":"is-style-fill pmk-button"} --><div class="wp-block-button is-style-fill pmk-button"><a class="wp-block-button__link">CONTACT US</a></div><!-- /wp:button --></div><!-- /wp:buttons --></div><!-- /wp:group -->
Loading

0 comments on commit 46070a2

Please sign in to comment.