diff options
author | Jonathan Duran | 2012-05-22 10:33:10 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-22 10:33:10 -0700 |
commit | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (patch) | |
tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/panels/Timeline/Layer.reel/scss/Layer.scss | |
parent | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (diff) | |
parent | 119fec85a659cc470377032abab8c6e60fa55b1b (diff) | |
download | ninja-0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa.tar.gz |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss/Layer.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 { |