Skip to content
Snippets Groups Projects
Commit e3dfd6a9 authored by Kopylova,Olga(okopylova)'s avatar Kopylova,Olga(okopylova)
Browse files

Merge pull request #16 from magento-webdev/PR-2

[WebDev] Bugfixes
parents 0efa2bc8 37221e98
No related merge requests found
...@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) { ...@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
$advancedLabel = __('Additional Settings'); $advancedLabel = __('Additional Settings');
} }
$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset' . $element->getClass(); $cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
if ($isField) { if ($isField) {
$count = $element->getCountBasicChildren(); $count = $element->getCountBasicChildren();
......
...@@ -80,7 +80,10 @@ ...@@ -80,7 +80,10 @@
<!-- ko if: (isCcDetectionEnabled())--> <!-- ko if: (isCcDetectionEnabled())-->
<ul class="credit-card-types"> <ul class="credit-card-types">
<!-- ko foreach: {data: getCcAvailableTypesValues(), as: 'item'} --> <!-- ko foreach: {data: getCcAvailableTypesValues(), as: 'item'} -->
<li class="item" data-bind="css: {_active: $parent.selectedCardType() == item.value} "> <li class="item" data-bind="css: {
_active: $parent.selectedCardType() == item.value,
_inactive: $parent.selectedCardType() != null && $parent.selectedCardType() != item.value
} ">
<!--ko if: $parent.getIcons(item.value) --> <!--ko if: $parent.getIcons(item.value) -->
<img data-bind="attr: { <img data-bind="attr: {
'src': $parent.getIcons(item.value).url, 'src': $parent.getIcons(item.value).url,
......
...@@ -305,7 +305,7 @@ body._in-resize { ...@@ -305,7 +305,7 @@ body._in-resize {
width: 7rem; width: 7rem;
img { img {
border: 1px solid @data-grid-td__border-color; border: 1px solid @data-grid-td__border-color;
max-width: 5rem; width: 5rem;
} }
} }
.data-grid-multicheck-cell { .data-grid-multicheck-cell {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment