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>
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/history-panel/history.reel/history.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/history-panel/history.reel/history.html b/js/panels/history-panel/history.reel/history.html
index 1bcf817a..e619d9ed 100644
--- a/js/panels/history-panel/history.reel/history.html
+++ b/js/panels/history-panel/history.reel/history.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="history.css">
+        <link rel="stylesheet" type="text/css" href="history.css">
        <script type="text/montage-serialization">
        {
@@ -112,10 +112,10 @@ POSSIBILITY OF SUCH DAMAGE.
        }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="history_panel" class="history_panel">
+        <div data-montage-id="history_panel" class="history_panel">
            <div data-montage-id="scroller" class="scroller">
                <ul data-montage-id="undo_list" class="undo_list">
                    <li data-montage-id="undo_item"></li>
@@ -124,7 +124,7 @@ POSSIBILITY OF SUCH DAMAGE.
                    <li data-montage-id="redo_item"></li>
                </ul>
            </div>
-        </div>
+        </div>
    </body>
 </html>
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/history-panel/history.reel/history.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/history-panel/history.reel/history.html b/js/panels/history-panel/history.reel/history.html index 1bcf817a..e619d9ed 100644 --- a/js/panels/history-panel/history.reel/history.html +++ b/js/panels/history-panel/history.reel/history.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,9 +29,9 @@ 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	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="history.css">	34	<link rel="stylesheet" type="text/css" href="history.css">
35		35
36	<script type="text/montage-serialization">	36	<script type="text/montage-serialization">
37	{	37	{
@@ -112,10 +112,10 @@ POSSIBILITY OF SUCH DAMAGE.
112	}	112	}
113	</script>	113	</script>
114		114
115	</head>	115	</head>
116	<body>	116	<body>
117		117
118	<div data-montage-id="history_panel" class="history_panel">	118	<div data-montage-id="history_panel" class="history_panel">
119	<div data-montage-id="scroller" class="scroller">	119	<div data-montage-id="scroller" class="scroller">
120	<ul data-montage-id="undo_list" class="undo_list">	120	<ul data-montage-id="undo_list" class="undo_list">
121	<li data-montage-id="undo_item"></li>	121	<li data-montage-id="undo_item"></li>
@@ -124,7 +124,7 @@ POSSIBILITY OF SUCH DAMAGE.
124	<li data-montage-id="redo_item"></li>	124	<li data-montage-id="redo_item"></li>
125	</ul>	125	</ul>
126	</div>	126	</div>
127	</div>	127	</div>
128		128
129	</body>	129	</body>
130	</html>	130	</html>