aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-16 11:27:34 -0700
committerValerio Virgillito2012-07-16 11:27:34 -0700
commit289e821c819d0fded21b97ec6e4ed27dd6f30ab4 (patch)
tree1712a3db150dbcafb0f8d97811f5ea6631e85348 /js/components
parent318b3d99749c8620114eb5abae690901b9197bd2 (diff)
parent663684254da6e2b21c7b5ac8fde4d9c628855bba (diff)
downloadninja-289e821c819d0fded21b97ec6e4ed27dd6f30ab4.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'js/components')
-rw-r--r--js/components/about-box.reel/about-box.css4
-rw-r--r--js/components/about-box.reel/about-box.html1
2 files changed, 3 insertions, 2 deletions
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.
42.mainAboutBoxContainer 42.mainAboutBoxContainer
43{ 43{
44 width: 580px; 44 width: 580px;
45 height: 420px; 45 height: 430px;
46 46
47 border-radius: 3px; 47 border-radius: 3px;
48 48
@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
67#aboutBoxTextBlock 67#aboutBoxTextBlock
68{ 68{
69 position: relative; 69 position: relative;
70 margin: 30px; 70 margin: 0px 30px;
71} 71}
72 72
73#aboutBoxTextBlock p:first-child 73#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.
49<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer"> 49<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
50 <div id="about_box_ninja_logo"></div> 50 <div id="about_box_ninja_logo"></div>
51 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 51 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
52 <p class="mediumAboutBoxText">Ninja&trade;</p>
52 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 53 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
53 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p> 54 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
54 <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> 55 <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>