fix: issue less#4313 cleanup merge issues

* Cleanup merge issues for fix for issue less#4313.

Author: puckowski

packages/less/src/less/functions/index.js

@@ -13,7 +13,6 @@ import string from './string';
 import svg from './svg';
 import types from './types';
 import style from './style';
-import scrollState from './scroll-state';
 
 export default environment => {
     const functions = { functionRegistry, functionCaller };
@@ -31,7 +30,6 @@ export default environment => {
     functionRegistry.addMultiple(svg(environment));
     functionRegistry.addMultiple(types);
     functionRegistry.addMultiple(style);
-    functionRegistry.addMultiple(scrollState);
 
     return functions;
 };

packages/less/src/less/functions/scroll-state.js

@@ -241,22 +241,3 @@
     color: purple;
   }
 }
-#sticky {
-  position: sticky;
-  container-type: scroll-state;
-}
-@container scroll-state (stuck: top) {
-  #sticky-child {
-    font-size: 75%;
-  }
-}
-@container scroll-state (snapped: x) {
-  #sticky-child {
-    font-size: 75%;
-  }
-}
-@container scroll-state (scrollable: top) {
-  #sticky-child {
-    font-size: 75%;
-  }
-}

packages/test-data/css/_main/container.css

@@ -289,26 +289,3 @@
         color: purple;
     }
 }
-
-#sticky {
-    position: sticky;
-    container-type: scroll-state;
-}
-  
-@container scroll-state(stuck: top) {
-    #sticky-child {
-      font-size: 75%;
-    }
-}
-
-@container scroll-state(snapped: x) {
-    #sticky-child {
-      font-size: 75%;
-    }
-}
-
-@container scroll-state(scrollable: top) {
-    #sticky-child {
-      font-size: 75%;
-    }
-}