Skip to content

Commit 265d616

Browse files
committed
MAGETWO-35616: Frontend themes variables inheritance update & documentation update
- Category list product links color adjustment
1 parent e9d5632 commit 265d616

File tree

4 files changed

+59
-51
lines changed

4 files changed

+59
-51
lines changed

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,28 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@product-name-text-decoration: none;
7-
@product-name-text-decoration-hover: @link__hover__text-decoration;
6+
//
7+
// Variables
8+
// ---------------------------------------------
9+
10+
@product-name-link__color: @text__color;
11+
@product-name-link__color__active: @text__color;
12+
@product-name-link__color__hover: @text__color;
13+
@product-name-link__color__visited: @text__color;
14+
15+
@product-name-link__text-decoration: none;
16+
@product-name-link__text-decoration__active: @link__hover__text-decoration;
17+
@product-name-link__text-decoration__hover: @link__hover__text-decoration;
18+
@product-name-link__text-decoration__visited: @link__hover__text-decoration;
19+
20+
//
821

922
//
1023
// Common
1124
//--------------------------------------
1225

1326
& when (@media-common = true) {
1427

15-
.product-name() {
16-
font-weight: @font-weight__regular;
17-
> a {
18-
.link(
19-
@_link-color: @text__color,
20-
@_link-text-decoration: @product-name-text-decoration,
21-
@_link-color-visited: @text__color,
22-
@_link-text-decoration-visited: @product-name-text-decoration,
23-
@_link-color-hover: @text__color,
24-
@_link-text-decoration-hover: @product-name-text-decoration-hover,
25-
@_link-color-active: @text__color,
26-
@_link-text-decoration-active: @product-name-text-decoration-hover
27-
);
28-
}
29-
}
30-
3128
// Product Lists
3229
.products {
3330
margin: @indent__l 0;
@@ -46,7 +43,7 @@
4643
&:extend(.abs-add-box-sizing all);
4744

4845
&-name {
49-
.product-name();
46+
&:extend(.abs-product-link all);
5047
display: block;
5148
margin: @indent__xs 0;
5249
word-break: break-all;

app/design/frontend/Magento/blank/web/css/source/_extends.less

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,19 @@
246246
// ---------------------------------------------
247247

248248
.abs-product-link {
249-
.link(
250-
@_link-color: @color-gray19,
251-
@_link-color-hover: @color-gray19,
252-
@_link-color-active: @color-gray19,
253-
@_link-color-visited: @color-gray19
254-
);
249+
font-weight: @font-weight__regular;
250+
> a {
251+
.link(
252+
@_link-color: @product-name-link__color,
253+
@_link-text-decoration: @product-name-link__text-decoration,
254+
@_link-color-visited: @product-name-link__color__visited,
255+
@_link-text-decoration-visited: @product-name-link__text-decoration__visited,
256+
@_link-color-hover: @product-name-link__color__hover,
257+
@_link-text-decoration-hover: @product-name-link__text-decoration__hover,
258+
@_link-color-active: @product-name-link__color__active,
259+
@_link-text-decoration-active: @product-name-link__text-decoration__active
260+
);
261+
}
255262
}
256263

257264
//

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,28 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@product-name-text-decoration: none;
7-
@product-name-text-decoration-hover: @link__hover__text-decoration;
6+
//
7+
// Variables
8+
// ---------------------------------------------
9+
10+
@product-name-link__color: @text__color;
11+
@product-name-link__color__active: @text__color;
12+
@product-name-link__color__hover: @text__color;
13+
@product-name-link__color__visited: @text__color;
14+
15+
@product-name-link__text-decoration: none;
16+
@product-name-link__text-decoration__active: @link__hover__text-decoration;
17+
@product-name-link__text-decoration__hover: @link__hover__text-decoration;
18+
@product-name-link__text-decoration__visited: @link__hover__text-decoration;
19+
20+
//
821

922
//
1023
// Common
1124
//--------------------------------------
1225

1326
& when (@media-common = true) {
1427

15-
.product-name() {
16-
font-weight: @font-weight__regular;
17-
> a {
18-
.link(
19-
@_link-color: @text__color,
20-
@_link-text-decoration: @product-name-text-decoration,
21-
@_link-color-visited: @text__color,
22-
@_link-text-decoration-visited: @product-name-text-decoration,
23-
@_link-color-hover: @text__color,
24-
@_link-text-decoration-hover: @product-name-text-decoration-hover,
25-
@_link-color-active: @text__color,
26-
@_link-text-decoration-active: @product-name-text-decoration-hover
27-
);
28-
}
29-
}
30-
3128
// Product Lists
3229
.products {
3330
margin: @indent__l 0;
@@ -45,11 +42,11 @@
4542
&:extend(.abs-add-box-sizing all);
4643

4744
&-name {
48-
.product-name();
45+
&:extend(.abs-product-link all);
4946
display: block;
5047
margin: @indent__xs 0;
5148
word-break: break-all;
52-
// Non standard for webkit
49+
// Non standard for webkit
5350
word-break: break-word;
5451
-webkit-hyphens: auto;
5552
-moz-hyphens: auto;

app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,19 @@
249249
// Product link
250250
//--------------------------------------
251251
.abs-product-link {
252-
.link(
253-
@_link-color: @color-gray19,
254-
@_link-color-hover: @color-gray19,
255-
@_link-color-active: @color-gray19,
256-
@_link-color-visited: @color-gray19
257-
);
252+
font-weight: @font-weight__regular;
253+
> a {
254+
.link(
255+
@_link-color: @product-name-link__color,
256+
@_link-text-decoration: @product-name-link__text-decoration,
257+
@_link-color-visited: @product-name-link__color__visited,
258+
@_link-text-decoration-visited: @product-name-link__text-decoration__visited,
259+
@_link-color-hover: @product-name-link__color__hover,
260+
@_link-text-decoration-hover: @product-name-link__text-decoration__hover,
261+
@_link-color-active: @product-name-link__color__active,
262+
@_link-text-decoration-active: @product-name-link__text-decoration__active
263+
);
264+
}
258265
}
259266

260267
//

0 commit comments

Comments
 (0)