-
Notifications
You must be signed in to change notification settings - Fork 805
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into add/amp-story-opengraph-support
- Loading branch information
Showing
200 changed files
with
5,629 additions
and
3,845 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| "[Status] Needs Package Release": | ||
| - 'packages/*' | ||
| - 'packages/*/*' | ||
| - 'packages/*/*/*' | ||
| - 'packages/*/*/*/*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: Build production to master-built | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| build_master_job: | ||
| runs-on: ubuntu-latest | ||
| name: Build production version of master to master-built branch | ||
| steps: | ||
| - name: Checkout Jetpack | ||
| uses: actions/checkout@master | ||
| - name: Build production files | ||
| run: COMPOSER_MIRROR_PATH_REPOS=1 yarn run build-production | ||
| - name: Purge dev files | ||
| run: $GITHUB_WORKSPACE/bin/prepare-built-branch.sh | ||
| - name: Push to built branch | ||
| id: commit-and-push | ||
| uses: automattic/action-commit-to-branch@master | ||
| with: | ||
| branch: 'master-built' | ||
| commit_message: 'Automated production build from master' | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| name: "Pull Request Labeler" | ||
| on: | ||
| - pull_request | ||
|
|
||
| jobs: | ||
| triage: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/labeler@v2 | ||
| with: | ||
| repo-token: "${{ secrets.GITHUB_TOKEN }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| JetpackLogo | ||
| ======== | ||
|
|
||
| Component that renders the Jetpack SVG logo. | ||
| It consists of the Jetpack symbol followed by the name. | ||
| It takes width and height properties but defaults to 32px in height. | ||
|
|
||
| #### How to use: | ||
|
|
||
| ```js | ||
| <JetpackLogo height={ 48 } className="jp-logo" /> | ||
| ``` | ||
|
|
||
| #### Props | ||
|
|
||
| * `className`: String - (default: `jetpack-logo`) the class name set on the SVG element. | ||
| * `height`: Number - (default: 32) set the height of the logo. | ||
| * `width`: Number - (optional) set the width of the logo. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import PropTypes from 'prop-types'; | ||
| import React from 'react'; | ||
|
|
||
| class JetpackLogo extends React.Component { | ||
| static propTypes = { | ||
| className: PropTypes.string, | ||
| width: PropTypes.number, | ||
| height: PropTypes.number, | ||
| }; | ||
|
|
||
| static defaultProps = { | ||
| className: 'jetpack-logo', | ||
| height: 32, | ||
| }; | ||
|
|
||
| render() { | ||
| return ( | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| x="0px" | ||
| y="0px" | ||
| viewBox="0 0 118 32" | ||
| { ...this.props } | ||
| > | ||
| <path | ||
| fill="#00BE28" | ||
| d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z" | ||
| /> | ||
| <path d="M41.3,26.6c-0.5-0.7-0.9-1.4-1.3-2.1c2.3-1.4,3-2.5,3-4.6V8h-3V6h6v13.4C46,22.8,45,24.8,41.3,26.6z" /> | ||
| <path d="M65,18.4c0,1.1,0.8,1.3,1.4,1.3c0.5,0,2-0.2,2.6-0.4v2.1c-0.9,0.3-2.5,0.5-3.7,0.5c-1.5,0-3.2-0.5-3.2-3.1V12H60v-2h2.1V7.1 H65V10h4v2h-4V18.4z" /> | ||
| <path d="M71,10h3v1.3c1.1-0.8,1.9-1.3,3.3-1.3c2.5,0,4.5,1.8,4.5,5.6s-2.2,6.3-5.8,6.3c-0.9,0-1.3-0.1-2-0.3V28h-3V10z M76.5,12.3 c-0.8,0-1.6,0.4-2.5,1.2v5.9c0.6,0.1,0.9,0.2,1.8,0.2c2,0,3.2-1.3,3.2-3.9C79,13.4,78.1,12.3,76.5,12.3z" /> | ||
| <path d="M93,22h-3v-1.5c-0.9,0.7-1.9,1.5-3.5,1.5c-1.5,0-3.1-1.1-3.1-3.2c0-2.9,2.5-3.4,4.2-3.7l2.4-0.3v-0.3c0-1.5-0.5-2.3-2-2.3 c-0.7,0-2.3,0.5-3.7,1.1L84,11c1.2-0.4,3-1,4.4-1c2.7,0,4.6,1.4,4.6,4.7L93,22z M90,16.4l-2.2,0.4c-0.7,0.1-1.4,0.5-1.4,1.6 c0,0.9,0.5,1.4,1.3,1.4s1.5-0.5,2.3-1V16.4z" /> | ||
| <path d="M104.5,21.3c-1.1,0.4-2.2,0.6-3.5,0.6c-4.2,0-5.9-2.4-5.9-5.9c0-3.7,2.3-6,6.1-6c1.4,0,2.3,0.2,3.2,0.5V13 c-0.8-0.3-2-0.6-3.2-0.6c-1.7,0-3.2,0.9-3.2,3.6c0,2.9,1.5,3.8,3.3,3.8c0.9,0,1.9-0.2,3.2-0.7V21.3z" /> | ||
| <path d="M110,15.2c0.2-0.3,0.2-0.8,3.8-5.2h3.7l-4.6,5.7l5,6.3h-3.7l-4.2-5.8V22h-3V6h3V15.2z" /> | ||
| <path d="M58.5,21.3c-1.5,0.5-2.7,0.6-4.2,0.6c-3.6,0-5.8-1.8-5.8-6c0-3.1,1.9-5.9,5.5-5.9s4.9,2.5,4.9,4.9c0,0.8,0,1.5-0.1,2h-7.3 c0.1,2.5,1.5,2.8,3.6,2.8c1.1,0,2.2-0.3,3.4-0.7C58.5,19,58.5,21.3,58.5,21.3z M56,15c0-1.4-0.5-2.9-2-2.9c-1.4,0-2.3,1.3-2.4,2.9 C51.6,15,56,15,56,15z" /> | ||
| </svg> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default JetpackLogo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import React from 'react'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import analytics from 'lib/analytics'; | ||
| import Button from 'components/button'; | ||
| import Plans from '../plans'; | ||
| import { translate as __ } from 'i18n-calypso'; | ||
| import Gridicon from '../components/gridicon'; | ||
| import JetpackLogo from '../components/jetpack-logo'; | ||
|
|
||
| export class PlansPrompt extends React.Component { | ||
| trackStartWithFreeClick() { | ||
| analytics.tracks.recordJetpackClick( { | ||
| target: 'free-plan', | ||
| feature: 'plans-prompt', | ||
| } ); | ||
| } | ||
|
|
||
| renderBanner() { | ||
| return ( | ||
| <div className="plans-prompt__banner"> | ||
| <JetpackLogo className="plans-prompt__logo" /> | ||
| <h2 className="plans-prompt__heading">{ __( 'Explore our Jetpack plans' ) }</h2> | ||
| <p className="plans-prompt__intro"> | ||
| { __( "Now that you're set up, pick a plan that fits your needs." ) } | ||
| </p> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderFooter() { | ||
| return ( | ||
| <div className="plans-prompt__footer"> | ||
| <Button | ||
| href={ this.props.siteAdminUrl + 'admin.php?page=jetpack' } | ||
| onClick={ this.trackStartWithFreeClick } | ||
| > | ||
| { __( 'Start with free' ) } | ||
| <Gridicon icon={ 'arrow-right' } size={ 18 } /> | ||
| </Button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div className="plans-prompt"> | ||
| { this.renderBanner() } | ||
| <Plans /> | ||
| { this.renderFooter() } | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default PlansPrompt; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| .plans-prompt__banner { | ||
| padding: 32px 0; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .plans-prompt__heading { | ||
| font-size: 22px; | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| .plans-prompt__intro { | ||
| font-size: 14px; | ||
| margin-top: 0.5em; | ||
| } | ||
|
|
||
| .plans-prompt__footer { | ||
| margin: 2em 0; | ||
| text-align: center; | ||
|
|
||
| .dops-button .gridicon { | ||
| padding-left: 4px; | ||
| margin-right: -5px; | ||
| } | ||
| } |
Oops, something went wrong.