Merge pull request #3287 from hashicorp/b-ui-firefox-styles

Fix style discrepancies in Firefox
This commit is contained in:
Michael Lange 2017-09-29 11:38:50 -07:00 committed by GitHub
commit 365706c9f5
4 changed files with 27 additions and 12 deletions

View file

@ -1,12 +1,13 @@
import Ember from 'ember'; import Ember from 'ember';
import d3 from 'npm:d3-selection'; import d3 from 'npm:d3-selection';
import 'npm:d3-transition'; import 'npm:d3-transition';
import WindowResizable from '../mixins/window-resizable';
import styleStringProperty from '../utils/properties/style-string'; import styleStringProperty from '../utils/properties/style-string';
const { Component, computed, run, assign, guidFor } = Ember; const { Component, computed, run, assign, guidFor } = Ember;
const sumAggregate = (total, val) => total + val; const sumAggregate = (total, val) => total + val;
export default Component.extend({ export default Component.extend(WindowResizable, {
classNames: ['chart', 'distribution-bar'], classNames: ['chart', 'distribution-bar'],
classNameBindings: ['isNarrow:is-narrow'], classNameBindings: ['isNarrow:is-narrow'],
@ -124,6 +125,7 @@ export default Component.extend({
.attr('y', () => isNarrow ? '50%' : 0) .attr('y', () => isNarrow ? '50%' : 0)
.attr('clip-path', `url(#${this.get('maskId')})`) .attr('clip-path', `url(#${this.get('maskId')})`)
.attr('height', () => isNarrow ? '6px' : '100%') .attr('height', () => isNarrow ? '6px' : '100%')
.attr('transform', () => isNarrow && 'translate(0, -3)')
.merge(layers) .merge(layers)
.attr('class', (d, i) => `bar layer-${i}`) .attr('class', (d, i) => `bar layer-${i}`)
.transition() .transition()
@ -138,4 +140,8 @@ export default Component.extend({
} }
}, },
/* eslint-enable */ /* eslint-enable */
windowResizeHandler() {
run.once(this, this.renderChart);
},
}); });

View file

@ -0,0 +1,16 @@
import Ember from 'ember';
const { run, $ } = Ember;
export default Ember.Mixin.create({
setupWindowResize: function() {
run.scheduleOnce('afterRender', this, () => {
this.set('_windowResizeHandler', this.get('windowResizeHandler').bind(this));
$(window).on('resize', this.get('_windowResizeHandler'));
});
}.on('didInsertElement'),
removeWindowResize: function() {
$(window).off('resize', this.get('_windowResizeHandler'));
}.on('willDestroyElement'),
});

View file

@ -21,12 +21,7 @@
opacity: 0; opacity: 0;
} }
$color-sequence: $orange, $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple,
$yellow,
$green,
$turquoise,
$blue,
$purple,
$red; $red;
@for $i from 1 through length($color-sequence) { @for $i from 1 through length($color-sequence) {
@ -69,7 +64,8 @@
// Ensure two columns, but don't use the full width // Ensure two columns, but don't use the full width
width: 35%; width: 35%;
.label, .value { .label,
.value {
display: inline; display: inline;
font-weight: $weight-normal; font-weight: $weight-normal;
} }
@ -89,8 +85,4 @@
} }
} }
} }
&.is-narrow .bar {
transform: translateY(-50%);
}
} }

View file

@ -35,6 +35,7 @@
display: block; display: block;
position: absolute; position: absolute;
left: 0px; left: 0px;
top: 1.25em;
} }
} }