From 6c1a309c407ce4afc0ab763f7426d9f427e4c75f Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 9 Jun 2015 00:26:15 -0700 Subject: [PATCH 1/2] Minor CSS fixes for frontend --- homeassistant/components/frontend/version.py | 2 +- .../components/frontend/www_static/frontend.html | 14 ++++++++------ .../polymer/layouts/home-assistant-main.html | 12 +++++++----- .../www_static/polymer/layouts/partial-base.html | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index 6646e9da2be..00184d2224b 100644 --- a/homeassistant/components/frontend/version.py +++ b/homeassistant/components/frontend/version.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "6b9ac5df0217decb6a939e04824a96ff" +VERSION = "e53215fa1416dbbc7819452b4f38689c" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index 6bf54e6d64e..335b5400834 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -21188,7 +21188,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] { -
+
@@ -26314,6 +26314,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN cursor: pointer; } + paper-icon-item.logout { + margin-top: 16px; + } + .divider { border-top: 1px solid #e0e0e0; } @@ -26337,10 +26341,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN -
Home Assistant
+
Home Assistant
- + States @@ -26366,9 +26370,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN -
- - + Log Out diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html b/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html index 11ecff37f8a..a3b9ea3246b 100644 --- a/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html +++ b/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html @@ -39,6 +39,10 @@ cursor: pointer; } + paper-icon-item.logout { + margin-top: 16px; + } + .divider { border-top: 1px solid #e0e0e0; } @@ -62,10 +66,10 @@ -
Home Assistant
+
Home Assistant
- @@ -93,9 +97,7 @@ -
- - + Log Out diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html index 0229af9318a..66f67015f81 100644 --- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html +++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html @@ -10,7 +10,7 @@ -
+
From ca373b5aa579ce6d984db2e77c20cf88da0298bb Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 9 Jun 2015 20:53:50 -0700 Subject: [PATCH 2/2] Frontend: Workaround for tap bug in paper-dialog --- homeassistant/components/frontend/version.py | 2 +- .../components/frontend/www_static/frontend.html | 10 ++++------ .../frontend/www_static/polymer/cards/state-card.html | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index 00184d2224b..3e032816d91 100644 --- a/homeassistant/components/frontend/version.py +++ b/homeassistant/components/frontend/version.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "e53215fa1416dbbc7819452b4f38689c" +VERSION = "1cc966bcef26a859d053bd5c46769a99" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index 335b5400834..a970f484450 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -22375,15 +22375,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }, listeners: { - 'tap': 'cardTapped', + // listening for click instead of tap as a work around + // https://github.com/PolymerElements/iron-overlay-behavior/issues/14 + 'click': 'cardTapped', }, cardTapped: function() { - // Debounce wrapper added as workaround for bug - // https://github.com/PolymerElements/iron-overlay-behavior/issues/14 - this.debounce('show-more-info-dialog', function() { - uiActions.showMoreInfoDialog(this.stateObj.entityId); - }, 1); + uiActions.showMoreInfoDialog(this.stateObj.entityId); }, }); })(); diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html index a1d46c07282..341d21212a1 100644 --- a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html +++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html @@ -37,15 +37,13 @@ }, listeners: { - 'tap': 'cardTapped', + // listening for click instead of tap as a work around + // https://github.com/PolymerElements/iron-overlay-behavior/issues/14 + 'click': 'cardTapped', }, cardTapped: function() { - // Debounce wrapper added as workaround for bug - // https://github.com/PolymerElements/iron-overlay-behavior/issues/14 - this.debounce('show-more-info-dialog', function() { - uiActions.showMoreInfoDialog(this.stateObj.entityId); - }, 1); + uiActions.showMoreInfoDialog(this.stateObj.entityId); }, }); })();