From fbca206e49a64aa96d9feec01663fdb0af05e1d9 Mon Sep 17 00:00:00 2001
From: Javi Velasco <javier.velasco86@gmail.com>
Date: Fri, 3 Jun 2016 23:50:09 +0200
Subject: [PATCH] Latest build

---
 lib/app_bar/_config.scss         | 2 ++
 lib/app_bar/theme.scss           | 8 ++++++++
 lib/autocomplete/Autocomplete.js | 4 +++-
 lib/button/theme.scss            | 2 +-
 lib/utils/events.js              | 8 ++++----
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/app_bar/_config.scss b/lib/app_bar/_config.scss
index 067be337..5c76b618 100644
--- a/lib/app_bar/_config.scss
+++ b/lib/app_bar/_config.scss
@@ -2,5 +2,7 @@ $appbar-color: $color-primary-dark !default;
 $appbar-contrast: $color-primary-contrast !default;
 $appbar-title-total-distance: 8 * $unit !default;
 $appbar-height: 6.4 * $unit !default;
+$appbar-height-m-portrait: 5.6 * $unit !default;
+$appbar-height-m-landscape: 4.8 * $unit !default;
 $appbar-h-padding: 2.4 * $unit !default;
 $appbar-title-distance: $appbar-title-total-distance - $appbar-h-padding !default;
diff --git a/lib/app_bar/theme.scss b/lib/app_bar/theme.scss
index 50ad328b..7a8c4346 100644
--- a/lib/app_bar/theme.scss
+++ b/lib/app_bar/theme.scss
@@ -9,6 +9,14 @@
   color: $appbar-contrast;
   background: $appbar-color;
 
+  @media screen and (max-width: $layout-breakpoint-xxs) and (orientation: portrait) {
+    height: $appbar-height-m-portrait;
+  }
+
+  @media screen and (max-width: $layout-breakpoint-xs) and (orientation: landscape) {
+    height: $appbar-height-m-landscape;
+  }
+
   &:not(.flat) {
     z-index: $z-index-high;
     box-shadow: 0 2px 5px rgba(0,0,0,.26);
diff --git a/lib/autocomplete/Autocomplete.js b/lib/autocomplete/Autocomplete.js
index 916c28b9..91a25484 100644
--- a/lib/autocomplete/Autocomplete.js
+++ b/lib/autocomplete/Autocomplete.js
@@ -118,7 +118,9 @@ var factory = function factory(Chip, Input) {
       key: 'componentWillReceiveProps',
       value: function componentWillReceiveProps(nextProps) {
         if (!this.props.multiple) {
-          this.setState({ query: nextProps.value });
+          this.setState({
+            query: this.query(nextProps.value)
+          });
         }
       }
     }, {
diff --git a/lib/button/theme.scss b/lib/button/theme.scss
index e28fb5ca..757e2056 100644
--- a/lib/button/theme.scss
+++ b/lib/button/theme.scss
@@ -8,7 +8,7 @@
 %button {
   @include typo-button();
   position: relative;
-  display: inline-block;
+  display: inline-flex;
   height: $button-height;
   flex-direction: row;
   align-content: center;
diff --git a/lib/utils/events.js b/lib/utils/events.js
index 22be878a..87e42c56 100644
--- a/lib/utils/events.js
+++ b/lib/utils/events.js
@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = {
   getMousePosition: function getMousePosition(event) {
     return {
-      x: event.pageX - window.scrollX,
-      y: event.pageY - window.scrollY
+      x: event.pageX - (window.scrollX || window.pageXOffset),
+      y: event.pageY - (window.scrollY || window.pageYOffset)
     };
   },
   getTouchPosition: function getTouchPosition(event) {
     return {
-      x: event.touches[0].pageX - window.scrollX,
-      y: event.touches[0].pageY - window.scrollY
+      x: event.touches[0].pageX - (window.scrollX || window.pageXOffset),
+      y: event.touches[0].pageY - (window.scrollY || window.pageYOffset)
     };
   },
   pauseEvent: function pauseEvent(event) {