Skip to content

#467 : [Styles] Keywords appearance in the image preview #481

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 27, 2019
Merged

#467 : [Styles] Keywords appearance in the image preview #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
028ec72
Style changes for the keywords
konarshankar07 Sep 25, 2019
cc61b6a
Merge branch 'develop' of github.com:magento/adobe-stock-integration …
sivaschenko Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions AdobeStockImageAdminUi/view/adminhtml/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,50 @@
}

.keywords {

margin: 30px 0;
display: inline-block;
width: 100%;
.title {
margin-top: 10px;
margin-bottom: 30px;
}

.keyword {
display: inline-block;
margin-right: 5px;
line-height: 40px;
&.hide {
display: none;
}

display: inline-block;
margin: 15px 15px 15px 0;

.value {
font-size: 15px;
text-transform: capitalize;
border: 1px solid #c6c1bb;
padding: 5px;
border-radius: 3px;
background-color: #f5f5f5;
color: #666666;
}
}
button {
margin-left: 10px;
}
}

.adobe-stock-tabs {
margin-top: 30px;
}

.adobe-stock-related-images-tab-content {
height: 120px;
height: auto;
vertical-align: middle;
display: inline-block;
width: 100%;
.ui-tabs-panel {
width: 100%;

margin-top: 30px;
padding: 0;
.thumbnail {
display: inline-block;
margin: 10px 10px 10px 0;
vertical-align: middle;
margin-right: 10px;

img {
max-height: 100px;
Expand Down
28 changes: 15 additions & 13 deletions AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/image-preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,9 @@ <h3 class="title" text="$col.getTitle($row())" if="$col.getTitle($row())"/>
</div>
<!-- /ko -->
</div>
<div class="keywords">
<div class="title" translate="'Similar Keywords'"></div>
<!-- ko foreach: $col.getKeywords($row()) -->
<div class="keyword" data-bind="css: { 'hide': $index() >= $col.getKeywordsLimit($row())}">
<a href="" class="value" data-bind="click: function(){ $col.searchByKeyWord(name) }">
<span text="name"/>
</a>
</div>
<!-- /ko -->
<button data-bind="visible: $col.canViewMoreKeywords($row()), click: function(){ $col.viewAllKeywords($row()) }">
<span translate="'View all'"/>
</button>
</div>

<div id="adobe-stock-tabs"
class="adobe-stock-tabs"
data-bind="mageInit: {
'mage/backend/tabs': {
active: 'series_content_' + $row().id,
Expand Down Expand Up @@ -125,5 +114,18 @@ <h3 class="title" text="$col.getTitle($row())" if="$col.getTitle($row())"/>
</div>
</div>
</div>
<div class="keywords">
<div class="title" translate="'Similar Keywords'"></div>
<!-- ko foreach: $col.getKeywords($row()) -->
<div class="keyword" data-bind="css: { 'hide': $index() >= $col.getKeywordsLimit($row())}">
<a href="" class="value" data-bind="click: function(){ $col.searchByKeyWord(name) }">
<span text="name"/>
</a>
</div>
<!-- /ko -->
<button data-bind="visible: $col.canViewMoreKeywords($row()), click: function(){ $col.viewAllKeywords($row()) }">
<span translate="'View all'"/>
</button>
</div>
</div>
</div>