Merge remote-tracking branch 'origin/MAGETWO-37722' into PR

Natalia Momotenko · Natalia Momotenko · commit 58f3ca2f3635 · 2015-06-03T16:26:04.000+03:00
diff --git a/app/design/frontend/Magento/blank/web/css/source/_tables.less b/app/design/frontend/Magento/blank/web/css/source/_tables.less
@@ -23,11 +23,13 @@ table {
         @_table_border-width: @table__border-width
     );
     tfoot {
-        > tr:first-child {
-            th,
-            td {
-                border-top: @table__border-width @table__border-style @table__border-color;
-                padding-top: @indent__base;
+        > tr {
+            &:first-child {
+                th,
+                td {
+                    border-top: @table__border-width @table__border-style @table__border-color;
+                    padding-top: @indent__base;
+                }
             }
         }
         .mark {
@@ -85,6 +87,19 @@ table {
                     width: 30%;
                 }
             }
+            &.additional-attributes {
+                tbody {
+                    th {
+                        &:extend(.abs-no-display-s all);
+                    }
+                    td {
+                        &:last-child {
+                            border: none;
+                            padding: 0 0 @indent__xs;
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -524,13 +524,6 @@
         .additional-attributes-wrapper {
             &:extend(.abs-no-border-top all);
         }
-        .additional-attributes {
-            tbody {
-                th {
-                    &:extend(.abs-no-display-s all);
-                }
-            }
-        }
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/web/css/source/_tables.less b/app/design/frontend/Magento/luma/web/css/source/_tables.less
@@ -20,11 +20,13 @@ table {
 .table {
     tfoot {
         .css(background, @sidebar__background-color);
-        > tr:first-child {
-            th,
-            td {
-                border-top: @table__border-width @table__border-style @table__border-color;
-                padding-top: @indent__base;
+        > tr {
+            &:first-child {
+                th,
+                td {
+                    border-top: @table__border-width @table__border-style @table__border-color;
+                    padding-top: @indent__base;
+                }
             }
         }
         th,
@@ -95,6 +97,19 @@ table {
                     }
                 }
             }
+            &.additional-attributes {
+                tbody {
+                    th {
+                        &:extend(.abs-no-display-s all);
+                    }
+                    td {
+                        &:last-child {
+                            border: none;
+                            padding: 0 0 @indent__xs;
+                        }
+                    }
+                }
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,13 @@ table {`
`23`	`23`	`@_table_border-width: @table__border-width`
`24`	`24`	`);`
`25`	`25`	`tfoot {`
`26`		`- > tr:first-child {`
`27`		`- th,`
`28`		`- td {`
`29`		`- border-top: @table__border-width @table__border-style @table__border-color;`
`30`		`- padding-top: @indent__base;`
	`26`	`+ > tr {`
	`27`	`+ &:first-child {`
	`28`	`+ th,`
	`29`	`+ td {`
	`30`	`+ border-top: @table__border-width @table__border-style @table__border-color;`
	`31`	`+ padding-top: @indent__base;`
	`32`	`+ }`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`.mark {`
`@@ -85,6 +87,19 @@ table {`
`85`	`87`	`width: 30%;`
`86`	`88`	`}`
`87`	`89`	`}`
	`90`	`+ &.additional-attributes {`
	`91`	`+ tbody {`
	`92`	`+ th {`
	`93`	`+ &:extend(.abs-no-display-s all);`
	`94`	`+ }`
	`95`	`+ td {`
	`96`	`+ &:last-child {`
	`97`	`+ border: none;`
	`98`	`+ padding: 0 0 @indent__xs;`
	`99`	`+ }`
	`100`	`+ }`
	`101`	`+ }`
	`102`	`+ }`
`88`	`103`	`}`
`89`	`104`	`}`
`90`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,13 +524,6 @@`
`524`	`524`	`.additional-attributes-wrapper {`
`525`	`525`	`&:extend(.abs-no-border-top all);`
`526`	`526`	`}`
`527`		`- .additional-attributes {`
`528`		`- tbody {`
`529`		`- th {`
`530`		`- &:extend(.abs-no-display-s all);`
`531`		`- }`
`532`		`- }`
`533`		`- }`
`534`	`527`	`}`
`535`	`528`	`}`
`536`	`529`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,13 @@ table {`
`20`	`20`	`.table {`
`21`	`21`	`tfoot {`
`22`	`22`	`.css(background, @sidebar__background-color);`
`23`		`- > tr:first-child {`
`24`		`- th,`
`25`		`- td {`
`26`		`- border-top: @table__border-width @table__border-style @table__border-color;`
`27`		`- padding-top: @indent__base;`
	`23`	`+ > tr {`
	`24`	`+ &:first-child {`
	`25`	`+ th,`
	`26`	`+ td {`
	`27`	`+ border-top: @table__border-width @table__border-style @table__border-color;`
	`28`	`+ padding-top: @indent__base;`
	`29`	`+ }`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`	`th,`
`@@ -95,6 +97,19 @@ table {`
`95`	`97`	`}`
`96`	`98`	`}`
`97`	`99`	`}`
	`100`	`+ &.additional-attributes {`
	`101`	`+ tbody {`
	`102`	`+ th {`
	`103`	`+ &:extend(.abs-no-display-s all);`
	`104`	`+ }`
	`105`	`+ td {`
	`106`	`+ &:last-child {`
	`107`	`+ border: none;`
	`108`	`+ padding: 0 0 @indent__xs;`
	`109`	`+ }`
	`110`	`+ }`
	`111`	`+ }`
	`112`	`+ }`
`98`	`113`	`}`
`99`	`114`	`}`
`100`	`115`	`}`