Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/node_modules/montage/ui/text-slider.reel/text-slider.css b/node_modules/montage/ui/text-slider.reel/text-slider.css
new file mode 100644
index 00000000..de63381e
--- /dev/null
+++ b/node_modules/montage/ui/text-slider.reel/text-slider.css
@@ -0,0 +1,15 @@
+.montage-text-slider-input {
+    display: none;
+}
+
+.montage-text-slider-editing .montage-text-slider-input {
+    display: inherit;
+}
+
+.montage-text-slider-value {
+    border-bottom: 1px dotted #000;
+}
+
+.montage-text-slider-editing .montage-text-slider-value, .montage-text-slider-editing .montage-text-slider-label {
+    display: none;
+}
\ No newline at end of file