diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/Timeline/Layer.reel/scss | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-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/Layer.reel/scss')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index a407c9dc..8f8881dd 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss | |||
| @@ -74,7 +74,8 @@ | |||
| 74 | 74 | ||
| 75 | /******************************************/ | 75 | /******************************************/ |
| 76 | 76 | ||
| 77 | .container-layer { | 77 | .container-layer, |
| 78 | .container-layer.selected { | ||
| 78 | background-color: $color-panel-bg; | 79 | background-color: $color-panel-bg; |
| 79 | color: $color-panel-text; | 80 | color: $color-panel-text; |
| 80 | font-size: 12px; | 81 | font-size: 12px; |
| @@ -108,7 +109,7 @@ | |||
| 108 | 109 | ||
| 109 | 110 | ||
| 110 | .layerSelected .label-layer { | 111 | .layerSelected .label-layer { |
| 111 | background-color: $color-panel-hilite-bg; | 112 | background-color: $color-menu-hilite-bg; |
| 112 | color: $color-panel-hilite-text; | 113 | color: $color-panel-hilite-text; |
| 113 | } | 114 | } |
| 114 | .content-layer { | 115 | .content-layer { |