Skip to content

Commit 12caeec

Browse files
committed
fix: small fixes
1 parent 6485f8f commit 12caeec

File tree

10 files changed

+31
-43
lines changed

10 files changed

+31
-43
lines changed

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
presets: [
3-
['@vue/app', {
3+
['@babel/preset-env', {
44
'modules': false,
55
}]
66
]

src/components/Alert/CAlert.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
v-if="closeButton"
1212
@click="dismiss()"
1313
/>
14-
<slot :dismiss="dismiss"></slot>
14+
<slot></slot>
1515
</div>
1616
</transition>
1717
</template>

src/components/Card/index.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
import CCardGroup from './CCardGroup'
21
import CCard from './CCard'
32
import CCardBody from './CCardBody'
43
import CCardFooter from './CCardFooter'
4+
import CCardGroup from './CCardGroup'
55
import CCardHeader from './CCardHeader'
6-
import CCardTitle from './CCardTitle'
7-
import CCardSubtitle from './CCardSubtitle'
8-
import CCardText from './CCardText'
96
import CCardImg from './CCardImg'
107
import CCardImgOverlay from './CCardImgOverlay'
118
import CCardLink from './CCardLink'
9+
import CCardSubtitle from './CCardSubtitle'
10+
import CCardText from './CCardText'
11+
import CCardTitle from './CCardTitle'
12+
1213

1314
export {
14-
CCardGroup,
1515
CCard,
1616
CCardBody,
1717
CCardFooter,
1818
CCardHeader,
19-
CCardTitle,
20-
CCardSubtitle,
21-
CCardText,
19+
CCardGroup,
2220
CCardImg,
2321
CCardImgOverlay,
24-
CCardLink
22+
CCardLink,
23+
CCardSubtitle,
24+
CCardText,
25+
CCardTitle
2526
}

src/components/Form/CForm.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ export default {
55
name: 'CForm',
66
functional: true,
77
props: {
8-
// id: String,
98
inline: Boolean,
10-
// novalidate: Boolean,
11-
wasValidated: Boolean,
9+
wasValidated: Boolean
1210
},
1311
render(h, { props, data, children }) {
1412
return h(
@@ -17,11 +15,7 @@ export default {
1715
class: {
1816
'form-inline': props.inline,
1917
'was-validated': props.wasValidated
20-
},
21-
// attrs: {
22-
// id: props.id,
23-
// novalidate: props.novalidate
24-
// }
18+
}
2519
}),
2620
children
2721
)

src/components/Grid/CCol.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ export default {
1818
},
1919
render (h, { props, data, children }) {
2020
let classes = []
21-
let prefixes = {
21+
let suffixes = {
2222
'col': '',
2323
'xs': '-xs',
2424
'sm': '-sm',
2525
'md': '-md',
2626
'lg': '-lg',
2727
'xl': '-xl'
2828
}
29-
Object.keys(prefixes).forEach((key) => {
29+
Object.keys(suffixes).forEach((key) => {
3030
if (props[key] === true) {
31-
classes.push(`col${prefixes[key]}`)
31+
classes.push(`col${suffixes[key]}`)
3232
3333
} else if (typeof props[key] === 'number' || typeof props[key] === 'string') {
34-
classes.push(`col${prefixes[key]}-${props[key]}`)
34+
classes.push(`col${suffixes[key]}-${props[key]}`)
3535
3636
} else if (typeof props[key] === 'object') {
3737
if (props[key].size) {
38-
classes.push(`col${prefixes[key]}-${props[key].size}`)
38+
classes.push(`col${suffixes[key]}-${props[key].size}`)
3939
}
4040
if (props[key].offset) {
41-
classes.push(`offset${prefixes[key]}-${props[key].offset}`)
41+
classes.push(`offset${suffixes[key]}-${props[key].offset}`)
4242
}
4343
if (props[key].order) {
44-
classes.push(`order${prefixes[key]}-${props[key].order}`)
44+
classes.push(`order${suffixes[key]}-${props[key].order}`)
4545
}
4646
}
4747
})

src/components/Sidebar/CSidebar.vue

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,8 @@ export default {
109109
}
110110
},
111111
isOnMobile () {
112-
return Boolean(getComputedStyle(this.$el).getPropertyValue('--on-mobile'))
112+
return Boolean(getComputedStyle(this.$el).getPropertyValue('--is-mobile'))
113113
}
114114
}
115115
}
116-
</script>
117-
118-
<style scoped>
119-
@media (max-width: 992px) {
120-
.c-sidebar-lg-show {
121-
--on-mobile: true;
122-
}
123-
}
124-
</style>
116+
</script>

src/components/Sidebar/CSidebarBrand.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<CLink v-if="wrappedInLink" v-bind="wrappedInLink">
55
<img
66
class="c-sidebar-brand-full"
7-
:src="fullSrc"
7+
:src="fullSrc || src"
88
width="118"
99
height="46"
1010
alt="Logo"
1111
>
1212
<img
1313
class="c-sidebar-brand-minimized"
14-
:src="minimizedSrc"
14+
:src="minimizedSrc || src"
1515
width="118"
1616
height="46"
1717
alt="Logo"
@@ -20,14 +20,14 @@
2020
<template v-else>
2121
<img
2222
class="c-sidebar-brand-full"
23-
:src="fullSrc"
23+
:src="fullSrc || src"
2424
width="118"
2525
height="46"
2626
alt="Logo"
2727
>
2828
<img
2929
class="c-sidebar-brand-minimized"
30-
:src="minimizedSrc"
30+
:src="minimizedSrc || src"
3131
width="118"
3232
height="46"
3333
alt="Logo"
@@ -45,6 +45,7 @@ export default {
4545
CLink
4646
},
4747
props: {
48+
src: String,
4849
fullSrc: String,
4950
minimizedSrc: String,
5051
wrappedInLink: Object

src/components/Sidebar/CSidebarNavDivider.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<template functional>
1+
<template>
22
<li class="c-sidebar-nav-divider"></li>
33
</template>
44

src/components/Sidebar/CSidebarNavTitle.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<template functional>
1+
<template>
22
<li class="c-sidebar-nav-title">
33
<slot></slot>
44
</li>

src/components/Spinner/CSpinner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default {
99
size: String,
1010
tag: {
1111
type: String,
12-
default: 'span'
12+
default: 'div'
1313
}
1414
},
1515
render(h, { props, data }) {

0 commit comments

Comments
 (0)