Merge pull request #393 from mayhewinator/master

Trademark Update-Added trademarked Ninja app name to about box and splash screen

3 files changed, 7 insertions, 5 deletions

diff --git a/index.html b/index.html
index 6058408d..8c2de1f6 100755
--- a/index.html
+++ b/index.html
@@ -111,8 +111,8 @@ POSSIBILITY OF SUCH DAMAGE.
             {
                 margin: 0 auto;
                 margin-top: 10%;
-                width: 675px;
-                height: 420px;
+                width: 580px;
+                height: 430px;
 
                 border-radius: 3px;
 
@@ -139,7 +139,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 position: relative;
                 width: 700px;
                 top: -10px;
-                margin: 30px;
+                margin: 0px 30px;
             }
 
             #splashScreenTextBlock p:first-child
@@ -304,6 +304,7 @@ POSSIBILITY OF SUCH DAMAGE.
         <div id="ninja_logo"></div>
     
         <div id="splashScreenTextBlock" class="baseSplashScreenText">
+            <p class="mediumSplashScreenText">Ninja&trade;</p>
             <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
             <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
             <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p>
diff --git a/js/components/about-box.reel/about-box.css b/js/components/about-box.reel/about-box.css
index efce5107..462fd578 100644
--- a/js/components/about-box.reel/about-box.css
+++ b/js/components/about-box.reel/about-box.css
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 .mainAboutBoxContainer
 {
     width: 580px;
-    height: 420px;
+    height: 430px;
 
     border-radius: 3px;
 
@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #aboutBoxTextBlock
 {
     position: relative;
-    margin: 30px;
+    margin: 0px 30px;
 }
 
 #aboutBoxTextBlock p:first-child
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index a00748c8..68220086 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -49,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
     <div id="about_box_ninja_logo"></div>
     <div id="aboutBoxTextBlock" class="baseAboutBoxText">
+        <p class="mediumAboutBoxText">Ninja&trade;</p>
         <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
         <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
         <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p>