Skip to content

Commit df2004a

Browse files
yangjinjun3yangjinjun3
and
yangjinjun3
authored
fix(fitabbar): defalut unactive-color #1779 (#1780)
* 修改企业业务主题问题 * fix: fix tabbar defalut unactive-color #1779 Co-authored-by: yangjinjun3 <[email protected]>
1 parent 7e34c0e commit df2004a

File tree

6 files changed

+4
-16
lines changed

6 files changed

+4
-16
lines changed

src/packages/__VUE/tabbar/index.scss

-9
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,4 @@
3030
padding-bottom: constant(safe-area-inset-bottom);
3131
padding-bottom: env(safe-area-inset-bottom);
3232
}
33-
34-
&-item_icon-box_nav-word {
35-
line-height: $tabbar-word-line-height;
36-
margin-top: $tabbar-word-margin-top;
37-
}
38-
39-
&-item__icon--unactive {
40-
color: $tabbar-unactive-color;
41-
}
4233
}

src/packages/__VUE/tabbaritem/index.scss

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
&_nav-word {
7777
font-size: $tabbar-item-text-font-size;
7878
line-height: $tabbar-item-text-line-height;
79+
margin-top: $tabbar-word-margin-top;
7980
display: block;
8081
}
8182
&_big-word {

src/packages/styles/variables-jdb.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,8 @@ $tabbar-border-bottom: 1px solid #eee !default;
430430
$tabbar-box-shadow: none !default;
431431
$tabbar-item-text-font-size: $font-size-0 !default;
432432
$tabbar-item-text-line-height: initial !default;
433-
$tabbar-height: auto !default;
433+
$tabbar-height: 50px !default;
434434
$tabbar-word-margin-top: auto !default;
435-
$tabbar-word-line-height: normal !default;
436435

437436
//infiniteloading
438437
$infiniteloading-bottom-color: #c8c8c8 !default;

src/packages/styles/variables-jddkh.scss

-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ $tabbar-item-text-font-size: $font-size-0 !default;
363363
$tabbar-item-text-line-height: initial !default;
364364
$tabbar-height: 54px !default;
365365
$tabbar-word-margin-top: 6px !default;
366-
$tabbar-word-line-height: 1 !default;
367366

368367
//infiniteloading
369368
$infiniteloading-bottom-color: #c8c8c8 !default;

src/packages/styles/variables-jdt.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,8 @@ $tabbar-border-bottom: 0 !default;
337337
$tabbar-box-shadow: 0 -1.5px 5px rgba(0, 0, 0, 0.04) !default;
338338
$tabbar-item-text-font-size: 12px !default;
339339
$tabbar-item-text-line-height: 18px !default;
340-
$tabbar-height: auto !default;
340+
$tabbar-height: 50px !default;
341341
$tabbar-word-margin-top: auto !default;
342-
$tabbar-word-line-height: normal !default;
343342

344343
//infiniteloading
345344
$infiniteloading-bottom-color: #c8c8c8 !default;

src/packages/styles/variables.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,8 @@ $tabbar-border-bottom: 1px solid #eee !default;
361361
$tabbar-box-shadow: none !default;
362362
$tabbar-item-text-font-size: $font-size-0 !default;
363363
$tabbar-item-text-line-height: initial !default;
364-
$tabbar-height: auto !default;
364+
$tabbar-height: 50px !default;
365365
$tabbar-word-margin-top: auto !default;
366-
$tabbar-word-line-height: normal !default;
367366

368367
//infiniteloading
369368
$infiniteloading-bottom-color: #c8c8c8 !default;

0 commit comments

Comments
 (0)