@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.27 → 7.4.4-EPDM-7260.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.4.4-EPDM-7260.27",
+  "version": "7.4.4-EPDM-7260.28",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -83,11 +83,7 @@
           >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
-<<<<<<< HEAD
-          <Caret @click.stop="toggleCaretDropdown" v-if="dropDownArrowVisible">
-=======
           <Caret @click.stop="toggleCaretDropdown" class="caret_dropdown">
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
             <icon
               v-if="isDropdownOpen"
               name="arrow_up"
@@ -228,12 +224,7 @@ const optionalLabel = styled.span`
 const inputProps = {
   selectWidth: String,
   optionWidth: String,
-<<<<<<< HEAD
-  minWidth: String,
-  maxWidth: String
-=======
   noRelative: Boolean
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
 }
 const Container = styled('div', inputProps)`
   width: ${(props) => props.selectWidth};
@@ -272,12 +263,7 @@ const selectButtonAttrs = {
   showDisabledBackground: Boolean
 }
 const selectButton = styled('div', selectButtonAttrs)`
-<<<<<<< HEAD
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
-  position: relative;
-=======
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
   box-sizing: border-box;
   border-radius: 4px;
   max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
@@ -385,15 +371,11 @@ const DropdownAttrs = { noRelative: Boolean }
 const DropdownWrapper = styled('div', DropdownAttrs)`
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
 `
-<<<<<<< HEAD
-const inputAttrs = { alignItems: String, hasLabel: Boolean, minWidth: String }
-=======
 const inputAttrs = {
   alignItems: String,
   hasLabel: Boolean,
   noRelative: Boolean
 }
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
 const InputWrapper = styled('div', inputAttrs)`
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
   display: grid;
@@ -468,9 +450,6 @@ export default {
       required: false,
       default: '36px'
     },
-    minWidth: {
-      required: false
-    },
     optionWidth: {
       required: false,
       default: null
@@ -550,18 +529,16 @@ export default {
       type: Boolean,
       default: false
     },
-<<<<<<< HEAD
     leftPadding: {
       type: String,
       default: '15px'
-=======
+    },
     tablePaddingLeft: {
       required: false
     },
     showDisabledBackground: {
       required: false,
       default: true
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
     },
     minOptionLength: {
       type: Number,