-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Add border support to site logo #48354
Closed
Closed
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
3cb7840
Add border support to site logo
carolinan 41cdda1
Update index.php
carolinan 1ea0a5f
Merge branch 'trunk' into add/site-logo-border
carolinan 279019b
Merge branch 'trunk' into add/site-logo-border
carolinan 47125e1
Merge branch 'trunk' into add/site-logo-border
carolinan 53892f4
Merge branch 'trunk' into add/site-logo-border
carolinan b91090f
Merge branch 'trunk' into add/site-logo-border
carolinan 860ad11
Merge branch 'trunk' into add/site-logo-border
carolinan dbf9900
Merge branch 'trunk' into add/site-logo-border
carolinan 6d506b9
Merge branch 'trunk' into add/site-logo-border
carolinan 5602da2
Add a check for the border CSS classes
carolinan 177b072
Add the custom border to the ImageEditor / cropper
carolinan d30eccd
Merge branch 'trunk' into add/site-logo-border
carolinan 1b00379
Merge branch 'trunk' into add/site-logo-border
carolinan 06b939d
Merge branch 'trunk' into add/site-logo-border
carolinan 501fb91
try height: auto, remove border when placeholder is selected
carolinan 882acf6
try to fix linked image width
carolinan 0c5ab73
Move the CSS for the linked image width
carolinan 8a74ce8
Merge branch 'trunk' into add/site-logo-border
carolinan 97b3a40
Merge branch 'trunk' into add/site-logo-border
carolinan c340f86
CS: Rename function name
carolinan 09a0c96
Merge branch 'trunk' into add/site-logo-border
carolinan 549e075
Merge branch 'trunk' into add/site-logo-border
carolinan 2249153
Fix editing tool border color by moving the <a> element
carolinan 0df97a5
Merge branch 'trunk' into add/site-logo-border
carolinan c1d747d
Fix the JavaScript error when the link option is toggled off
carolinan ab6c5d4
Update the <a> image wrapper and editor styles. Add 'has-custom-boder…
carolinan 4f19a03
Merge branch 'trunk' into add/site-logo-border
carolinan 038906b
Add display:table to centered logos
carolinan 5e438e3
Merge branch 'trunk' into add/site-logo-border
carolinan a76a4ac
Code cleanup based on review
carolinan 6bb7388
Merge branch 'trunk' into add/site-logo-border
carolinan 6552759
Merge branch 'trunk' into add/site-logo-border
carolinan db034b7
Merge branch 'trunk' into add/site-logo-border
carolinan 122e4a7
Update editor.scss
carolinan 2e987e5
Try to fix the height difference that occurs when the parent element …
carolinan 17d4c72
Merge branch 'trunk' into add/site-logo-border
carolinan cf4af0d
Remove undefined check for the borderProps.className
carolinan 45702b0
Remove unwanted and duplicate CSS in editor.scss
carolinan 3b94538
Merge branch 'trunk' into add/site-logo-border
carolinan 9c698f5
Simplify the conditions and assignments in block_core_site_logo_get_b…
carolinan 43eabd8
Move the border selector from supports to selectors.
carolinan 3d8c582
Merge branch 'trunk' into add/site-logo-border
carolinan 90cb781
Update style.scss
carolinan 551db7a
Merge branch 'trunk' into add/site-logo-border
carolinan 0d62516
Merge branch 'trunk' into add/site-logo-border
carolinan c879a2e
Merge branch 'trunk' into add/site-logo-border
carolinan cfb275a
Fix coding standard issues
carolinan 33bd8af
Merge branch 'trunk' into add/site-logo-border
carolinan 357bad8
Merge branch 'trunk' into add/site-logo-border
carolinan bc5a7ef
Revert the change to .wp-block-site-logo.aligncenter.
carolinan 635476c
Try to fix merge conflicts, attempt 1
carolinan 97fa100
Merge branch 'trunk' into add/site-logo-border
carolinan 9fbe66f
Merge branch 'trunk' into add/site-logo-border
carolinan 7eadd08
Fix issues after the merge conflict
carolinan 8f91248
Merge branch 'trunk' into add/site-logo-border
carolinan 8b08a4f
Merge branch 'trunk' into add/site-logo-border
carolinan 3aa4a50
Merge branch 'trunk' into add/site-logo-border
carolinan 7aeadef
Merge branch 'trunk' into add/site-logo-border
carolinan d2374e8
Merge branch 'trunk' into add/site-logo-border
carolinan b9008b8
Remove experimental default controls
carolinan b4eb312
Border attributes: Use add_class instead of set_attributes
carolinan 07117f1
Try to remove the CSS classes from the ImageWrapper to test if anythi…
carolinan 46c352b
Show block border styles when the placeholder is selected.
carolinan 31f50cf
WIP: update CSS reduce specificity
carolinan 12cdcf0
Add the size limitation back
carolinan 95f264f
Try resetting the box-sizing on the placeholder.
carolinan 1e7f619
Merge branch 'trunk' into add/site-logo-border
carolinan e0251c7
Merge branch 'trunk' into add/site-logo-border
carolinan 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
Code cleanup based on review
- Loading branch information
commit a76a4ac45bdaaa349ac8d41cd188f87ee97a2202
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
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 |
---|---|---|
|
@@ -20,10 +20,8 @@ | |
max-width: 100%; | ||
} | ||
|
||
&.has-custom-border { | ||
img { | ||
box-sizing: border-box; | ||
} | ||
&.has-custom-border img { | ||
box-sizing: border-box; | ||
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. I found that the border radius from the "rounded" style variation is applied without this CSS, but maybe I missed something in my testing. |
||
} | ||
|
||
// Inherit border radius from style variations. | ||
|
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.
Note: As a follow-up, we'll want to add this style to the Image block as well. The current Image block does not accept mouse operations when the Crop tool is enabled.