diff --git a/src/packages/tabbar/index.vue b/src/packages/tabbar/index.vue index 84bbd4afd3e2e42e86e3bedbc8bab64ad9052e19..b22d2447bf4018a6a77ac077be5143e8aeca6128 100644 --- a/src/packages/tabbar/index.vue +++ b/src/packages/tabbar/index.vue @@ -34,7 +34,7 @@ export default create({ }, activeColor: { type: String, - default: '#fa2c19' + default: '' } }, emits: ['tab-switch', 'update:show'], diff --git a/src/packages/tabbaritem/index.scss b/src/packages/tabbaritem/index.scss index 8efadcf3b0484a6ede9b52339649b3d08fca9a81..be2e51584f57f40916f59c71f43610469ca07f20 100644 --- a/src/packages/tabbaritem/index.scss +++ b/src/packages/tabbaritem/index.scss @@ -1,58 +1,60 @@ -.tabbar-item { +.nut-tabbar-item { flex: 1; text-align: center; text-decoration: none; - color: $text-color; + color: $primary-color; height: 100%; display: flex; justify-content: center; align-items: center; -} -.icon-box { - padding: 0px; - display: inline-block; - position: relative; - - .tips { - position: absolute; - background: $tabbar-active-color; - border: 1px solid $white; - border-radius: 7px; - text-align: center; - top: -2px; - right: -7px; - box-shadow: 0 0 0 1px $white; - font-size: $font-size-1; - color: $white; + &__icon--unactive { + color: $black; } - .num { - line-height: 1; - font-size: $font-size-0; - color: $white; - padding: 1px 2px 2px 3px; - } - .nums { - line-height: 1; - font-size: $font-size-0; - color: $white; - padding: 2px 1px 2px 2px; - } -} + &_icon-box { + padding: 0px; + display: inline-block; + position: relative; -.icon-box .icon { - display: block; - background-size: 100% 100%; - background-position: center center; -} + &_tips { + position: absolute; + background: $tabbar-active-color; + border: 1px solid $white; + border-radius: 7px; + text-align: center; + top: -2px; + right: -7px; + box-shadow: 0 0 0 1px $white; + font-size: $font-size-1; + color: $white; + } -.icon-box .tabbar-nav-word { - font-size: $font-size-0; - display: block; -} + &_num { + line-height: 1; + font-size: $font-size-0; + color: $white; + padding: 1px 2px 2px 3px; + } -.icon-box .big-word { - font-size: $font-size-large; - line-height: 1; + &_nums { + line-height: 1; + font-size: $font-size-0; + color: $white; + padding: 2px 1px 2px 2px; + } + &_icon { + display: block; + background-size: 100% 100%; + background-position: center center; + } + &_nav-word { + font-size: $font-size-0; + display: block; + } + &_big-word { + font-size: $font-size-large; + line-height: 1; + } + } } diff --git a/src/packages/tabbaritem/index.vue b/src/packages/tabbaritem/index.vue index 68baf9c321846f1f38df70e4a88657eac9fcd862..79d65b278816f573cd4c8395591deb96cd55d173 100644 --- a/src/packages/tabbaritem/index.vue +++ b/src/packages/tabbaritem/index.vue @@ -1,23 +1,39 @@