Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/2.27.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ofrankowska committed Jun 14, 2022
2 parents 1c3099a + afa8de1 commit 26ceba0
Show file tree
Hide file tree
Showing 137 changed files with 12,776 additions and 11,308 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Snowdog_Components/build/**
Snowdog_Components/dest/**
web/jquery.js
web/fotorama/**
web/magnifier/**
20 changes: 10 additions & 10 deletions Amasty_GiftCardAccount/web/template/account/codes.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<div class="dashboard-table__header">
<h2 class="dashboard-table__title">
<text args="$t('Gift Codes')"/>
<text args="$t('Gift Codes')"></text>
</h2>
</div>
<div class="dashboard-table__content">
Expand All @@ -22,7 +22,7 @@ <h2 class="dashboard-table__title">
role="table"
>
<caption class="table-caption table__caption">
<text args="$t('Gift Codes')"/>
<text args="$t('Gift Codes')"></text>
</caption>
<thead>
<tr role="row">
Expand All @@ -31,14 +31,14 @@ <h2 class="dashboard-table__title">
scope="col"
class="col code"
>
<text args="$t('Code')"/>
<text args="$t('Code')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col status"
>
<text args="$t('Status')"/>
<text args="$t('Status')"></text>
</th>
<!-- ko foreach: getRegion('extra-column-header') -->
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -48,22 +48,22 @@ <h2 class="dashboard-table__title">
scope="col"
class="col balance"
>
<text args="$t('Current Balance')"/>
<text args="$t('Current Balance')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col expired-date"
>
<text args="$t('Valid Till')"/>
<text args="$t('Valid Till')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col expired-date"
if="$data.isAccount"
>
<text args="$t('Action')"/>
<text args="$t('Action')"></text>
</th>
</tr>
</thead>
Expand All @@ -74,13 +74,13 @@ <h2 class="dashboard-table__title">
attr="'data-th': $t('Code')"
class="col code"
>
<text args="code"/>
<text args="code"></text>
</td>
<td
attr="'data-th': $t('Status')"
class="col status"
>
<text args="status"/>
<text args="status"></text>
</td>
<!-- ko foreach: $parent.getRegion('extra-column') -->
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -94,7 +94,7 @@ <h2 class="dashboard-table__title">
attr="'data-th': $t('Valid Till')"
class="col expired-date"
>
<text args="expiredDate"/>
<text args="expiredDate"></text>
</td>
<td
class="col actions"
Expand Down
46 changes: 46 additions & 0 deletions Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="1column"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<body>
<referenceBlock
name="contentmanager_contentlist"
template="Blackbird_ContentManager::content/view/articles/list.phtml"
>
<block
class="Magento\Framework\View\Element\Template"
name="blog-thumbnail"
template="Magento_Theme::html/picture.phtml"
/>
<block class="Blackbird\ContentManager\Block\Filter" name="blog-filter">
<action method="setFilters">
<argument name="filters" xsi:type="array">
<item name="1" xsi:type="string">cb_article_category</item>
</argument>
</action>
<action method="setCtType">
<argument name="type" xsi:type="string">articles</argument>
</action>
</block>
<block
class="Blackbird\ContentManager\Block\Content\Widget\ContentList"
name="recent-articles"
>
<action method="setCtType">
<argument name="type" xsi:type="string">articles</argument>
</action>
<action method="setOrderField">
<argument name="order_field" xsi:type="string">cb_article_date</argument>
</action>
<action method="setSortOrder">
<argument name="sort_order" xsi:type="string">DESC</argument>
</action>
<action method="setLimitDisplay">
<argument name="limit_display" xsi:type="string">6</argument>
</action>
</block>
</referenceBlock>
</body>
</page>
46 changes: 46 additions & 0 deletions Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="1column"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<body>
<referenceBlock
name="contentmanager_view"
template="Blackbird_ContentManager::content/view/articles/view.phtml"
>
<block
class="Magento\Framework\View\Element\Template"
name="article-image"
template="Magento_Theme::html/picture.phtml"
/>
<block class="Blackbird\ContentManager\Block\Filter" name="blog-filter">
<action method="setFilters">
<argument name="filters" xsi:type="array">
<item name="1" xsi:type="string">cb_article_category</item>
</argument>
</action>
<action method="setCtType">
<argument name="type" xsi:type="string">articles</argument>
</action>
</block>
<block
class="Blackbird\ContentManager\Block\Content\Widget\ContentList"
name="recent-articles"
>
<action method="setCtType">
<argument name="type" xsi:type="string">articles</argument>
</action>
<action method="setOrderField">
<argument name="order_field" xsi:type="string">cb_article_date</argument>
</action>
<action method="setSortOrder">
<argument name="sort_order" xsi:type="string">DESC</argument>
</action>
<action method="setLimitDisplay">
<argument name="limit_display" xsi:type="string">6</argument>
</action>
</block>
</referenceBlock>
</body>
</page>
13 changes: 13 additions & 0 deletions Blackbird_ContentManager/layout/catalogsearch_result_index.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="2columns-left"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<body>
<referenceBlock
name="search.content.result"
remove="true"
/>
</body>
</page>
130 changes: 130 additions & 0 deletions Blackbird_ContentManager/layout/cms_index_index.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<update handle="cms_page_view" />
<body>
<referenceContainer name="content" htmlClass="home">
<!-- Main slider -->
<container
name="section.home.slider"
htmlTag="section"
htmlClass="section section--secondary"
before="-"
>
<container
name="section.home.slider.content"
htmlTag="div"
htmlClass="section__content"
>
<block
class="Blackbird\ContentManager\Block\Content\Widget\ContentList"
name="home-slider"
template="Blackbird_ContentManager::content/view/sliders/list.phtml"
>
<arguments>
<argument name="slider_picture_block" xsi:type="string">homepage-picture</argument>
<argument name="slider_block" xsi:type="string">homepage-slider</argument>
<argument name="lazy" xsi:type="boolean">false</argument>
</arguments>
<action method="setCtType">
<argument name="type" xsi:type="string">sliders</argument>
</action>
<action method="setPager">
<argument name="pager" xsi:type="boolean">false</argument>
</action>
<action method="setLimitDisplay">
<argument name="limit_display" xsi:type="string">1</argument>
</action>
<action method="addAttributeToFilter">
<argument name="attribute" xsi:type="string">cb_slider_id</argument>
<argument name="condition" xsi:type="string">eq</argument>
<argument name="value" xsi:type="string">home-slider</argument>
</action>

<block
class="Magento\Framework\View\Element\Template"
name="homepage-picture"
template="Magento_Theme::html/picture.phtml"
/>

<block
class="Magento\Framework\View\Element\Template"
name="homepage-slider"
template="Magento_Theme::html/slider.phtml"
/>
</block>
</container>
</container>


<!-- Top brands (slider) -->
<container
name="home-brands-section"
htmlTag="section"
htmlClass="section"
before="home-content"
>
<container
name="home-brands-container"
htmlTag="div"
htmlClass="section__content"
>
<block
class="Blackbird\ContentManager\Block\Content\Widget\ContentList"
name="brands-slider"
template="Blackbird_ContentManager::content/view/sliders/list.phtml"
>
<arguments>
<argument name="slider_picture_block" xsi:type="string">brand-picture</argument>
<argument name="slider_block" xsi:type="string">brand-slider</argument>
<argument name="slider_class" xsi:type="string">slider--brands</argument>
<argument
name="slider_title_class"
xsi:type="string"
>
heading heading--first-level margin-0
</argument>
</arguments>
<action method="setCtType">
<argument name="type" xsi:type="string">sliders</argument>
</action>
<action method="setPager">
<argument name="pager" xsi:type="boolean">false</argument>
</action>
<action method="setLimitDisplay">
<argument name="limit_display" xsi:type="string">1</argument>
</action>
<action method="addAttributeToFilter">
<argument name="attribute" xsi:type="string">cb_slider_id</argument>
<argument name="condition" xsi:type="string">eq</argument>
<argument name="value" xsi:type="string">brands-slider</argument>
</action>

<block
class="Magento\Framework\View\Element\Template"
name="brand-picture"
template="Magento_Theme::html/picture.phtml"
/>

<block
class="Magento\Framework\View\Element\Template"
name="brand-slider"
template="Magento_Theme::html/slider.phtml"
>
<arguments>
<argument
name="slider_title_class"
xsi:type="string"
>
heading heading--first-level margin-0
</argument>
</arguments>
</block>
</block>
</container>
</container>
</referenceContainer>
</body>
</page>
10 changes: 10 additions & 0 deletions Blackbird_ContentManager/layout/contentmanager_index_content.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="1column"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<head>
<remove src="Blackbird_ContentManager::css/content.css"/>
</head>
</page>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="1column"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<head>
<remove src="Blackbird_ContentManager::css/content.css"/>
</head>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ $recentArticles = $recentArticlesBlock->getCollection();
<section class="article-item__container row">
<div class="article-item__media col-lg-4">
<a
href="<?= $block->escapeUrl($link) ?>"
class="banner article-item__banner"
href="<?= $block->escapeUrl($link) ?>"
class="banner article-item__banner"
>
<?= $block->getChildHtml('blog-thumbnail', false); ?>
</a>
Expand Down
Loading

2 comments on commit 26ceba0

@vercel
Copy link

@vercel vercel bot commented on 26ceba0 Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

alpaca-docs – ./docs

alpaca-docs-snowdog1.vercel.app
alpaca-docs-git-master-snowdog1.vercel.app
magento2-alpaca-docs.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 26ceba0 Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.