diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
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 | 12 |
1 files changed, 6 insertions, 6 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 b796b616..774d53a5 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -70,7 +70,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 70 | "value": 1, | 70 | "value": 1, |
| 71 | "decimalPlace": 10, | 71 | "decimalPlace": 10, |
| 72 | "acceptableUnits": ["px", "pt"] | 72 | "acceptableUnits": ["px", "pt"] |
| 73 | 73 | ||
| 74 | } | 74 | } |
| 75 | }, | 75 | }, |
| 76 | 76 | ||
| @@ -147,10 +147,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | } | 149 | } |
| 150 | } | 150 | } |
| 151 | </script> | 151 | </script> |
| 152 | |||
| 152 | 153 | ||
| 153 | |||
| 154 | </head> | 154 | </head> |
| 155 | 155 | ||
| 156 | <body> | 156 | <body> |
| @@ -182,7 +182,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 182 | 182 | ||
| 183 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> | 183 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
| 184 | <select class="selectBox" data-montage-id="fillMaterialCB"> | 184 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
| 185 | </select> | 185 | </select> |
| 186 | </div> | 186 | </div> |
| 187 | </body> | 187 | </body> |
| 188 | 188 | ||