Permalink
Browse files

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

* fix(Progress) height prop

Move height prop from progress-bar to progress according to current Bootstrap4-beta2.
fixes #1216

* Update progress-bar.vue

* fix dangling comma
  • Loading branch information...
mosinve authored and tmorehouse committed Oct 21, 2017
1 parent cc3916c commit a963ea33dab46e4009c740f072f09eee6c5f9ade
Showing with 4 additions and 15 deletions.
  1. +3 −13 lib/components/progress-bar.vue
  2. +1 −2 lib/components/progress.vue
@@ -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() {
@@ -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;
@@ -107,11 +101,7 @@
showValue: {
type: Boolean,
default: null
},
height: {
type: String,
default: null
}
}
}
};
</script>
@@ -1,5 +1,5 @@
<template>
<div class="progress">
<div class="progress" :height="height">
<slot>
<b-progress-bar :value="value"
:max="max"
@@ -9,7 +9,6 @@
:striped="striped"
:show-progress="showProgress"
:show-value="showValue"
:height="height"
></b-progress-bar>
</slot>
</div>

0 comments on commit a963ea3

Please sign in to comment.