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

Images aren't displayed in combinations #10169

Merged
merged 4 commits into from Aug 30, 2018

Conversation

Projects
None yet
4 participants
@PierreRambaud
Contributor

PierreRambaud commented Aug 28, 2018

Questions Answers
Branch? develop
Description? Images aren't displayed in combinations, also fix flex for prev and next arrow and the capability to move to infinite and beyond.
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? Fixes #9556
How to test? Follow ticket instruction.

This change is Reviewable

@@ -45,7 +45,7 @@
<a class="dropdown-item" data-item="{l s='Customers'} {l s='by name'}" href="#" data-value="2" data-placeholder="{l s='Email, name...'}" data-icon="icon-group"><i class="material-icons">group</i> {l s='Customers'} {l s='by name'}</a>
<a class="dropdown-item" data-item="{l s='Customers'} {l s='by ip address'}" href="#" data-value="6" data-placeholder="{l s='123.45.67.89'}" data-icon="icon-desktop"><i class="material-icons">desktop_mac</i> {l s='Customers'} {l s='by IP address'}</a>
<a class="dropdown-item" data-item="{l s='Orders'}" href="#" data-value="3" data-placeholder="{l s='Order ID'}" data-icon="icon-credit-card"><i class="material-icons">shopping_basket</i> {l s='Orders'}</a>
<a class="dropdown-item" data-item="{l s='Invoices'}" href="#" data-value="4" data-placeholder="{l s='Invoice Number'}" data-icon="icon-book"><i class="material-icons">book</i></i> {l s='Invoices'}</a>
<a class="dropdown-item" data-item="{l s='Invoices'}" href="#" data-value="4" data-placeholder="{l s='Invoice Number'}" data-icon="icon-book"><i class="material-icons">book</i> {l s='Invoices'}</a>

This comment has been minimized.

@PierreRambaud

PierreRambaud Aug 28, 2018

Contributor

Just remove a useless </i>

@PierreRambaud

PierreRambaud Aug 28, 2018

Contributor

Just remove a useless </i>

@matks

matks approved these changes Aug 30, 2018

@matks matks merged commit 6dae020 into PrestaShop:develop Aug 30, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@PierreRambaud PierreRambaud deleted the PierreRambaud:fix/boom-6116 branch Aug 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment