From 65a74f68d5a5240bd33ec6738f10d24527eb7c57 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 6 Jul 2015 00:28:22 -0700 Subject: [PATCH 1/5] Frontend: migrate to Polymer-based color picker --- .../frontend/www_static/polymer/bower.json | 1 - .../polymer/components/ha-color-picker.html | 169 ++++++++++++++++++ .../polymer/more-infos/more-info-light.html | 4 +- 3 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 homeassistant/components/frontend/www_static/polymer/components/ha-color-picker.html diff --git a/homeassistant/components/frontend/www_static/polymer/bower.json b/homeassistant/components/frontend/www_static/polymer/bower.json index 3544f6f8d1a..093fed11a46 100644 --- a/homeassistant/components/frontend/www_static/polymer/bower.json +++ b/homeassistant/components/frontend/www_static/polymer/bower.json @@ -35,7 +35,6 @@ "google-apis": "GoogleWebComponents/google-apis#0.8-preview", "moment": "^2.10.3", "layout": "Polymer/layout", - "color-picker-element": "~0.0.3", "paper-styles": "polymerelements/paper-styles#^1.0.0", "lodash": "~3.9.3", "pikaday": "~1.3.2" diff --git a/homeassistant/components/frontend/www_static/polymer/components/ha-color-picker.html b/homeassistant/components/frontend/www_static/polymer/components/ha-color-picker.html new file mode 100644 index 00000000000..46ced3ddf64 --- /dev/null +++ b/homeassistant/components/frontend/www_static/polymer/components/ha-color-picker.html @@ -0,0 +1,169 @@ + + + + + + + + diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html index b9d49e1f474..c76df239c03 100644 --- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html +++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html @@ -1,7 +1,7 @@ - + diff --git a/homeassistant/components/frontend/www_static/polymer/components/ha-sidebar.html b/homeassistant/components/frontend/www_static/polymer/components/ha-sidebar.html index c8c8e32ebfb..8746ee126c8 100644 --- a/homeassistant/components/frontend/www_static/polymer/components/ha-sidebar.html +++ b/homeassistant/components/frontend/www_static/polymer/components/ha-sidebar.html @@ -19,6 +19,12 @@ Too broken for now. background: #fafafa; box-shadow: 1px 0 1px rgba(0, 0, 0, 0.1); overflow: hidden; + + white-space: nowrap; + + -ms-user-select: none; + -webkit-user-select: none; + -moz-user-select: none; } /*.sidenav paper-menu { 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 66f67015f81..3e1e5cc57fc 100644 --- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html +++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html @@ -6,6 +6,13 @@ +