merge

predixdesignsystem · Dec 17, 2016 · e993aa8 · e993aa8
2 parents 85334be + 481627c
commit e993aa8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,7 +1,11 @@
-v0.6.3
+v0.6.4
 ==================
 * Bump color design
 
+v0.6.3
+==================
+* Hotfix for wrapper class lost when vulcanizing APM
+
 v0.6.2
 ==================
 * Themeable

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "px-vis-timeseries",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "main": [
         "px-vis-timeseries.html"
     ],

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "px-vis-timeseries",
     "author": "General Electric",
     "description": "A Px visualization timeseries chart",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "private": true,
     "extName": null,
     "repository": {

diff --git a/px-vis-timeseries.html b/px-vis-timeseries.html
@@ -41,7 +41,7 @@
   <template>
     <style include="px-vis-timeseries-styles"></style>
 
-    <div id="wrapper" class="flex--row u-m safariFlex safariFlexDirectionRow flex wrapper" >
+    <div id="wrapper" class="flex--row u-m safariFlex safariFlexDirectionRow flex wrapper" style="width:100%; height:100%">
       <!-- Safari 8 flex needs -webkit, which autoprefixer doesn't supply, for some reason. IE10 has it's own implementation of flex which doesn't recognize flex-basis. Joy.-->
         <div
         class="inline--flex flex--col" style$="-webkit-flex-basis:[[width]]px;flex-basis:[[width]]px;-ms-flex-preferred-size:[[width]]px;"