Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
faisal-alvi committed Apr 20, 2022
2 parents 7c05f50 + dd98554 commit 5116c15
Show file tree
Hide file tree
Showing 43 changed files with 6,063 additions and 38,569 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "@10up/eslint-config"
}
"extends": "@10up/eslint-config/wordpress"
}
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ develop, trunk ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]
schedule:
- cron: '31 23 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
25 changes: 21 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Linting

env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"

on:
push:
branches:
Expand Down Expand Up @@ -32,15 +36,28 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/[email protected]
- name: Set standard 10up cache directories
run: |
composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
- name: Prepare composer cache
uses: actions/cache@v2
with:
path: ${{ env.COMPOSER_CACHE }}
key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
composer-${{ env.COMPOSER_VERSION }}-
- name: Set PHP version
uses: shivammathur/setup-php@v1
uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
coverage: none
tools: prestissimo, composer:v2
- name: composer install
run: composer install
run: composer install --ignore-platform-reqs
- name: Check PHPCS standard
run: ./vendor/bin/phpcs -i
- name: PHPCS check
uses: chekalsky/phpcs-action@v1
with:
phpcs_bin_path: './vendor/bin/phpcs .'
phpcs_bin_path: './vendor/bin/phpcs . --runtime-set testVersion 7.0-'
32 changes: 32 additions & 0 deletions .github/workflows/php-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: PHP Compatibility

on:
push:
branches:
- develop
- trunk
pull_request:
branches:
- develop

jobs:
php_compatibility:
name: PHP minimum 7.0
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: 7.2
tools: composer:v2
coverage: none

- name: Install dependencies
run: composer update -W

- name: Check PHP Compatibility
run: vendor/bin/phpcs -p publisher-media-kit.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.0
27 changes: 24 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,35 @@

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/).

## [Unreleased]
## [1.1.0] - 2022-03-24
### 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))

## [1.0.0] - 2021-12-09
### Changed
- WP Version bump to 5.9 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@sudip-10up](https://github.com/sudip-10up), [@ankitguptaindia](https://github.com/ankitguptaindia) via [#64](https://github.com/10up/publisher-media-kit/pull/64))
- Compatible tabs with the upstream version 1.0.2 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#81](https://github.com/10up/publisher-media-kit/pull/81))

### Fixed
- Fix responsive issues of media kit page (props [@mehidi258](https://github.com/mehidi258), [@sudip-10up](https://github.com/sudip-10up) [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#52](https://github.com/10up/publisher-media-kit/pull/52))
- Fix eslint errors (props [@mehidi258](https://github.com/mehidi258), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#61](https://github.com/10up/publisher-media-kit/pull/61))
- Fix editor styles to match frontend design (props [@mehidi258](https://github.com/mehidi258), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#58](https://github.com/10up/publisher-media-kit/pull/58))
- Fix audience profiles border width (props [@mehidi258](https://github.com/mehidi258), [@Sidsector9](https://github.com/Sidsector9), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#59](https://github.com/10up/publisher-media-kit/pull/59))
- Tab Title is editable from below the tab (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc), [@kdo](https://github.com/kdo), [@jeffpaul](https://github.com/jeffpaul) via [#63](https://github.com/10up/publisher-media-kit/pull/63))

### Removed
- The Orientation Options are removed (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#65](https://github.com/10up/publisher-media-kit/pull/65))

### Security
- Bump `nanoid` from 3.1.25 to 3.2.0 (props [@dependabot](https://github.com/apps/dependabot) via [#67](https://github.com/10up/publisher-media-kit/pull/67))
- Bump `follow-redirects` from 1.14.4 to 1.14.8 (props [@dependabot](https://github.com/apps/dependabot) via [#68](https://github.com/10up/publisher-media-kit/pull/68) & [#69](https://github.com/10up/publisher-media-kit/pull/69))
- Bump `url-parse` from 1.5.3 to 1.5.10 (props [@dependabot](https://github.com/apps/dependabot) via [#70](https://github.com/10up/publisher-media-kit/pull/70) & [#71](https://github.com/10up/publisher-media-kit/pull/71))

## [1.0.0] - 2021-12-10
- Initial public plugin release 🎉

## [0.9.0] - 2021-12-01
- Initial private plugin release 🎉

[Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop
[1.0.0]: https://github.com/10up/publisher-media-kit/compare/0.9.0...1.0.0
[0.9.0]: https://github.com/10up/publisher-media-kit/tree/0.9.0
[0.9.0]: https://github.com/10up/publisher-media-kit/tree/0.9.0
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).
[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).

## Libraries

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> Pre-configured Media Kit Page using Gutenberg Block Patterns.
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Linting](https://github.com/10up/publisher-media-kit/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/publisher-media-kit/actions/workflows/lint.yml) [![Release Version](https://img.shields.io/github/release/10up/publisher-media-kit.svg)](https://github.com/10up/publisher-media-kit/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.8%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/publisher-media-kit.svg)](https://github.com/10up/publisher-media-kit/blob/develop/LICENSE.md)
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![E2E Tests](https://github.com/10up/publisher-media-kit/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/publisher-media-kit/actions/workflows/cypress.yml) [![Linting](https://github.com/10up/publisher-media-kit/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/publisher-media-kit/actions/workflows/lint.yml) ![PHPCompatibility](https://github.com/10up/publisher-media-kit/actions/workflows/php-compatibility.yml/badge.svg) [![Release Version](https://img.shields.io/github/release/10up/publisher-media-kit.svg)](https://github.com/10up/publisher-media-kit/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/publisher-media-kit?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/publisher-media-kit.svg)](https://github.com/10up/publisher-media-kit/blob/develop/LICENSE.md)

## Overview

Expand Down
3 changes: 3 additions & 0 deletions assets/css/admin/admin-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@

/* Components */
@import url("../frontend/components/index.css");

/* Editor specific styles */
@import url("./editor-style.css");
7 changes: 7 additions & 0 deletions assets/css/admin/editor-style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.wp-admin .wp-block-group.pmk-stats .wp-block-column {
margin: var(--pmk-spacing-10);
}

.editor-styles-wrapper {
overflow-x: hidden;
}
1 change: 1 addition & 0 deletions assets/css/frontend/components/audience-profiles.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ div.wp-block-group.pmk-audience-profiles {
font-weight: var(--pmk-font-weight-normal);
line-height: var(--pmk-heading-2-line-height);
margin-bottom: var(--pmk-spacing-internal-xlarge);
max-width: initial !important; /* !important to override base styles */
padding-bottom: var(--pmk-spacing-internal-xsmall);
}

Expand Down
16 changes: 13 additions & 3 deletions assets/css/frontend/components/our-packages.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ div.wp-block-group.pmk-packages {
color: var(--pmk-global-color-primary);
margin-bottom: var(--pmk-spacing-components);

@media (--wp-small) and (--wp-medium-max) {

.wp-block-column:not(:only-child) {
flex-basis: calc(50% - 1.5em) !important; /* !important to override column styles */
flex-grow: 1;
}
}

& .wp-block-group__inner-container {

@mixin has-full-width-background;
Expand All @@ -28,14 +36,16 @@ div.wp-block-group.pmk-packages {
flex-wrap: wrap;
}

& .pmk-packages-columns {
justify-content: center;
}

& .wp-block-column {
display: flex;
flex-direction: column;
font-size: var(--pmk-text-small-font-size);
line-height: var(--pmk-text-small-line-height);
margin: var(--pmk-spacing-internal-small);
min-width: 300px;


@mixin has-box-shadow;

padding: var(--pmk-spacing-internal-large) var(--pmk-spacing-internal-medium) var(--pmk-spacing-internal-xlarge);
Expand Down
61 changes: 12 additions & 49 deletions assets/css/frontend/components/question-block.css
Original file line number Diff line number Diff line change
@@ -1,65 +1,28 @@
div.wp-block-group.pmk-question-block {
background-color: var(--pmk-global-color-background-focus);
color: var(--pmk-global-color-text-on-background);
padding: 20px 0;
text-align: center;

@media (--bp-medium) {
& .wp-block-group__inner-container {
align-items: center;
display: flex;
flex-wrap: wrap;
justify-content: center;
}

& .wp-block-columns {
align-items: center;
display: flex;
flex-direction: column;
justify-content: center;
padding: var(--pmk-spacing-internal-large);

@media (--bp-medium) {
flex-direction: row;
}
}

& .wp-block-column {
margin: 0;
& h2 {
display: inline-block;
font-size: var(--pmk-l-font-size);
margin: 10px 20px !important; /* !important to override base style */
}

& .wp-block-group__inner-container,
& .wp-block-columns {

@media (--bp-medium) {
flex-grow: 1;
}
}
& .wp-block-buttons {
display: inline-flex;
margin: 0 !important; /* !important to override base style */

& .pmk-question-left {
align-items: center;
display: flex;
font-weight: var(--pmk-font-weight-normal);
margin-bottom: var(--pmk-spacing-internal-large);
text-align: center;

@media (--bp-medium) {
flex-grow: 2;
justify-content: flex-end;
& .wp-block-button {
margin-bottom: 0;
margin-right: var(--pmk-spacing-internal-large);
text-align: left;
}
}

& .pmk-question-right {

@media (--bp-medium) {
flex-grow: 1;
}
}

& h2 {
font-weight: var(--pmk-font-weight-normal);
}

& .wp-block-button {
margin-bottom: 0;
}
}
8 changes: 8 additions & 0 deletions assets/css/frontend/components/stats.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ div.wp-block-group.pmk-stats {
margin-top: 0;
position: relative;

@media (--wp-small) and (--wp-medium-max) {

.wp-block-column:not(:only-child) {
flex-basis: calc(50% - 1.5em) !important; /* !important to override column styles */
flex-grow: 0;
}
}

& .wp-block-group__inner-container {

@mixin has-full-width-background;
Expand Down
Loading

0 comments on commit 5116c15

Please sign in to comment.