integrating v0.7 montage into ninja

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

2 files changed, 27 insertions, 17 deletions

diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.css b/node_modules/montage/ui/loading-panel.reel/loading-panel.css
index 9a82a320..39f0db06 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.css
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.css
@@ -4,32 +4,40 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-/* disabled for now */
-.montage-loading-panel > .loadingIndicator {
-    display: none;
-}
-
 .montage-loading-panel {
     position: absolute;
+    z-index: 999;
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: hsl(0,0%,0%);
-    display: -webkit-box;
-    -webkit-box-pack: center;
-    -webkit-box-align: center;
 }
 
-.montage-loading-panel > .loadingCount {
+.montage-loading-panel > .loadingIndicator {
     width: 200px;
-    height: 200px;
+    margin: 20px;
+    display: none; /* disabled for now, because the loading doesn't really look continuos enough. */
+}
+
+
+.montage-loading-panel > .loadingCount {
+    position: absolute;
+    width: 160px;
+    height: 160px;
+    top: 50%;
+    left: 50%;
+    margin: -90px;
+    padding: 10px;
     border-radius: 50%;
-    text-align: center;
     color: #fff;
-    font: 40px/200px "Lucida Grande", Lucida, Verdana, sans-serif;
-    text-shadow: 0 0px 6px hsla(200,100%,50%,.6);
-    -webkit-box-shadow: inset 0px 0px 0 5px  hsl(200,0%,10%);
+    font: 30px/160px "Helvetica Neue", Helvetica, Geneva, sans-serif;
+    text-align: center;
+    background: hsla(0,0%,0%,.6);
+    background: -webkit-radial-gradient( center 33% , hsla(0,0%,0%,.6) 10%, hsla(0,0%,0%,.8) );
+    background: -moz-radial-gradient( center 33% , hsla(0,0%,0%,.65) 10%, hsla(0,0%,0%,.8) );
+    -webkit-box-shadow: inset 0 0 0 3px hsla(0,0%,0%,.3), 0 0 0 3px hsla(0,0%,100%,.3);
+    box-shadow: inset 0 0 0 3px hsla(0,0%,0%,.3), 0 0 0 3px hsla(0,0%,100%,.3);
+    overflow: hidden;
 }
 
 .montage-loading-panel > .loadingCount > .divider {
diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
index 27825a09..ff1677ea 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -34,7 +34,7 @@
                         "boundObjectPropertyPath": "initializedModuleCount",
                         "oneway": true
                     },
-                    "maximumValue": {
+                    "max": {
                         "boundObject": {"@": "owner"},
                         "boundObjectPropertyPath": "requiredModuleCount",
                         "oneway": true
@@ -81,7 +81,9 @@
     <div id="loadingPanel" class="montage-loading-panel">
         <div id="loadingIndicator" class="loadingIndicator"></div>
         <div id="loadingCount" class="loadingCount">
-            <span id="loadedCount" class="loadedCount">0</span><span class="divider">/</span><span id="requiredCount" class="requiredCount">0</span>
+            <span id="loadedCount" class="loadedCount">0</span>
+            <span class="divider">/</span>
+            <span id="requiredCount" class="requiredCount">0</span>
         </div>
     </div>