Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Progress): Bootstrap V4.beta.2 CSS height prop change #1217

Merged
merged 3 commits into from Oct 21, 2017
Merged

fix(Progress): Bootstrap V4.beta.2 CSS height prop change #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bde3593
fix(Progress) height prop
mosinve Oct 21, 2017
ebaf532
Update progress-bar.vue
mosinve Oct 21, 2017
a80d3c7
fix dangling comma
tmorehouse Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 3 additions & 13 deletions lib/components/progress-bar.vue
View file
Open in desktop
Expand Up @@ -27,9 +27,7 @@
},
progressBarStyles() {
return {
width: (100 * (this.value / this.computedMax)) + '%',
height: this.computedHeight,
lineHeight: this.computedHeight
width: (100 * (this.value / this.computedMax)) + '%'
};
},
progress() {
Expand All @@ -39,11 +37,7 @@
computedMax() {
// Prefer our max over parent setting
return typeof this.max === 'number' ? this.max : (this.$parent.max || 100);
},
computedHeight() {
// Prefer parent height over our height
return this.$parent.height || this.height || '1rem';
},
},
computedVariant() {
// Prefer our variant over parent setting
return this.variant || this.$parent.variant;
Expand Down Expand Up @@ -107,11 +101,7 @@
showValue: {
type: Boolean,
default: null
},
height: {
type: String,
default: null
}
}
}
};
</script>
3 changes: 1 addition & 2 deletions lib/components/progress.vue
View file
Open in desktop
@@ -1,5 +1,5 @@
<template>
<div class="progress">
<div class="progress" :height="height">
<slot>
<b-progress-bar :value="value"
:max="max"
Expand All @@ -9,7 +9,6 @@
:striped="striped"
:show-progress="showProgress"
:show-value="showValue"
:height="height"
></b-progress-bar>
</slot>
</div>
Expand Down