Merge branch 'next' of https://github.com/jdf2e/nutui into next

zhouLion · Oct 25, 2022 · a0854b8 · a0854b8
2 parents da6a71e + df2004a
commit a0854b8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "ts-jest": "^26.5.5",
     "typescript": "^4.6.4",
     "vite": "^2.9.15",
-    "vite-plugin-dts": "1.0.5",
+    "vite-plugin-dts": "1.4.1",
     "vite-plugin-md": "^0.11.8",
     "vue": "^3.2.24",
     "vue-jest": "^5.0.0-alpha.7"

diff --git a/src/packages/__VUE/tabbar/index.scss b/src/packages/__VUE/tabbar/index.scss
@@ -30,13 +30,4 @@
     padding-bottom: constant(safe-area-inset-bottom);
     padding-bottom: env(safe-area-inset-bottom);
   }
-
-  &-item_icon-box_nav-word {
-    line-height: $tabbar-word-line-height;
-    margin-top: $tabbar-word-margin-top;
-  }
-
-  &-item__icon--unactive {
-    color: $tabbar-unactive-color;
-  }
 }
diff --git a/src/packages/__VUE/tabbaritem/index.scss b/src/packages/__VUE/tabbaritem/index.scss
@@ -76,6 +76,7 @@
     &_nav-word {
       font-size: $tabbar-item-text-font-size;
       line-height: $tabbar-item-text-line-height;
+      margin-top: $tabbar-word-margin-top;
       display: block;
     }
     &_big-word {

diff --git a/src/packages/styles/variables-jdb.scss b/src/packages/styles/variables-jdb.scss
@@ -430,9 +430,8 @@ $tabbar-border-bottom: 1px solid #eee !default;
 $tabbar-box-shadow: none !default;
 $tabbar-item-text-font-size: $font-size-0 !default;
 $tabbar-item-text-line-height: initial !default;
-$tabbar-height: auto !default;
+$tabbar-height: 50px !default;
 $tabbar-word-margin-top: auto !default;
-$tabbar-word-line-height: normal !default;
 
 //infiniteloading
 $infiniteloading-bottom-color: #c8c8c8 !default;

diff --git a/src/packages/styles/variables-jddkh.scss b/src/packages/styles/variables-jddkh.scss
@@ -363,7 +363,6 @@ $tabbar-item-text-font-size: $font-size-0 !default;
 $tabbar-item-text-line-height: initial !default;
 $tabbar-height: 54px !default;
 $tabbar-word-margin-top: 6px !default;
-$tabbar-word-line-height: 1 !default;
 
 //infiniteloading
 $infiniteloading-bottom-color: #c8c8c8 !default;

diff --git a/src/packages/styles/variables-jdt.scss b/src/packages/styles/variables-jdt.scss
@@ -337,9 +337,8 @@ $tabbar-border-bottom: 0 !default;
 $tabbar-box-shadow: 0 -1.5px 5px rgba(0, 0, 0, 0.04) !default;
 $tabbar-item-text-font-size: 12px !default;
 $tabbar-item-text-line-height: 18px !default;
-$tabbar-height: auto !default;
+$tabbar-height: 50px !default;
 $tabbar-word-margin-top: auto !default;
-$tabbar-word-line-height: normal !default;
 
 //infiniteloading
 $infiniteloading-bottom-color: #c8c8c8 !default;

diff --git a/src/packages/styles/variables.scss b/src/packages/styles/variables.scss
@@ -361,9 +361,8 @@ $tabbar-border-bottom: 1px solid #eee !default;
 $tabbar-box-shadow: none !default;
 $tabbar-item-text-font-size: $font-size-0 !default;
 $tabbar-item-text-line-height: initial !default;
-$tabbar-height: auto !default;
+$tabbar-height: 50px !default;
 $tabbar-word-margin-top: auto !default;
-$tabbar-word-line-height: normal !default;
 
 //infiniteloading
 $infiniteloading-bottom-color: #c8c8c8 !default;