Skip to content

Commit 16ebc80

Browse files
pterkpterk
committed
Merge remote-tracking branch 'upstream/master'
2 parents 2222c3a + 4fe1a0f commit 16ebc80

File tree

8 files changed

+105
-229
lines changed

8 files changed

+105
-229
lines changed

‎.editorconfig

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.eslintrc

Lines changed: 0 additions & 171 deletions
This file was deleted.

‎README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# Bootstrap Vue
2-
[![CircleCI](https://circleci.com/gh/bootstrap-vue/bootstrap-vue.svg?style=svg)](https://circleci.com/gh/bootstrap-vue/bootstrap-vue)
3-
4-
[Twitter Bootstrap 4](https://v4-alpha.getbootstrap.com/) Components For [Vue.js 2](https://vuejs.org/)
1+
<p align="center"><img src="https://github.com/pi0/bootstrap-vue/raw/master/banner.png"></p>
52

6-
[![NPM](https://nodei.co/npm/bootstrap-vue.png?downloads=true&downloadRank=true&stars=true)](https://npmjs.com/bootstrap-vue/)
3+
# Bootstrap Vue
4+
[Twitter Bootstrap 4](https://v4-alpha.getbootstrap.com/) components for [Vue.js 2](https://vuejs.org/)
75

8-
<p align="center"><img src="https://github.com/pi0/bootstrap-vue/raw/master/banner.png"></p>
6+
[![CircleCI](https://circleci.com/gh/bootstrap-vue/bootstrap-vue.svg?style=svg)](https://circleci.com/gh/bootstrap-vue/bootstrap-vue)
97

8+
[![NPM](https://nodei.co/npm-dl/bootstrap-vue.png?months=3&height=3)](https://nodei.co/npm/bootstrap-vue/)
109

1110
## Quick Start
1211

‎banner.png

12.6 KB
Loading

‎components/components.js

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1-
import bAlert from './alert'
2-
import bBreadcrumb from './breadcrumb'
3-
import bButtonCheckbox from './button-checkbox'
4-
import bButtonGroup from './button-group'
5-
import bButtonRadio from './button-radio'
6-
import bButton from './button'
7-
import bCard from './card'
8-
import bCarousel from './carousel'
9-
import bCarouselSlide from './carousel-slide'
10-
import bCollapse from './collapse'
11-
import bCollapseToggle from './collapse-toggle'
12-
import bDropdown from './dropdown'
13-
import bDropdownSelect from './dropdown-select'
14-
import bFormCheckbox from './form-checkbox'
15-
import bFormRadio from './form-radio'
16-
import bFormInput from './form-input'
17-
import bFormSelect from './form-select'
18-
import bFormTextarea from './form-textarea'
19-
import bJumbotron from './jumbotron'
20-
import bTags from './tags'
21-
import bListGroup from './list-group'
22-
import bListGroupItem from './list-group-item'
23-
import bMedia from './media'
24-
import bModal from './modal'
25-
import bNav from './nav'
26-
import bNavItem from './nav-item'
27-
import bNavItemDropdown from './nav-item-dropdown'
28-
import bNavbar from './navbar'
29-
import bPagination from './pagination'
30-
import bPopover from './popover'
31-
import bProgress from './progress'
32-
import bTables from './tables'
33-
import bTabs from './tabs'
34-
import bTab from './tab'
35-
import bTooltip from './tooltip'
1+
import bAlert from './alert.vue'
2+
import bBreadcrumb from './breadcrumb.vue'
3+
import bButtonCheckbox from './button-checkbox.vue'
4+
import bButtonGroup from './button-group.vue'
5+
import bButtonRadio from './button-radio.vue'
6+
import bButton from './button.vue'
7+
import bCard from './card.vue'
8+
import bCarousel from './carousel.vue'
9+
import bCarouselSlide from './carousel-slide.vue'
10+
import bCollapse from './collapse.vue'
11+
import bCollapseToggle from './collapse-toggle.vue'
12+
import bDropdown from './dropdown.vue'
13+
import bDropdownSelect from './dropdown-select.vue'
14+
import bFormCheckbox from './form-checkbox.vue'
15+
import bFormRadio from './form-radio.vue'
16+
import bFormInput from './form-input.vue'
17+
import bFormSelect from './form-select.vue'
18+
import bFormTextarea from './form-textarea.vue'
19+
import bJumbotron from './jumbotron.vue'
20+
import bTags from './tags.vue'
21+
import bListGroup from './list-group.vue'
22+
import bListGroupItem from './list-group-item.vue'
23+
import bMedia from './media.vue'
24+
import bModal from './modal.vue'
25+
import bNav from './nav.vue'
26+
import bNavItem from './nav-item.vue'
27+
import bNavItemDropdown from './nav-item-dropdown.vue'
28+
import bNavbar from './navbar.vue'
29+
import bPagination from './pagination.vue'
30+
import bPopover from './popover.vue'
31+
import bProgress from './progress.vue'
32+
import bTables from './tables.vue'
33+
import bTable from './table.vue'
34+
import bTabs from './tabs.vue'
35+
import bTab from './tab.vue'
36+
import bTooltip from './tooltip.vue'
37+
3638

3739
export {
3840
bAlert,

‎components/pagination.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
return {
5151
diff: 1,
5252
showPrev: false,
53-
showNext: false
53+
showNext: false,
54+
currentPage: 0,
5455
}
5556
},
5657
computed: {
@@ -104,11 +105,12 @@
104105
105106
},
106107
},
108+
watch: {
109+
currentPage: function (newPage) {
110+
this.$emit('change', newPage)
111+
}
112+
},
107113
props: {
108-
currentPage: {
109-
type: Number,
110-
default: 1,
111-
},
112114
limit: {
113115
type: Number,
114116
default: 7,

‎components/table.vue

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<template>
2+
<section>
3+
<table class="table">
4+
<thead>
5+
<tr>
6+
<template v-for="field in fields">
7+
<th>{{field.label}}</th>
8+
</template>
9+
</tr>
10+
</thead>
11+
<tbody>
12+
<tr v-for="item in _items">
13+
<template v-for="(field,key) in fields">
14+
<td>{{item[key]}}</td>
15+
</template>
16+
</tr>
17+
</tbody>
18+
</table>
19+
<div class="text-center">
20+
<b-pagination size="md"
21+
variant="primary"
22+
:total-rows="items.length"
23+
:per-page="size"
24+
@change="change"
25+
/>
26+
</div>
27+
</section>
28+
</template>
29+
30+
<script>
31+
export default{
32+
33+
data: () => {
34+
return {
35+
current: 0,
36+
size: 10,
37+
}
38+
},
39+
40+
props: ['items', 'fields'],
41+
42+
computed: {
43+
_items: function () {
44+
return this.items.slice(this.current * this.size, (this.current + 1) * this.size);
45+
}
46+
},
47+
48+
methods: {
49+
change: function (newPage) {
50+
this.current = newPage - 1;
51+
},
52+
}
53+
54+
}
55+
</script>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-vue",
3-
"version": "0.3.11",
3+
"version": "0.3.12",
44
"description": "Bootstrap 4 Components for Vue.js 2",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)