-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🔃 [Magento Community Engineering] Community Contributions - 2.3-devel…
…op latest changes Accepted Community Pull Requests: - #25553: Fixed masonry grid rendering and styles (by @sivaschenko) - #25528: Relocate Watermark insert on image after resize. #25514 (by @Krielkip) - #25473: Fix loose switch comparison when adding links without content types (by @AydinHassan) - #25418: remove script tag (by @torhoehn) - #25354: Added backticks to table names in mysql schema reader. (by @vincenthornikx) Fixed GitHub Issues: - #23515: The display watermark size is incorrect compared to the original watermark images on list product,product page on magento2.3.2 (reported by @jordantran93) has been fixed in #25528 by @Krielkip in 2.3-develop branch Related commits: 1. 85415ef 2. 2263d2e - #25514: Image resizing and watermarking do no take into consideration the relative dimensions of the watermark and watermarked image. (reported by @janssentwh) has been fixed in #25528 by @Krielkip in 2.3-develop branch Related commits: 1. 85415ef 2. 2263d2e - #25050: Product AdditionalOptions "Read more" dots being escaped on invoice/shipment overview pages (reported by @itwebdev2) has been fixed in #25418 by @torhoehn in 2.3-develop branch Related commits: 1. e422942 2. 4b432f8 3. d4cae50 4. 6e36d5e
- Loading branch information
Showing
16 changed files
with
225 additions
and
36 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
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
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 |
|---|---|---|
|
|
@@ -4,3 +4,4 @@ | |
| // */ | ||
|
|
||
| @import 'module/_data-grid.less'; | ||
| @import 'module/_masonry-grid.less'; | ||
108 changes: 108 additions & 0 deletions
108
app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less
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,108 @@ | ||
| // /** | ||
| // * Copyright © Magento, Inc. All rights reserved. | ||
| // * See COPYING.txt for license details. | ||
| // */ | ||
| @admin__masonry_grid_image__space: 20px; | ||
| @admin__masonry_grid_background_color: #fff; | ||
| @admin__masonry_overlay_background_color: #507dc8; | ||
|
|
||
| & when (@media-common = true) { | ||
| .masonry-image { | ||
| &-grid { | ||
| margin: @admin__masonry_grid_image__space/2 -(@admin__masonry_grid_image__space/2); | ||
| overflow: hidden; | ||
| position: relative; | ||
|
|
||
| .no-data-message-container, | ||
| .error-message-container { | ||
| font-size: @data-grid__no-records__font-size; | ||
| padding: @data-grid__no-records__padding; | ||
| text-align: center; | ||
| } | ||
| } | ||
|
|
||
| &-column { | ||
| background-color: @admin__masonry_grid_background_color; | ||
| float: left; | ||
| margin: @admin__masonry_grid_image__space/2; | ||
| overflow: hidden; | ||
|
|
||
| img { | ||
| cursor: pointer; | ||
| height: 100%; | ||
| width: 100%; | ||
| } | ||
| } | ||
|
|
||
| &-overlay { | ||
| background-color: @admin__masonry_overlay_background_color; | ||
| color: @admin__masonry_grid_background_color; | ||
| opacity: 1; | ||
| padding: .5rem; | ||
| position: absolute; | ||
| text-align: center; | ||
| width: 80px; | ||
| z-index: 10; | ||
| } | ||
|
|
||
| &-preview { | ||
| background-color: @admin__masonry_grid_background_color; | ||
| display: table; | ||
| left: 0; | ||
| position: absolute; | ||
| right: 0; | ||
| width: 100%; | ||
|
|
||
| .container { | ||
| margin: auto; | ||
| max-width: 880px; | ||
| padding-top: 10px; | ||
|
|
||
| .action-buttons { | ||
| text-align: right; | ||
|
|
||
| .action { | ||
| &-close { | ||
| padding: 30px; | ||
| position: static; | ||
| } | ||
|
|
||
| &-previous, | ||
| &-next { | ||
| background: transparent; | ||
| border: none; | ||
| margin: 0; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| &-close, | ||
| &-previous, | ||
| &-next { | ||
| font-size: 2rem; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .preview-row-content { | ||
| display: flex; | ||
|
|
||
| &:after { | ||
| clear: both; | ||
| content: ''; | ||
| display: table; | ||
| } | ||
|
|
||
| img.preview { | ||
| display: block; | ||
| flex-basis: 300px; | ||
| float: left; | ||
| margin-bottom: 20px; | ||
| max-height: 500px; | ||
| max-width: 60%; | ||
| width: auto; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.