Merge pull request #237 from Tencent/style/components

fix: resolve warning from invalid css selector
Tencent · Mar 10, 2022 · 290cb56 · 290cb56
2 parents 8290596 + 91956ba
commit 290cb56
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/src/avatar/avatar.less b/src/avatar/avatar.less
@@ -17,11 +17,11 @@
     color: #0052d9;
     border-radius: 999rpx;
 
-    @{prefix}-badge {
-      position: absolute;
-    }
-
     .@{prefix}-badge {
+      &-host {
+        position: absolute;
+      }
+
       &__round {
         top: -10%;
         right: -10%;

diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
@@ -29,7 +29,7 @@
     </view>
   </view>
   <t-badge
-    class="{{prefix}}-badge__{{shape === 'circle' ? 'circle' : 'round'}}"
+    class="{{prefix}}-badge-host {{prefix}}-badge__{{shape === 'circle' ? 'circle' : 'round'}}"
     wx:if="{{badgeProps.dot || badgeProps.count}}"
     color="{{badgeProps.color}}"
     count="{{badgeProps.count}}"

diff --git a/src/dialog/dialog.less b/src/dialog/dialog.less
@@ -13,7 +13,7 @@
 @dialog-btn-border-color: #eee;
 @dialog-input-bg-color: #f0f0f0;
 
-page {
+.@{dialog}__wrapper {
   .@{dialog} {
     overflow: hidden;
     width: @dialog-width;

diff --git a/src/dialog/dialog.wxml b/src/dialog/dialog.wxml
@@ -2,6 +2,7 @@
 <wxs src="./dialog.wxs" module="_" />
 
 <t-popup
+  class="{{classPrefix}}__wrapper"
   visible="{{visible}}"
   showOverlay="{{showOverlay}}"
   closeOnOverlayClick="{{closeOnOverlayClick}}"

diff --git a/src/input/input.less b/src/input/input.less
@@ -54,11 +54,6 @@
       color: @input-icon-color;
       font-size: @input-icon-font-size;
 
-      i {
-        font-size: @input-icon-font-size;
-        color: @input-icon-color;
-      }
-
       &:empty {
         display: none;
       }

diff --git a/src/textarea/textarea.less b/src/textarea/textarea.less
@@ -35,7 +35,7 @@
     font-size: @textarea-font-size;
     color: @textarea-text-color;
 
-    textarea {
+    &-textarea {
       display: block;
       box-sizing: border-box;
       width: 100%;

diff --git a/src/textarea/textarea.wxml b/src/textarea/textarea.wxml
@@ -7,7 +7,7 @@
       maxlength="{{maxlength || -1}}"
       disabled="{{disabled}}"
       placeholder="{{placeholder}}"
-      class="t-class-textarea"
+      class="{{classPrefix}}__wrapper-textarea t-class-textarea"
       placeholder-class="{{classPrefix}}__placeholder t-class-placeholder"
       value="{{value}}"
       auto-focus="{{autofocus}}"
@@ -22,11 +22,7 @@
       bindconfirm="onConfirm"
       bindlinechange="onLineChange"
     />
-    <view class="{{classPrefix}}__count" wx:if="{{maxlength}}">
-      {{inputValue.length}} / {{maxlength}}
-    </view>
-    <view class="{{classPrefix}}__count" wx:elif="{{maxcharacter}}">
-      {{characterLength}} / {{maxcharacter}}
-    </view>
+    <view class="{{classPrefix}}__count" wx:if="{{maxlength}}"> {{inputValue.length}} / {{maxlength}} </view>
+    <view class="{{classPrefix}}__count" wx:elif="{{maxcharacter}}"> {{characterLength}} / {{maxcharacter}} </view>
   </view>
 </view>