Merge branch 'master' into wc-polyfill-loader

vaadin · Jan 30, 2019 · 7af4342 · 7af4342
2 parents 0e9016e + 8ada012
commit 7af4342
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/.npmignore b/.npmignore
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/vaadin-app-layout",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "vaadin-app-layout",
   "main": "vaadin-app-layout.html",
   "repository": "vaadin/vaadin-app-layout",
@@ -17,6 +17,11 @@
     "url": "https://github.com/vaadin/vaadin-app-layout/issues"
   },
   "homepage": "https://vaadin.com/components",
+  "files": [
+    "vaadin-*.js",
+    "src",
+    "theme"
+  ],
   "scripts": {
     "test": "wct",
     "preversion": "gulp version:update"

diff --git a/src/vaadin-app-layout.html b/src/vaadin-app-layout.html
@@ -13,7 +13,7 @@
   <template>
     <style>
       :host {
-        display: flex;
+        display: flex !important;
         flex-direction: column-reverse;
         position: fixed;
         top: 0;
@@ -69,6 +69,7 @@
 
       [part="content"] {
         flex: auto;
+        height: 100%;
         overflow: auto;
         -webkit-overflow-scrolling: touch;
       }
@@ -165,7 +166,7 @@
           return 'vaadin-app-layout';
         }
         static get version() {
-          return '1.0.0';
+          return '1.0.2';
         }
 
         constructor() {