Skip to content

Commit fa0ab41

Browse files
committed
fix: small fixes
1 parent 92a8fcb commit fa0ab41

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

src/components/Tabs/CTabs.vue

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<div :class="vertical ? 'c-row c-no-gutters': ''">
3-
<div :class="[addNavWrapperClasses, gridClasses.navs]">
4-
<ul :class="[navClasses, addNavClasses, { 'c-h-100': vertical }]">
2+
<div :class="tabsClasses">
3+
<div :class="navWrapperClasses">
4+
<ul :class="navClasses">
55
<CTabNav
66
v-for="(tab, key) in ctabInstances"
77
@click.native="tabClick(tab)"
@@ -67,15 +67,25 @@ export default {
6767
}
6868
},
6969
computed: {
70+
tabsClasses () {
71+
return { 'c-row c-no-gutters': this.vertical }
72+
},
73+
navWrapperClasses () {
74+
return [ this.addNavWrapperClasses, this.gridClasses.navs]
75+
},
7076
navClasses () {
71-
return {
72-
'c-nav' : true,
73-
'c-nav-tabs': this.tabs && !this.pills,
74-
'c-nav-pills': this.pills,
75-
'c-flex-column': this.vertical,
76-
'c-nav-fill': this.fill,
77-
'c-nav-justified': this.justified
78-
}
77+
return [
78+
this.addNavClasses,
79+
{
80+
'c-nav' : true,
81+
'c-nav-tabs': this.tabs && !this.pills,
82+
'c-nav-pills': this.pills,
83+
'c-flex-column': this.vertical,
84+
'c-nav-fill': this.fill,
85+
'c-nav-justified': this.justified,
86+
'c-h-100': this.vertical
87+
}
88+
]
7989
},
8090
activeTab () {
8191
return this.activatedTab || this.ctabInstances.filter(el => el.active)[0]
@@ -113,7 +123,7 @@ export default {
113123
}
114124
</script>
115125

116-
<style scoped lang="scss">
126+
<style lang="scss">
117127
.fade-enter-active, .fade-leave-active {
118128
transition: opacity .3s;
119129
}

src/components/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export * from './Footer'
1313
export * from './Form'
1414
export * from './Grid'
1515
export * from './Header'
16-
export * from './Jumbotron'
1716
export * from './Image'
17+
export * from './Jumbotron'
1818
export * from './Link'
1919
export * from './ListGroup'
2020
export * from './Media'

0 commit comments

Comments
 (0)