aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates/html/index.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/templates/html/index.html
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-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/document/templates/html/index.html')
-rwxr-xr-xjs/document/templates/html/index.html80
1 files changed, 40 insertions, 40 deletions
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 2677ade6..98ab3506 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -28,37 +28,37 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31 31
32 32
33<!-- 33<!--
34 NOTE(s): 34 NOTE(s):
35 All elements in the head of the document to be exclude from I/O 35 All elements in the head of the document to be exclude from I/O
36 must set the 'data-ninja-template' 36 must set the 'data-ninja-template'
37 data-ninja-template="true" 37 data-ninja-template="true"
38--> 38-->
39 39
40<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> 40<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
41 41
42<html> 42<html>
43 43
44 <head> 44 <head>
45 45
46 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> 46 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
47 * { 47 * {
48 -webkit-animation: none !important; 48 -webkit-animation: none !important;
49 -webkit-transition-duration: 0s !important; 49 -webkit-transition-duration: 0s !important;
50 -webkit-animation-duration: 0s !important; 50 -webkit-animation-duration: 0s !important;
51 -webkit-animation-name: none !important; 51 -webkit-animation-name: none !important;
52 -webkit-animation-fill-mode: none !important; 52 -webkit-animation-fill-mode: none !important;
53 } 53 }
54 54
55 body { 55 body {
56 margin: 0; 56 margin: 0;
57 padding: 0; 57 padding: 0;
58 position: absolute; 58 position: absolute;
59 -webkit-transform-style: preserve-3d; 59 -webkit-transform-style: preserve-3d;
60 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); 60 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
61 } 61 }
62 62
63 html { 63 html {
64 overflow: scroll; 64 overflow: scroll;
@@ -68,18 +68,18 @@ POSSIBILITY OF SUCH DAMAGE.
68 width: 100%; 68 width: 100%;
69 height: 100%; 69 height: 100%;
70 } 70 }
71
72 ninjaloadinghack {
73 display: none;
74 }
75 71
76 .active-element-outline { 72 ninjaloadinghack {
77 outline: #adff2f solid 2px; 73 display: none;
78 } 74 }
79 75
80 .nj-preset-transition { 76 .active-element-outline {
81 -webkit-transition: all 450ms linear !important; 77 outline: #adff2f solid 2px;
82 } 78 }
79
80 .nj-preset-transition {
81 -webkit-transition: all 450ms linear !important;
82 }
83 83
84 .nj-element-highlight { 84 .nj-element-highlight {
85 outline: 4px solid #ff0000; 85 outline: 4px solid #ff0000;
@@ -108,7 +108,7 @@ POSSIBILITY OF SUCH DAMAGE.
108 ::-webkit-resizer:disabled { display: block; } 108 ::-webkit-resizer:disabled { display: block; }
109 109
110 </style> 110 </style>
111 111
112 <script type="text/javascript" data-ninja-template="true"> 112 <script type="text/javascript" data-ninja-template="true">
113 113
114 function getElement(x,y) { 114 function getElement(x,y) {
@@ -132,9 +132,9 @@ POSSIBILITY OF SUCH DAMAGE.
132 } 132 }
133 }); 133 });
134 134
135 </script> 135 </script>
136 136
137 <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> 137 <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
138 138
139 <script type="text/montage-serialization" data-ninja-template="true"> 139 <script type="text/montage-serialization" data-ninja-template="true">
140 { 140 {
@@ -144,8 +144,8 @@ POSSIBILITY OF SUCH DAMAGE.
144 } 144 }
145 </script> 145 </script>
146 146
147 </head> 147 </head>
148 148
149 <body></body> 149 <body></body>
150 150
151</html> 151</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:08:11 +0000