diff options
author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/panels/Timeline/Keyframe.reel/css | |
parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/css')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/css/Keyframe.css | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css new file mode 100644 index 00000000..4afc1180 --- /dev/null +++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css | |||
@@ -0,0 +1,15 @@ | |||
1 | .tween_keyframe{ | ||
2 | position: absolute; | ||
3 | height: 16px; | ||
4 | width: 5px; | ||
5 | background-color: white; | ||
6 | z-index: 23; | ||
7 | border-radius: 3px; | ||
8 | } | ||
9 | |||
10 | .tween_keyframe.keyframeSelected{ | ||
11 | background-color: #570e19; | ||
12 | border-style: solid; | ||
13 | border-width: thin; | ||
14 | border-color: #d6d1cf; | ||
15 | } \ No newline at end of file | ||