diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | ||