Skip to content

Commit 2340f4f

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #577 from magento-webdev/MAGETWO-38852-2
[WebDev] Luma Theme default
2 parents 980f658 + 6f689b9 commit 2340f4f

File tree

49 files changed

+862
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+862
-414
lines changed

‎app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
2525
}
2626
}
2727
</script>
28-
<fieldset class="fieldset bundle options">
28+
<fieldset class="fieldset fieldset-bundle-options">
2929
<legend id="customizeTitle" class="legend title">
3030
<span><?php /* @escapeNotVerified */ echo __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
3131
</legend><br />

‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function getValuesHtml()
160160
$count .
161161
'"><span>' .
162162
$_value->getTitle() .
163-
'</span>' .
163+
'</span> ' .
164164
$priceStr .
165165
'</label>';
166166
$selectHtml .= '</div>';

‎app/code/Magento/CatalogSearch/view/frontend/layout/default.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<arguments>
1616
<argument name="label" xsi:type="string">Advanced Search</argument>
1717
<argument name="path" xsi:type="string">catalogsearch/advanced</argument>
18+
<argument name="attributes" xsi:type="array">
19+
<item name="data-action" xsi:type="string">advanced-search</item>
20+
</argument>
1821
</arguments>
1922
</block>
2023
</referenceBlock>

‎app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
1111
?>
1212
<div class="nested">
13-
<a class="action advanced" href="<?php /* @escapeNotVerified */ echo $helper->getAdvancedSearchUrl(); ?>">
13+
<a class="action advanced" href="<?php /* @escapeNotVerified */ echo $helper->getAdvancedSearchUrl(); ?>" data-action="advanced-search">
1414
<?php /* @escapeNotVerified */ echo __('Advanced Search'); ?>
1515
</a>
1616
</div>

‎app/code/Magento/Customer/view/frontend/templates/account/customer.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<span data-bind="text: customer().fullname"></span>
2020
<button type="button"
2121
class="action switch"
22-
tabindex="-1">
22+
tabindex="-1"
23+
data-action="customer-menu-toggle">
2324
<span><?php /* @escapeNotVerified */ echo __('Change')?></span>
2425
</button>
2526
</span>

‎app/code/Magento/Theme/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<type name="Magento\Theme\Model\View\Design">
8383
<arguments>
8484
<argument name="themes" xsi:type="array">
85-
<item name="frontend" xsi:type="string">Magento/blank</item>
85+
<item name="frontend" xsi:type="string">Magento/luma</item>
8686
<item name="adminhtml" xsi:type="string">Magento/backend</item>
8787
</argument>
8888
</arguments>

‎app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/_module.less

Lines changed: 82 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -4,120 +4,121 @@
44
// */
55

66
//
7-
// Common
8-
//--------------------------------------
7+
// Common
8+
// _____________________________________________
99

1010
& when (@media-common = true) {
1111

12-
.bundle-actions {
13-
&:extend(.abs-box-tocart all);
14-
.action.primary {
15-
&:extend(.abs-button-l all);
16-
}
17-
}
18-
19-
.bundle-options-container {
20-
clear: both;
21-
margin-bottom: @indent__xl;
22-
23-
.legend.title {
24-
.lib-heading(h2);
12+
.bundle-actions {
13+
&:extend(.abs-box-tocart all);
14+
.action.primary {
15+
&:extend(.abs-button-l all);
16+
}
2517
}
2618

27-
.product-add-form {
28-
display: none;
29-
}
19+
.bundle-options-container {
20+
clear: both;
21+
margin-bottom: @indent__xl;
3022

31-
.input-text.qty {
32-
&:extend(.abs-input-qty all);
33-
}
23+
.legend.title {
24+
.lib-heading(h2);
25+
}
3426

35-
.product-options-wrapper {
36-
margin-bottom: @indent__l;
37-
}
27+
.product-add-form {
28+
display: none;
29+
}
3830

39-
.action.back {
40-
margin-bottom: @indent__l;
41-
}
31+
.input-text.qty {
32+
&:extend(.abs-input-qty all);
33+
}
4234

43-
.price-box {
44-
.price {
45-
font-weight: @font-weight__bold;
46-
font-size: @font-size__l;
35+
.product-options-wrapper {
36+
margin-bottom: @indent__l;
4737
}
48-
}
4938

50-
.price-notice {
51-
&:extend(.abs-adjustment-incl-excl-tax all);
52-
}
39+
.action.back {
40+
margin-bottom: @indent__l;
41+
}
5342

54-
.block-bundle-summary {
55-
&:extend(.abs-add-box-sizing all);
56-
.lib-css(background, @secondary__color);
57-
padding: @indent__s @indent__base;
43+
.price-box {
44+
.price {
45+
font-size: @font-size__l;
46+
font-weight: @font-weight__bold;
47+
}
48+
}
5849

59-
> .title > strong {
60-
.lib-heading(h2);
50+
.price-notice {
51+
&:extend(.abs-adjustment-incl-excl-tax all);
6152
}
6253

63-
.bundle-summary {
64-
margin-top: @indent__l;
65-
&.empty {
66-
display: none;
54+
.block-bundle-summary {
55+
&:extend(.abs-add-box-sizing all);
56+
.lib-css(background, @secondary__color);
57+
padding: @indent__s @indent__base;
58+
59+
> .title > strong {
60+
.lib-heading(h2);
6761
}
68-
> .subtitle {
69-
.lib-heading(h3);
70-
display: block;
62+
63+
.bundle-summary {
64+
margin-top: @indent__l;
65+
&.empty {
66+
display: none;
67+
}
68+
> .subtitle {
69+
.lib-heading(h3);
70+
display: block;
71+
}
7172
}
72-
}
7373

74-
.bundle.items {
75-
&:extend(.abs-reset-list all);
76-
> li {
77-
margin-bottom: @indent__s;
74+
.bundle.items {
75+
&:extend(.abs-reset-list all);
76+
> li {
77+
margin-bottom: @indent__s;
78+
}
7879
}
79-
}
8080

81-
.box-tocart {
82-
.actions {
83-
margin-bottom: @indent__s;
84-
display: inline-block;
81+
.box-tocart {
82+
.actions {
83+
display: inline-block;
84+
margin-bottom: @indent__s;
85+
}
86+
.action.primary {
87+
&:extend(.abs-button-l all);
88+
}
8589
}
86-
.action.primary {
87-
&:extend(.abs-button-l all);
90+
.product-addto-links {
91+
> .action {
92+
&:extend(.abs-action-addto-product all);
93+
vertical-align: top;
94+
}
8895
}
8996
}
90-
.product-addto-links {
91-
> .action {
92-
&:extend(.abs-action-addto-product all);
93-
vertical-align: top;
97+
.nested {
98+
.field.qty {
99+
.label {
100+
.lib-css(font-weight, @form-field-label__font-weight);
101+
.lib-css(margin, 0 0 @indent__xs);
102+
display: inline-block;
103+
}
104+
.lib-css(margin-top, @form-field__vertical-indent);
94105
}
95106
}
96-
}
97-
.nested {
98-
.field.qty {
99-
.label {
100-
.lib-css(font-weight, @form-field-label__font-weight);
101-
.lib-css(margin, 0 0 @indent__xs);
102-
display: inline-block;
103-
}
104-
.lib-css(margin-top, @form-field__vertical-indent);
107+
p.required {
108+
.lib-css(color, @form-field-label-asterisk__color);
105109
}
106110
}
107-
p.required {
108-
.lib-css(color, @form-field-label-asterisk__color);
109-
}
110-
}
111111

112112
}
113113

114114
//
115-
// Desktop
116-
//--------------------------------------
115+
// Desktop
116+
// _____________________________________________
117+
117118
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
118119
.bundle-options-container {
119120
.legend.title {
120-
&:extend(.abs-reset-left-margin all);
121+
&:extend(.abs-reset-left-margin-desktop all);
121122
}
122123
.bundle-options-wrapper,
123124
.product-options-wrapper {
@@ -126,8 +127,8 @@
126127
}
127128
.block-bundle-summary {
128129
float: right;
129-
width: 40%;
130130
position: relative;
131+
width: 40%;
131132
}
132133
.bundle-options-wrapper,
133134
.block-bundle-summary {

0 commit comments

Comments
 (0)