diff options
author | Kruti Shah | 2012-06-22 10:00:53 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-22 10:00:53 -0700 |
commit | 4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (patch) | |
tree | 743ea0d3a3af9cae65d5af531a6dba1951b03b33 /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
parent | cb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff) | |
parent | 020ad879a627c4234a8732f05e175ad69cedf180 (diff) | |
download | ninja-4bf8e4cdc179c3b388fc06f26008808aa4b77eb0.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.html')
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index ea246ea8..5f93b556 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
@@ -112,6 +112,7 @@ | |||
112 | "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"}, | 112 | "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"}, |
113 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | 113 | "_fillColorCtrl": {"#": "fillColorCtrl"}, |
114 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | 114 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, |
115 | "_fillColorCtrlContainer": {"#": "fillColorCtrlContainer"}, | ||
115 | 116 | ||
116 | "_strokeSize": {"@": "_strokeSize1"}, | 117 | "_strokeSize": {"@": "_strokeSize1"}, |
117 | "ovalProperties": {"@": "ovalProperties1"}, | 118 | "ovalProperties": {"@": "ovalProperties1"}, |
@@ -135,9 +136,9 @@ | |||
135 | </div> | 136 | </div> |
136 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 137 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
137 | <div class="toolColorChipIcon PencilTool"></div> | 138 | <div class="toolColorChipIcon PencilTool"></div> |
138 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | 139 | <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div> |
139 | <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> | 140 | <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> |
140 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 141 | <div data-montage-id="fillColorCtrlContainer" class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
141 | <div class="nj-divider divider-vertical"> </div> | 142 | <div class="nj-divider divider-vertical"> </div> |
142 | <label class="label">Stroke:</label> | 143 | <label class="label">Stroke:</label> |
143 | <div data-montage-id="strokeControl" class="label"></div> | 144 | <div data-montage-id="strokeControl" class="label"></div> |