-
Notifications
You must be signed in to change notification settings - Fork 50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Replace invalid and missing URLs (4136) #3044
Merged
Merged
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
f64a948
✨ Prepare new LearnMore component
stracker-phil d273ad1
💬 Remove trailing space from URLs
stracker-phil 8aee26c
🔀 Merge branch 'trunk'
stracker-phil badef20
🔥 Remove unused prop from BadgeBox
stracker-phil 990b945
✨ Finish the LearnMore component
stracker-phil 77bf406
✨ Add the LearnMore link into BadgeBox
stracker-phil e00a6e1
♻️ Improve readability of SCSS code
stracker-phil c79ed52
🔀 Merge branch 'trunk'
stracker-phil 77badd3
♻️ Move all learn-more links into the new prop
stracker-phil dda23b3
💄 Style the new LearnMore links
stracker-phil 8edbb87
♻️ Extract repeat code into components
stracker-phil b9fc9cd
🔀 Merge branch 'trunk'
stracker-phil 7c41863
🎨 Add whitespace only
stracker-phil 90cce3b
✨ New payment method components
stracker-phil 17f5b9d
♻️ Extract code into separate components
stracker-phil a2ce42b
♻️ Extract repeat code into separate components
stracker-phil a63cf67
♻️ New customizable PaymentFlow component
stracker-phil 9c5b7a1
✨ Add prop for each method’s learn more link
stracker-phil 5035b9d
♻️ Shorten internal payment method name
stracker-phil e7820c4
✨ Add list of learn-more URLs
stracker-phil 0cb6bc4
✨ Display dynamic learn-more links
stracker-phil 9c7535e
♻️ Use new PaymentFlow in StepPaymentMethods
stracker-phil 0894d9e
🔀 Merge branch 'trunk'
stracker-phil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
@@ -1,21 +1,14 @@ | ||
.ppcp-r-badge-box { | ||
margin: 0 0 8px 0; | ||
|
||
&__title { | ||
.ppcp-r-badge-box__title { | ||
@include font(14, 20, 700); | ||
display: block; | ||
margin: 0 0 8px 0; | ||
|
||
.ppcp-r-badge-box__title-text { | ||
@include font(16, 28, 700); | ||
color: #000; | ||
|
||
&--big { | ||
@include font(16, 28, 700); | ||
} | ||
|
||
&--small { | ||
vertical-align: text-bottom; | ||
} | ||
} | ||
|
||
.ppcp-r-badge-box__title-text:not(:empty) + .ppcp-r-badge-box__title-image-badge { | ||
|
@@ -27,25 +20,32 @@ | |
height: 24px; | ||
} | ||
} | ||
} | ||
|
||
&--has-image-badge .ppcp-r-title-badge--info { | ||
display: block; | ||
margin: 6px 0 0 0; | ||
width: fit-content; | ||
} | ||
.ppcp-r-badge-box__title--has-image-badge .ppcp-r-title-badge--info { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
||
display: block; | ||
margin: 6px 0 0 0; | ||
width: fit-content; | ||
} | ||
|
||
.components-button.is-tertiary { | ||
padding: 0; | ||
margin: 0 0 0 4px; | ||
height: 1em; | ||
} | ||
|
||
@media screen and (max-width: 480px) { | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
gap: 8px; | ||
flex-direction: column; | ||
|
||
@media screen and (max-width: 480px) { | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
gap: 8px; | ||
flex-direction: column; | ||
.ppcp-r-badge-box__title-text:not(:empty) + .ppcp-r-badge-box__title-image-badge { | ||
margin: 0; | ||
|
||
.ppcp-r-badge-box__title-text:not(:empty) + .ppcp-r-badge-box__title-image-badge { | ||
img:first-of-type { | ||
margin: 0; | ||
img:first-of-type { | ||
margin: 0; | ||
} | ||
} | ||
} | ||
} | ||
|
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
16 changes: 16 additions & 0 deletions
16
modules/ppcp-settings/resources/js/Components/ReusableComponents/Elements/LearnMore.js
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,16 @@ | ||
import { __ } from '@wordpress/i18n'; | ||
import { Button } from '@wordpress/components'; | ||
|
||
const LearnMore = ( { url } ) => { | ||
if ( ! url || '#' === url ) { | ||
return null; | ||
} | ||
|
||
return ( | ||
<Button href={ url } variant="tertiary" target="_blank"> | ||
{ __( 'Learn more', 'woocommerce-paypal-payments' ) } | ||
</Button> | ||
); | ||
}; | ||
|
||
export default LearnMore; |
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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, maybe I am missing something, but why is this changed ?