diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/text-slider.reel/text-slider.css | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/text-slider.reel/text-slider.css')
-rw-r--r-- | node_modules/montage/ui/text-slider.reel/text-slider.css | 15 |
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 @@ | |||
1 | .montage-text-slider-input { | ||
2 | display: none; | ||
3 | } | ||
4 | |||
5 | .montage-text-slider-editing .montage-text-slider-input { | ||
6 | display: inherit; | ||
7 | } | ||
8 | |||
9 | .montage-text-slider-value { | ||
10 | border-bottom: 1px dotted #000; | ||
11 | } | ||
12 | |||
13 | .montage-text-slider-editing .montage-text-slider-value, .montage-text-slider-editing .montage-text-slider-label { | ||
14 | display: none; | ||
15 | } \ No newline at end of file | ||