Merge remote-tracking branch 'origin/MAGETWO-38963' into PR-4

Author: Natalia Momotenko

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

@@ -11,68 +11,69 @@
 
     .block.filter {
         margin-bottom: @indent__xl ;
-        .title {
+        .filter-title {
             margin-bottom: @indent__base;
             strong {
                 font-size: 18px;
             }
         }
-        .subtitle {
-            display: none;
+    }
+    .filter-subtitle {
+        display: none;
+    }
+    
+    .filter-options-content {
+        .filter-count-label {
+            &:extend(.abs-visually-hidden all);
         }
-        .filter-options-content {
-            .filter-count-label {
-                &:extend(.abs-visually-hidden all);
-            }
+    }
+    .filter-options {
+        margin: 0;
+        > dt {
+            .lib-heading(h4);
+            margin: 0 0 @indent__s;
         }
-        .options {
-            margin: 0;
-            > dt {
-                .lib-heading(h4);
-                margin: 0 0 @indent__s;
-            }
-            > dd {
-                margin: 0 0 @indent__m;
+        > dd {
+            margin: 0 0 @indent__m;
 
-                .item {
-                    margin-bottom: 3px;
-                }
+            .item {
+                margin-bottom: 3px;
             }
-            .count {
-                .lib-css(color, @text__color__muted);
-                &:before {
-                    content: '(';
-                }
-                &:after {
-                    content: ')';
-                }
+        }
+        .count {
+            .lib-css(color, @text__color__muted);
+            &:before {
+                content: '(';
+            }
+            &:after {
+                content: ')';
             }
         }
+    }
+    .items {
+        &:extend(.abs-reset-list all);
+    }
+    .filtered {
         .items {
-            &:extend(.abs-reset-list all);
+            margin: 15px 0;
         }
-        .filtered {
-            .items {
-                margin: 15px 0;
+        .item {
+            position: relative;
+            padding-left: 22px;
+            margin-bottom: 6px;
+            .label {
+                font-weight: @font-weight__bold;
             }
-            .item {
-                margin-bottom: 6px;
-                padding-left: 22px;
-                position: relative;
-                .label {
-                    font-weight: @font-weight__bold;
-                }
-                .action.remove {
-                    &:extend(.abs-remove-button-for-blocks all);
-                    left: -6px;
-                    position: absolute;
-                    top: 0;
-                }
-            }
-            & + .actions {
-                margin-bottom: 35px;
+            .action.remove {
+                &:extend(.abs-remove-button-for-blocks all);
+                position: absolute;
+                left: -6px;
+                top: 0;
             }
         }
+        & + .actions {
+            margin-bottom: 35px;
+        }
     }
 }
 

app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less

@@ -102,9 +102,10 @@
                 font-weight: @font-weight__semibold;
                 margin: 0;
                 overflow: hidden;
-                padding: @indent__s 20px+@indent__s 0 @indent__s;
+                padding: @indent__s 30px+@indent__s 0 @indent__s;
                 position: relative;
                 text-transform: uppercase;
+                word-break: break-all;
                 z-index: 1;
                 .lib-icon-font(
                 @_icon-font-content: @icon-down,
@@ -267,10 +268,10 @@
             text-transform: uppercase;
             z-index: 1;
             .lib-icon-font(
-            @_icon-font-content: @icon-down,
-            @_icon-font-size: 13px,
-            @_icon-font-position: before,
-            @_icon-font-display: block
+                @_icon-font-content: @icon-down,
+                @_icon-font-size: 13px,
+                @_icon-font-position: before,
+                @_icon-font-display: block
             );
             &:before {
                 position: absolute;
@@ -288,8 +289,8 @@
             padding-bottom: 30px;
             .block-subtitle {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-up,
-                @_icon-font-position: before
+                    @_icon-font-content: @icon-up,
+                    @_icon-font-position: before
                 );
             }
             .items {

lib/internal/Magento/Framework/Component/ComponentRegistrar.php

@@ -48,7 +48,7 @@ public static function register($type, $componentName, $path)
         if (isset(self::$paths[$type][$componentName])) {
             throw new \LogicException('\'' . $componentName . '\' component already exists');
         } else {
-            self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
+            self::$paths[$type][$componentName] = $path;
         }
     }