Merge branch 'master' of github.com:FightingDesign/fighting-design

FightingDesign · Aug 4, 2023 · ccc3787 · ccc3787
2 parents c527f96 + a55ed2e
commit ccc3787
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/packages/fighting-theme/config/var-list.scss b/packages/fighting-theme/config/var-list.scss
@@ -1,19 +1,22 @@
-.f-list__large {
-  --list-item-height: 40px;
-  --list-item-font-size: 16px;
-}
+.f-list {
+  // 不同尺寸
+  &__large {
+    --list-item-height: 40px;
+    --list-item-font-size: 16px;
+  }
 
-.f-list__middle {
-  --list-item-height: 35px;
-  --list-item-font-size: 15px;
-}
+  &__middle {
+    --list-item-height: 35px;
+    --list-item-font-size: 15px;
+  }
 
-.f-list__small {
-  --list-item-height: 30px;
-  --list-item-font-size: 14px;
-}
+  &__small {
+    --list-item-height: 30px;
+    --list-item-font-size: 14px;
+  }
 
-.f-list__mini {
-  --list-item-height: 25px;
-  --list-item-font-size: 13px;
+  &__mini {
+    --list-item-height: 25px;
+    --list-item-font-size: 13px;
+  }
 }
diff --git a/packages/fighting-theme/config/var-tag.scss b/packages/fighting-theme/config/var-tag.scss
@@ -89,7 +89,7 @@
     --tag-background: none;
   }
 
-  &__warning.f-tag__line {
+  &__info.f-tag__line {
     --tag-color: #1d1d1f;
     --tag-background: none;
   }

diff --git a/packages/fighting-theme/src/list-item.scss b/packages/fighting-theme/src/list-item.scss
@@ -1,5 +1,4 @@
 .f-list-item {
-  font-size: 14px;
   padding: 7px 16px;
   box-sizing: border-box;
   display: flex;