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/panels/Materials/materials-popup.reel/materials-popup.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/panels/Materials/materials-popup.reel/materials-popup.html')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index db53e0e9..ac8f0a94 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.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. |
| @@ -29,13 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | 33 | ||
| 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 35 | 35 | ||
| 36 | <link rel="stylesheet" type="text/css" href="materials-popup.css"> | 36 | <link rel="stylesheet" type="text/css" href="materials-popup.css"> |
| 37 | 37 | ||
| 38 | <script type="text/montage-serialization"> | 38 | <script type="text/montage-serialization"> |
| 39 | { | 39 | { |
| 40 | "okButton": { | 40 | "okButton": { |
| 41 | "prototype": "montage/ui/button.reel", | 41 | "prototype": "montage/ui/button.reel", |
| @@ -127,10 +127,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 127 | } | 127 | } |
| 128 | </script> | 128 | </script> |
| 129 | 129 | ||
| 130 | </head> | 130 | </head> |
| 131 | 131 | ||
| 132 | <body> | 132 | <body> |
| 133 | <div data-montage-id="materials_popup" class="materials_popup"> | 133 | <div data-montage-id="materials_popup" class="materials_popup"> |
| 134 | <div data-montage-id="mp_title" class="mp_title">Material Name</div> | 134 | <div data-montage-id="mp_title" class="mp_title">Material Name</div> |
| 135 | <hr /> | 135 | <hr /> |
| 136 | <div data-montage-id="mp_preview" class="mp_preview"> | 136 | <div data-montage-id="mp_preview" class="mp_preview"> |
| @@ -147,6 +147,6 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 147 | <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> | 147 | <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
| 148 | <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button> | 148 | <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button> |
| 149 | </div> | 149 | </div> |
| 150 | </div> | 150 | </div> |
| 151 | </body> | 151 | </body> |
| 152 | </html> | 152 | </html> |