aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss/Style.scss
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/Timeline/Style.reel/scss/Style.scss
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 30bf43fe..3ea943d8 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -73,4 +73,11 @@ div.content-style input.nj-skinned {
73 font-size: 12px; 73 font-size: 12px;
74 top: -3px; 74 top: -3px;
75} 75}
76div.style-row .container-propvals {
77 overflow: hidden;
78}
79
80.content-style .style-row.style-selected {
81 //background-color: red !important;
82}
76 83