diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/skeleton/range-input.reel/range-input.css | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/skeleton/range-input.reel/range-input.css')
-rw-r--r-- | node_modules/montage/ui/skeleton/range-input.reel/range-input.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/skeleton/range-input.reel/range-input.css b/node_modules/montage/ui/skeleton/range-input.reel/range-input.css index 07e6031e..43bf5b2c 100644 --- a/node_modules/montage/ui/skeleton/range-input.reel/range-input.css +++ b/node_modules/montage/ui/skeleton/range-input.reel/range-input.css | |||
@@ -2,7 +2,7 @@ | |||
2 | display: inline-block; | 2 | display: inline-block; |
3 | border-radius: 4px; | 3 | border-radius: 4px; |
4 | position: relative; | 4 | position: relative; |
5 | height: 5px; | 5 | height: 8px; |
6 | background-color: #556270; | 6 | background-color: #556270; |
7 | border: 1px solid #aaa; | 7 | border: 1px solid #aaa; |
8 | cursor: default; | 8 | cursor: default; |
@@ -17,9 +17,9 @@ | |||
17 | height: 1.2em; | 17 | height: 1.2em; |
18 | background-color: #ddd; | 18 | background-color: #ddd; |
19 | color: #fff; | 19 | color: #fff; |
20 | padding: 2px; | 20 | padding: 4px; |
21 | border: 1px solid #333; | 21 | border: 1px solid #333; |
22 | border-radius: 10px; | 22 | border-radius: 20px; |
23 | } | 23 | } |
24 | 24 | ||
25 | .slider-handle:hover { | 25 | .slider-handle:hover { |