Merge remote-tracking branch 'origin/MAGETWO-34064' into UI

Natalia Momotenko · Natalia Momotenko · commit c9671b677ffb · 2015-03-15T11:23:23.000+02:00
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
@@ -22,6 +22,9 @@
             display: none;
         }
     }
+    .block-content {
+        margin-bottom: 0;
+    }
     .label {
         .icon-font(
             @_icon-font-content: @icon-search,
diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -92,7 +92,9 @@ select:focus ~ .tooltip .tooltip-content {
         margin: 0;
         > .field:not(.choice) >,
         .fields > .field {
-            margin: 0 0 @form-field__vertical-indent;
+            &:not(:last-child) {
+                margin: 0 0 @form-field__vertical-indent;
+            }
             .label {
                 margin: 0 0 4px;
                 padding: 0 0 @indent__xs;
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -22,6 +22,9 @@
             display: none;
         }
     }
+    .block-content {
+        margin-bottom: 0;
+    }
     .label {
         .icon-font(
             @_icon-font-content: @icon-search,
@@ -61,7 +64,6 @@
     .nested {
         display: none;
     }
-
 }
 
 .search-autocomplete {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -137,8 +137,10 @@
 //--------------------------------------
 .block {
     &:extend(.abs-margin-for-blocks-and-widgets all);
-    &:last-child {
-        margin-bottom: 0;
+    .column.main & {
+        &:last-child {
+            margin-bottom: 0;
+        }
     }
     .title {
         strong {
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -117,7 +117,9 @@ select:focus ~ .tooltip .tooltip-content {
         margin: 0;
         > .field:not(.choice) >,
         .fields > .field {
-            margin: 0 0 @form-field__vertical-indent;
+            &:not(:last-child) {
+                margin: 0 0 @form-field__vertical-indent;
+            }
             .label {
                 margin: 0 0 4px;
                 padding: 0 0 @indent__xs;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`display: none;`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+ .block-content {`
	`26`	`+ margin-bottom: 0;`
	`27`	`+ }`
`25`	`28`	`.label {`
`26`	`29`	`.icon-font(`
`27`	`30`	`@_icon-font-content: @icon-search,`