aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-05 08:48:27 -0700
committerJonathan Duran2012-06-05 08:48:27 -0700
commit28aa692271bfe17cc2b7b1ce7716b99c04f1ab57 (patch)
tree7c63aa155817a103d83d6441ca37163639a9488b /js/panels/Timeline/Style.reel
parentbd2c28100f347afc10243c80b8a288746370eee2 (diff)
parent4338d57eed565f723bfb7cbcefca65836b68953b (diff)
downloadninja-28aa692271bfe17cc2b7b1ce7716b99c04f1ab57.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js2
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css12
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss8
3 files changed, 19 insertions, 3 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index d712f2bd..5c1c9eeb 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -35,7 +35,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
35 return this._isSelected; 35 return this._isSelected;
36 }, 36 },
37 set: function(newVal) { 37 set: function(newVal) {
38 console.log("Style["+this.styleID+"].isSelected.set ", newVal) 38
39 if (newVal !== this._isSelected) { 39 if (newVal !== this._isSelected) {
40 this._isSelected = newVal; 40 this._isSelected = newVal;
41 this.needsDraw = true; 41 this.needsDraw = true;
diff --git a/js/panels/Timeline/Style.reel/css/Style.css b/js/panels/Timeline/Style.reel/css/Style.css
index 0cc8a1f8..bb65b0c7 100644
--- a/js/panels/Timeline/Style.reel/css/Style.css
+++ b/js/panels/Timeline/Style.reel/css/Style.css
@@ -84,3 +84,15 @@ div.content-style input.nj-skinned {
84div.style-row .container-propvals { 84div.style-row .container-propvals {
85 overflow: hidden; 85 overflow: hidden;
86} 86}
87
88/* line 80, ../scss/Style.scss */
89.content-style .style-row.selected {
90 background-color: #474747;
91 color: white;
92}
93
94/* line 84, ../scss/Style.scss */
95.content-style .style-row.style-selected {
96 background-color: #b2b2b2;
97 color: #242424;
98}
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 3ea943d8..c5287b00 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -77,7 +77,11 @@ div.style-row .container-propvals {
77 overflow: hidden; 77 overflow: hidden;
78} 78}
79 79
80.content-style .style-row.selected {
81 background-color: $color-panel-bg;
82 color: $color-panel-text;
83}
80.content-style .style-row.style-selected { 84.content-style .style-row.style-selected {
81 //background-color: red !important; 85 background-color: $color-panel-hilite-bg;
86 color: $color-panel-hilite-text;
82} 87}
83