Merge branch 'master' of http://gitlab.essenptl.com/purplevin/component

# Conflicts:
#	package-lock.json
#	package.json

package-lock.json

@@ -20,11 +20,12 @@
         "@vue/cli-plugin-babel": "~5.0.0",
         "@vue/cli-service": "~5.0.0",
         "sass": "^1.32.7",
-        "sass-loader": "^12.0.0",
+        "sass-loader": "8.0.2",
         "vue-template-compiler": "^2.6.14"
       },
       "peerDependencies": {
-        "sass-loader": "^12.0.0",
+        "element-ui": "^2.15.9",
+        "sass-loader": "8.0.2",
         "vue": "^2.6.14"
       }
     },
@@ -8570,16 +8571,19 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 8.9.0"
       },
       "funding": {
         "type": "opencollective",
@@ -8587,10 +8591,9 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "node-sass": "^4.0.0",
         "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
+        "webpack": "^4.36.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
         "fibers": {
@@ -8601,9 +8604,6 @@
         },
         "sass": {
           "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
         }
       }
     },
@@ -16710,13 +16710,16 @@
       }
     },
     "sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "requires": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       }
     },
     "schema-utils": {

package.json

@@ -21,12 +21,13 @@
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "sass": "^1.32.7",
-    "sass-loader": "^12.0.0",
+    "sass-loader": "8.0.2",
     "vue-template-compiler": "^2.6.14"
   },
-  "peerDependencies": {
-    "sass-loader": "^12.0.0",
-    "vue": "^2.6.14"
+  "peerDependencies":{
+    "element-ui": "^2.15.9",
+    "vue": "^2.6.14",
+    "sass-loader": "8.0.2"
   },
   "browserslist": [
     "> 1%",