@eturnity/eturnity_reusable_components 1.2.0-beta.2 → 1.2.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.3",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/inputs/inputNumber/index.vue

@@ -96,15 +96,8 @@ const InputContainer = styled('input', inputProps)`
     props.isError
       ? '1px solid ' + props.theme.colors.red
       : props.noBorder
-<<<<<<< HEAD
-      ? 'none'
-      : props.hasLength
-      ? '1px solid ' + props.theme.colors.black
-      : '1px solid ' + props.theme.colors.mediumGray};
-=======
       ? "none"
       : "1px solid " + props.theme.colors.mediumGray};
->>>>>>> master
   padding: ${(props) =>
     props.hasUnit ? '11px 40px 11px 10px' : '11px 5px 11px 10px'};
   border-radius: 4px;
@@ -284,11 +277,7 @@ export default {
   methods: {
     onChangeHandler(event) {
       if (isNaN(event)) {
-<<<<<<< HEAD
-        event = ''
-=======
         event = this.minNumber || this.minNumber === 0 ? this.minNumber : event
->>>>>>> master
       }
       this.$emit('input-change', event)
     },
@@ -316,15 +305,11 @@ export default {
           return num
         }
       })
-<<<<<<< HEAD
-      let evaluated = eval(formatted.join(''))
-=======
       let evaluated = eval(formatted.join(""))
       evaluated = stringToNumber({
         value: evaluated,
         numberPrecision: this.numberPrecision,
       })
->>>>>>> master
       return evaluated
     },
     onInputBlur(e) {
@@ -364,14 +349,6 @@ export default {
           ? this.minNumber
           : ''
       if ((adjustedMinValue || adjustedMinValue === 0) && !this.isFocused) {
-<<<<<<< HEAD
-        let input = numberToString({
-          value: adjustedMinValue,
-          numberPrecision: this.numberPrecision,
-        })
-        let unit = this.showLinearUnitName ? '' : this.unitName
-        return input + ' ' + unit
-=======
         let input = this.numberToStringEnabled
           ? numberToString({
               value: adjustedMinValue,
@@ -380,7 +357,6 @@ export default {
           : adjustedMinValue
         let unit = this.showLinearUnitName ? "" : this.unitName
         return input + " " + unit
->>>>>>> master
       } else if (!adjustedMinValue && adjustedMinValue !== 0) {
         return ''
       } else {