Skip to content

Commit

Permalink
fix(VBottomNav): correct inactive colors (#5822)
Browse files Browse the repository at this point in the history
* fix(VBottomNav): change inactive btn styles

resolves #2685

* docs: update example
  • Loading branch information
johnleider committed Dec 9, 2018
1 parent d1e3f7d commit 205feed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 3 additions & 1 deletion packages/vuetify/src/components/VBottomNav/VBottomNav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../../stylus/components/_bottom-navs.styl'
import Applicationable from '../../mixins/applicationable'
import ButtonGroup from '../../mixins/button-group'
import Colorable from '../../mixins/colorable'
import Themeable from '../../mixins/themeable'

// Util
import mixins from '../../util/mixins'
Expand All @@ -18,7 +19,8 @@ export default mixins(
'height',
'value'
]),
Colorable
Colorable,
Themeable
/* @vue/component */
).extend({
name: 'v-bottom-nav',
Expand Down
10 changes: 4 additions & 6 deletions packages/vuetify/src/stylus/components/_bottom-navs.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
v-bottom-nav($material)
background-color: $material.cards

.v-btn:not(.v-btn--active)
color: $material.text.secondary !important

theme(v-bottom-nav, "v-bottom-nav")

.v-item-group.v-bottom-nav
Expand Down Expand Up @@ -37,7 +40,6 @@ theme(v-bottom-nav, "v-bottom-nav")
min-width: 80px
padding: 8px 12px 10px
text-transform: none
opacity: .5
width: 100%
// https://github.com/vuetifyjs/vuetify/issues/4643
flex-shrink: 1
Expand All @@ -57,7 +59,6 @@ theme(v-bottom-nav, "v-bottom-nav")
line-height: 1

&--active
opacity: 1
padding-top: 6px

&:before
Expand All @@ -69,9 +70,6 @@ theme(v-bottom-nav, "v-bottom-nav")
.v-icon
transform: none

&:not(.v-btn--active)
filter: grayscale(100%)

&--shift
.v-btn__content
font-size: 14px
Expand All @@ -90,5 +88,5 @@ theme(v-bottom-nav, "v-bottom-nav")
.v-icon
transform: scale(1, 1) translate(0, 8px)

span
> span:not(.v-badge)
color: transparent
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:color="color"
:value="true"
absolute
dark
shift
>
<v-btn dark>
Expand Down

0 comments on commit 205feed

Please sign in to comment.