Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
fc73226
feat(b-sidebar): new custom component `<b-sidebar>`
tmorehouse Mar 26, 2020
071827d
Update sidebar.js
tmorehouse Mar 26, 2020
2b3cb7f
Update sidebar.js
tmorehouse Mar 26, 2020
62ce172
Update sidebar.spec.js
tmorehouse Mar 26, 2020
f25e750
Update package.json
tmorehouse Mar 26, 2020
fb8361f
Update sidebar.js
tmorehouse Mar 26, 2020
95330de
Update sidebar.spec.js
tmorehouse Mar 26, 2020
5eee438
Update sidebar.js
tmorehouse Mar 26, 2020
5f00732
Update index.scss
tmorehouse Mar 26, 2020
d342d8b
Update index.d.ts
tmorehouse Mar 26, 2020
2820346
Update index.js
tmorehouse Mar 26, 2020
73c2fdf
Update index.js
tmorehouse Mar 26, 2020
2e50870
Update _sidebar.scss
tmorehouse Mar 26, 2020
9c00066
Update _sidebar.scss
tmorehouse Mar 26, 2020
e671e7a
Update _sidebar.scss
tmorehouse Mar 26, 2020
63fabfd
Update sidebar.js
tmorehouse Mar 26, 2020
6c30bee
Update sidebar.js
tmorehouse Mar 26, 2020
a3c9821
Update package.json
tmorehouse Mar 26, 2020
99777dc
Update sidebar.js
tmorehouse Mar 26, 2020
8dcf643
Update sidebar.js
tmorehouse Mar 26, 2020
6c9f5de
Update sidebar.js
tmorehouse Mar 26, 2020
e88ea3a
Update sidebar.js
tmorehouse Mar 26, 2020
d61dce3
Update sidebar.js
tmorehouse Mar 26, 2020
f5c4541
Update _sidebar.scss
tmorehouse Mar 26, 2020
163d26a
Update _sidebar.scss
tmorehouse Mar 26, 2020
e3a27fb
Update sidebar.js
tmorehouse Mar 26, 2020
a3e3154
Update package.json
tmorehouse Mar 26, 2020
868c452
Update README.md
tmorehouse Mar 26, 2020
274511f
Update package.json
tmorehouse Mar 26, 2020
feba907
Update package.json
tmorehouse Mar 26, 2020
5c0397d
Update README.md
tmorehouse Mar 26, 2020
8cc30da
Update package.json
tmorehouse Mar 26, 2020
85f1000
Update _sidebar.scss
tmorehouse Mar 26, 2020
b590176
Merge branch 'dev' into feat-sidebar
tmorehouse Mar 26, 2020
fa98abf
Merge branch 'dev' into feat-sidebar
tmorehouse Mar 26, 2020
d53ec1f
Update sidebar.js
tmorehouse Mar 26, 2020
f4b745e
Update package.json
tmorehouse Mar 26, 2020
f8fbdce
Update sidebar.js
tmorehouse Mar 26, 2020
344d003
Update package.json
tmorehouse Mar 26, 2020
cb5b513
Update sidebar.js
tmorehouse Mar 26, 2020
a01a464
Update sidebar.js
tmorehouse Mar 27, 2020
70e291a
Update sidebar.js
tmorehouse Mar 27, 2020
4aa7d48
Merge branch 'dev' into feat-sidebar
tmorehouse Mar 27, 2020
8d6cde2
Update _sidebar.scss
tmorehouse Mar 27, 2020
876d628
Update sidebar.js
tmorehouse Mar 27, 2020
2863bdb
Update sidebar.js
tmorehouse Mar 27, 2020
5abb403
Update sidebar.js
tmorehouse Mar 27, 2020
d23458a
Update _sidebar.scss
tmorehouse Mar 27, 2020
1210b83
Update _sidebar.scss
tmorehouse Mar 27, 2020
48a0c64
Update sidebar.js
tmorehouse Mar 27, 2020
b8d6449
Update _sidebar.scss
tmorehouse Mar 27, 2020
8b939f3
Update sidebar.js
tmorehouse Mar 27, 2020
d352aa6
Update _sidebar.scss
tmorehouse Mar 27, 2020
303e6b7
Update sidebar.js
tmorehouse Mar 27, 2020
fb60007
Update _sidebar.scss
tmorehouse Mar 27, 2020
d374ffe
Update sidebar.js
tmorehouse Mar 27, 2020
470db86
Update package.json
tmorehouse Mar 27, 2020
1f90ddc
Update README.md
tmorehouse Mar 27, 2020
749a233
Update README.md
tmorehouse Mar 27, 2020
e64e04e
Update index.js
tmorehouse Mar 27, 2020
ecd25c8
Update styles.scss
tmorehouse Mar 27, 2020
8610391
Update README.md
tmorehouse Mar 27, 2020
2ef72f6
Update README.md
tmorehouse Mar 27, 2020
d4afa41
Update sidebar.js
tmorehouse Mar 27, 2020
37ad748
Update package.json
tmorehouse Mar 27, 2020
478df5c
Update README.md
tmorehouse Mar 27, 2020
f164696
Update sidebar.js
tmorehouse Mar 27, 2020
87b7707
Update package.json
tmorehouse Mar 27, 2020
afff60f
Update README.md
tmorehouse Mar 27, 2020
a1647bc
Update README.md
tmorehouse Mar 27, 2020
c43f0b2
Update _sidebar.scss
tmorehouse Mar 27, 2020
643377d
Update README.md
tmorehouse Mar 27, 2020
a6ffbca
Update sidebar.js
tmorehouse Mar 27, 2020
d3f179e
Update package.json
tmorehouse Mar 27, 2020
114b580
Update _variables.scss
tmorehouse Mar 27, 2020
e66cef3
Update _sidebar.scss
tmorehouse Mar 27, 2020
5f8d8bc
Update README.md
tmorehouse Mar 27, 2020
cee39ce
Update sidebar.js
tmorehouse Mar 27, 2020
1557dd3
Update README.md
tmorehouse Mar 27, 2020
54f416f
Update package.json
tmorehouse Mar 27, 2020
c05ac65
Update README.md
tmorehouse Mar 27, 2020
d09b8cc
Update README.md
tmorehouse Mar 27, 2020
1d412d6
Update README.md
tmorehouse Mar 27, 2020
5beed81
Update _sidebar.scss
jacobmllr95 Mar 27, 2020
99d618c
Update package.json
jacobmllr95 Mar 27, 2020
34f6a72
Update README.md
jacobmllr95 Mar 27, 2020
a2fce9e
`input` => `change`
jacobmllr95 Mar 27, 2020
71c9c8c
Add global settings and markup improvements
jacobmllr95 Mar 27, 2020
f4db3f7
Update sidebar.js
jacobmllr95 Mar 27, 2020
735232b
Update sidebar.js
jacobmllr95 Mar 27, 2020
cd1b1e6
Update sidebar.js
tmorehouse Mar 27, 2020
c25340b
Update config-defaults.js
tmorehouse Mar 27, 2020
6517561
Update sidebar.js
tmorehouse Mar 27, 2020
05c214e
Update _sidebar.scss
tmorehouse Mar 27, 2020
d8fb3b0
Update sidebar.js
jacobmllr95 Mar 27, 2020
9449532
Merge branch 'feat-sidebar' of https://github.com/bootstrap-vue/boots…
jacobmllr95 Mar 27, 2020
ec94f5f
Update _sidebar.scss
tmorehouse Mar 27, 2020
736e12c
Update _sidebar.scss
tmorehouse Mar 27, 2020
e9af464
Update package.json
tmorehouse Mar 27, 2020
312e771
Update package.json
tmorehouse Mar 27, 2020
56f1ff8
Update README.md
tmorehouse Mar 27, 2020
68a7a09
Update package.json
tmorehouse Mar 27, 2020
46ab465
Update README.md
jacobmllr95 Mar 27, 2020
3a57796
Update sidebar.spec.js
tmorehouse Mar 27, 2020
31f0e89
Update README.md
tmorehouse Mar 27, 2020
1c4bc01
Update _sidebar.scss
tmorehouse Mar 27, 2020
5a45416
Update sidebar.js
tmorehouse Mar 27, 2020
f8be9d5
Update README.md
tmorehouse Mar 27, 2020
5a3046c
Update sidebar.js
tmorehouse Mar 27, 2020
64714b2
Update package.json
tmorehouse Mar 27, 2020
6738df9
Update README.md
tmorehouse Mar 27, 2020
893ae56
Update sidebar.js
tmorehouse Mar 27, 2020
c5e7827
Update README.md
jacobmllr95 Mar 27, 2020
c81f599
Update sidebar.js
jacobmllr95 Mar 27, 2020
3538c46
Update bv-tooltip.js
tmorehouse Mar 27, 2020
0861b0b
Update bv-tooltip.js
tmorehouse Mar 27, 2020
66af75b
Update sidebar.spec.js
tmorehouse Mar 27, 2020
b354af4
Update sidebar.spec.js
tmorehouse Mar 27, 2020
feb4120
Update sidebar.js
tmorehouse Mar 27, 2020
9f0704d
Update sidebar.spec.js
tmorehouse Mar 27, 2020
f445b9f
Update sidebar.js
tmorehouse Mar 27, 2020
3ec4cfe
Update sidebar.spec.js
tmorehouse Mar 27, 2020
5529587
Update sidebar.spec.js
tmorehouse Mar 27, 2020
c782317
Update sidebar.spec.js
tmorehouse Mar 27, 2020
921252e
Update sidebar.js
tmorehouse Mar 27, 2020
a368863
Update sidebar.spec.js
tmorehouse Mar 27, 2020
8315fdc
Update sidebar.spec.js
tmorehouse Mar 27, 2020
549e2e4
Update sidebar.js
tmorehouse Mar 27, 2020
5cc3401
Update sidebar.spec.js
tmorehouse Mar 27, 2020
4a20a36
lint
tmorehouse Mar 27, 2020
00afcda
Update sidebar.js
tmorehouse Mar 27, 2020
ffc949c
Update sidebar.js
tmorehouse Mar 27, 2020
5608f4e
Update sidebar.spec.js
tmorehouse Mar 27, 2020
383358f
Update sidebar.js
tmorehouse Mar 27, 2020
ade1dbb
Update README.md
tmorehouse Mar 27, 2020
36096b2
Update package.json
tmorehouse Mar 27, 2020
62acc71
Update sidebar.js
tmorehouse Mar 27, 2020
3f3a5f2
Update sidebar.spec.js
tmorehouse Mar 27, 2020
8eba605
Update README.md
tmorehouse Mar 27, 2020
76cfa24
Update package.json
tmorehouse Mar 27, 2020
8b627df
Update package.json
tmorehouse Mar 27, 2020
25a1e34
Update sidebar.js
tmorehouse Mar 27, 2020
05394ac
Update package.json
tmorehouse Mar 27, 2020
3ecc2e1
Update sidebar.js
tmorehouse Mar 27, 2020
dc99f09
Update README.md
jacobmllr95 Mar 28, 2020
4cdb993
Update sidebar.spec.js
jacobmllr95 Mar 28, 2020
e73d2ee
Update config-defaults.js
jacobmllr95 Mar 28, 2020
0f94fc6
Merge branch 'dev' into feat-sidebar
jacobmllr95 Mar 28, 2020
6e7123e
Update modal.js
jacobmllr95 Mar 28, 2020
b5a143d
Update sidebar.spec.js
tmorehouse Mar 28, 2020
55a0311
Update sidebar.js
jacobmllr95 Mar 28, 2020
fe1f966
Merge branch 'feat-sidebar' of https://github.com/bootstrap-vue/boots…
jacobmllr95 Mar 28, 2020
5e7e4a1
Update sidebar.spec.js
jacobmllr95 Mar 28, 2020
41f2fd9
Update package.json
jacobmllr95 Mar 28, 2020
4acc30e
Update form-timepicker.js
jacobmllr95 Mar 28, 2020
fb80818
Update modal.js
jacobmllr95 Mar 28, 2020
521ef85
Update sidebar.spec.js
tmorehouse Mar 28, 2020
890ff37
Update sidebar.spec.js
tmorehouse Mar 28, 2020
914efdc
Merge branch 'dev' into feat-sidebar
tmorehouse Mar 29, 2020
4843f54
Merge branch 'dev' into feat-sidebar
tmorehouse Mar 29, 2020
bcff309
Merge branch 'dev' into feat-sidebar
jacobmllr95 Mar 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/assets/scss/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ table#table-transition-example {
}
}

// `<b-sidebar>` overrides for docs
.b-sidebar {
z-index: 1071;
}

// Docsearch overrides
// See: https://github.com/twbs/bootstrap/blob/master/site/static/docs/4.3/assets/scss/_algolia.scss
.algolia-autocomplete {
Expand Down
9 changes: 9 additions & 0 deletions src/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ $b-icon-animation-spin-reverse-pulse-duration: $b-icon-animation-spin-pulse-dura
$b-icon-animation-cylon-duration: 0.75s !default;
$b-icon-animation-cylon-vertical-duration: $b-icon-animation-cylon-duration !default;

// --- Sidebar ---

$b-sidebar-width: 320px !default;
$b-sidebar-transition-duration: 0.3s !default;
$b-sidebar-zindex: calc(#{$zindex-fixed} + 5) !default;
$b-sidebar-header-font-size: 1.5rem !default;
$b-sidebar-header-padding-y: $navbar-padding-y !default;
$b-sidebar-header-padding-x: $navbar-padding-x !default;

// --- Tables ---

// Table busy state
Expand Down
2 changes: 1 addition & 1 deletion src/components/form-timepicker/form-timepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export const BFormTimepicker = /*#__PURE__*/ Vue.extend({
this.localHMS = newVal || ''
},
localHMS(newVal) {
// We only update hte v-model value when the timepicker
// We only update the v-model value when the timepicker
// is open, to prevent cursor jumps when bound to a
// text input in button only mode
if (this.isVisible) {
Expand Down
1 change: 1 addition & 0 deletions src/components/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export * from './pagination'
export * from './pagination-nav'
export * from './popover'
export * from './progress'
export * from './sidebar'
export * from './spinner'
export * from './table'
export * from './tabs'
Expand Down
2 changes: 2 additions & 0 deletions src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { PaginationPlugin } from './pagination'
import { PaginationNavPlugin } from './pagination-nav'
import { PopoverPlugin } from './popover'
import { ProgressPlugin } from './progress'
import { SidebarPlugin } from './sidebar'
import { SpinnerPlugin } from './spinner'
// Table plugin includes TableLitePlugin and TableSimplePlugin
import { TablePlugin } from './table'
Expand Down Expand Up @@ -94,6 +95,7 @@ export const componentsPlugin = /*#__PURE__*/ pluginFactory({
PaginationNavPlugin,
PopoverPlugin,
ProgressPlugin,
SidebarPlugin,
SpinnerPlugin,
TablePlugin,
TabsPlugin,
Expand Down
1 change: 1 addition & 0 deletions src/components/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@import "pagination/index";
@import "pagination-nav/index";
@import "popover/index";
@import "sidebar/index";
@import "table/index";
@import "time/index";
@import "toast/index";
Expand Down
13 changes: 13 additions & 0 deletions src/components/modal/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,18 +189,22 @@ export const props = {
type: [String, Array, Object],
default: null
},
// TODO: Rename to `noHeader` and deprecate `hideHeader`
hideHeader: {
type: Boolean,
default: false
},
// TODO: Rename to `noFooter` and deprecate `hideFooter`
hideFooter: {
type: Boolean,
default: false
},
// TODO: Rename to `noHeaderClose` and deprecate `hideHeaderClose`
hideHeaderClose: {
type: Boolean,
default: false
},
// TODO: Rename to `noBackdrop` and deprecate `hideBackdrop`
hideBackdrop: {
type: Boolean,
default: false
Expand Down Expand Up @@ -835,6 +839,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
// Modal header
let header = h()
if (!this.hideHeader) {
// TODO: Rename slot to `header` and deprecate `modal-header`
let modalHeader = this.normalizeSlot('modal-header', this.slotScope)
if (!modalHeader) {
let closeButton = h()
Expand All @@ -851,10 +856,12 @@ export const BModal = /*#__PURE__*/ Vue.extend({
},
on: { click: this.onClose }
},
// TODO: Rename slot to `header-close` and deprecate `modal-header-close`
[this.normalizeSlot('modal-header-close')]
)
}
const domProps =
// TODO: Rename slot to `title` and deprecate `modal-title`
!this.hasNormalizedSlot('modal-title') && this.titleHtml
? { innerHTML: this.titleHtml }
: {}
Expand All @@ -867,6 +874,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
attrs: { id: this.safeId('__BV_modal_title_') },
domProps
},
// TODO: Rename slot to `title` and deprecate `modal-title`
[this.normalizeSlot('modal-title', this.slotScope) || stripTags(this.title)]
),
closeButton
Expand Down Expand Up @@ -899,6 +907,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
// Modal footer
let footer = h()
if (!this.hideFooter) {
// TODO: Rename slot to `footer` and deprecate `modal-footer`
let modalFooter = this.normalizeSlot('modal-footer', this.slotScope)
if (!modalFooter) {
let cancelButton = h()
Expand All @@ -916,6 +925,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
on: { click: this.onCancel }
},
[
// TODO: Rename slot to `cancel-button` and deprecate `modal-cancel`
this.normalizeSlot('modal-cancel') ||
(cancelHtml ? h('span', { domProps: cancelHtml }) : stripTags(this.cancelTitle))
]
Expand All @@ -934,6 +944,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
on: { click: this.onOk }
},
[
// TODO: Rename slot to `ok-button` and deprecate `modal-ok`
this.normalizeSlot('modal-ok') ||
(okHtml ? h('span', { domProps: okHtml }) : stripTags(this.okTitle))
]
Expand Down Expand Up @@ -1009,6 +1020,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
'aria-labelledby':
this.hideHeader ||
this.ariaLabel ||
// TODO: Rename slot to `title` and deprecate `modal-title`
!(this.hasNormalizedSlot('modal-title') || this.titleHtml || this.title)
? null
: this.safeId('__BV_modal_title_'),
Expand Down Expand Up @@ -1052,6 +1064,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
backdrop = h(
'div',
{ staticClass: 'modal-backdrop', attrs: { id: this.safeId('__BV_modal_backdrop_') } },
// TODO: Rename slot to `backdrop` and deprecate `modal-backdrop`
[this.normalizeSlot('modal-backdrop')]
)
}
Expand Down
Loading