Selaa lähdekoodia

merge conflict

abpcoder 1 viikko sitten
vanhempi
commit
07c1c81395
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      src/components/ie-picker/ie-picker.vue

+ 2 - 2
src/components/ie-picker/ie-picker.vue

@@ -2,14 +2,14 @@
     <view :class="width" @click="handleClick">
         <view class="flex items-center gap-x-6 justify-start" :style="customStyle">
             <view v-if="matchValue || customLabel"
-                  class="text-[15px] h-[24px] leading-[26px] flex-1 min-w-1 ellipsis-1"
+                  class="text-[15px] h-[24px] leading-[24px] flex-1 min-w-1 ellipsis-1"
                   :style="getValueStyle"
                   :class="[(disabled || readonly) ? 'text-[#dce4f6]': color]">
                 <slot :label="label">
                     {{ label }}
                 </slot>
             </view>
-            <view v-else class="text-[15px] h-[24px] leading-[26px] text-[#c0c4cc] flex-1 min-w-1 ellipsis-1"
+            <view v-else class="text-[15px] h-[24px] leading-[24px] text-[#c0c4cc] flex-1 min-w-1 ellipsis-1"
                   :style="getPlaceholderStyle">{{ placeholder }}
             </view>
             <slot name="right">