Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture

author: Valerio Virgillito 2012-05-14 17:28:00 -0700
committer: Valerio Virgillito 2012-05-14 17:28:00 -0700
commit: 8009663c4f1bbf5ae457393fb8a3454df2625071 (patch)
tree: 65ece2e94092cc5a177f830858008478df09d6d9 /js/document/templates
parent: 8f8eb57f4506987942745c3325492e939ed3caa8 (diff)
parent: 6fe05fc4f518000cf9a7af3c34381af16579a6d6 (diff)
download: ninja-8009663c4f1bbf5ae457393fb8a3454df2625071.tar.gz
1 files changed, 30 insertions, 16 deletions
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 2cd82f51..91ef06de 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -27,8 +27,6 @@
                                margin: 0;
                        padding: 0;
                                position: absolute;
-                                -webkit-transform-style: preserve-3d;
-                                -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
                        }
            html {
@@ -40,10 +38,6 @@
                height: 100%;
                background: #666;
            }
-                        
-                        ninjaloadinghack {
-                                display: none;
-                        }
                        .active-element-outline {
                        outline: #adff2f solid 2px;
@@ -53,16 +47,29 @@
                                -webkit-transition: all 450ms linear !important;
                        }
                        
-                        ninja-banner {
+                        ninjaloadinghack {
+                                display: none;
+                        }
+                        
+                        ninja-viewport, ninja-content {
                                display: block;
-                                margin: 0;
+                margin: 0;
-                                padding: 0;
+                padding: 0;
-                                border: 0;
+                border: 0;
-                                position: absolute;
+                position: absolute;
-                                overflow: visible;
+                overflow: visible;
-                                top: 50%;
+                top: 0;
-                                left: 50%;
+                left: 0;
-                                background: #FFF;
+                background: transparent;
+                        }
+                        
+                        ninja-viewport {
+                background: #FFF;
+                }
+                        
+                        ninja-content {
+                -webkit-transform-style: preserve-3d;
+                -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
                        }
        </style>
        
@@ -87,8 +94,15 @@
        </head>
        <body>
+                
                <ninjaloadinghack></ninjaloadinghack>
-                <ninja-banner></ninja-banner>
+        
+        <ninja-viewport>
+                    
+                    <ninja-content></ninja-content>
+                    
+        </ninja-viewport>
+        
        </body>
 </html>
 \ No newline at end of file
author	Valerio Virgillito	2012-05-14 17:28:00 -0700
committer	Valerio Virgillito	2012-05-14 17:28:00 -0700
commit	8009663c4f1bbf5ae457393fb8a3454df2625071 (patch)
tree	65ece2e94092cc5a177f830858008478df09d6d9 /js/document/templates
parent	8f8eb57f4506987942745c3325492e939ed3caa8 (diff)
parent	6fe05fc4f518000cf9a7af3c34381af16579a6d6 (diff)
download	ninja-8009663c4f1bbf5ae457393fb8a3454df2625071.tar.gz

diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 2cd82f51..91ef06de 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html
@@ -27,8 +27,6 @@
27	margin: 0;	27	margin: 0;
28	padding: 0;	28	padding: 0;
29	position: absolute;	29	position: absolute;
30	-webkit-transform-style: preserve-3d;
31	-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
32	}	30	}
33		31
34	html {	32	html {
@@ -40,10 +38,6 @@
40	height: 100%;	38	height: 100%;
41	background: #666;	39	background: #666;
42	}	40	}
43
44	ninjaloadinghack {
45	display: none;
46	}
47		41
48	.active-element-outline {	42	.active-element-outline {
49	outline: #adff2f solid 2px;	43	outline: #adff2f solid 2px;
@@ -53,16 +47,29 @@
53	-webkit-transition: all 450ms linear !important;	47	-webkit-transition: all 450ms linear !important;
54	}	48	}
55		49
56	ninja-banner {	50	ninjaloadinghack {
		51	display: none;
		52	}
		53
		54	ninja-viewport, ninja-content {
57	display: block;	55	display: block;
58	margin: 0;	56	margin: 0;
59	padding: 0;	57	padding: 0;
60	border: 0;	58	border: 0;
61	position: absolute;	59	position: absolute;
62	overflow: visible;	60	overflow: visible;
63	top: 50%;	61	top: 0;
64	left: 50%;	62	left: 0;
65	background: #FFF;	63	background: transparent;
		64	}
		65
		66	ninja-viewport {
		67	background: #FFF;
		68	}
		69
		70	ninja-content {
		71	-webkit-transform-style: preserve-3d;
		72	-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
66	}	73	}
67	</style>	74	</style>
68		75
@@ -87,8 +94,15 @@
87	</head>	94	</head>
88		95
89	<body>	96	<body>
		97
90	<ninjaloadinghack></ninjaloadinghack>	98	<ninjaloadinghack></ninjaloadinghack>
91	<ninja-banner></ninja-banner>	99
		100	<ninja-viewport>
		101
		102	<ninja-content></ninja-content>
		103
		104	</ninja-viewport>
		105
92	</body>	106	</body>
93		107
94	</html> \ No newline at end of file	108	</html> \ No newline at end of file