mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
[UPMERGE] 1.13 -> 2.0 (#16107)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
This commit is contained in:
commit
a4196c7870
3 changed files with 6 additions and 1 deletions
|
|
@ -1331,3 +1331,7 @@ address {
|
|||
width: 30px !important;
|
||||
padding: 7px 0 !important;
|
||||
}
|
||||
|
||||
.text-break {
|
||||
word-break: break-word;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<div class="ui bottom attached tab segment active" data-tab="details">
|
||||
<div class="ui bottom attached tab segment active text-break" data-tab="details">
|
||||
{{ sylius_template_event('sylius.shop.product.show.tab_details', _context) }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ declare(strict_types=1);
|
|||
|
||||
namespace Sylius\Component\Core;
|
||||
|
||||
/** @deprecated since Sylius 1.13 and will be removed in Sylius 2.0. */
|
||||
interface SyliusLocaleEvents
|
||||
{
|
||||
public const CODE_CHANGED = 'sylius.locale.code_changed';
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue