aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css11
-rwxr-xr-xindex.html7
-rw-r--r--js/components/about-box.reel/about-box.css4
-rw-r--r--js/components/about-box.reel/about-box.html1
-rwxr-xr-xscss/imports/codemirror/_codemirror.scss60
-rwxr-xr-xscss/imports/codemirror/_css.scss60
-rwxr-xr-xscss/imports/codemirror/_javascript.scss60
-rwxr-xr-xscss/imports/scss/_Base.scss60
-rwxr-xr-xscss/imports/scss/_Components.scss60
-rwxr-xr-xscss/imports/scss/_MainWindow.scss60
-rwxr-xr-xscss/imports/scss/_MenuUI.scss60
-rw-r--r--scss/imports/scss/_MontageOverrides.scss60
-rwxr-xr-xscss/imports/scss/_PanelUI.scss60
-rwxr-xr-xscss/imports/scss/_ScrollBars.scss60
-rw-r--r--scss/imports/scss/_Stage.scss60
-rwxr-xr-xscss/imports/scss/_Tools.scss60
-rwxr-xr-xscss/imports/scss/_ToolsSample.scss59
-rwxr-xr-xscss/imports/scss/_UserContent.scss60
-rwxr-xr-xscss/imports/scss/_Workspace.scss60
-rwxr-xr-xscss/imports/scss/_mixins.scss60
-rwxr-xr-xscss/imports/scss/_toolbar.scss60
-rwxr-xr-xscss/imports/themes/_test.scss60
-rwxr-xr-xscss/imports/themes/default/_colors.scss60
-rwxr-xr-xscss/imports/themes/default/_fonts.scss60
-rwxr-xr-xscss/imports/themes/default/_mixins.scss60
-rwxr-xr-xscss/ninja.scss1
26 files changed, 660 insertions, 623 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 29cdcd02..288156b6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -6,16 +6,11 @@ All Rights Reserved.
6Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
8 8
9* Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10 this list of conditions and the following disclaimer.
11 10
12* Redistributions in binary form must reproduce the above copyright notice, 11* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
13 this list of conditions and the following disclaimer in the documentation
14 and/or other materials provided with the distribution.
15 12
16* Neither the name of Motorola Mobility LLC nor the names of its 13* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
19 14
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
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.
111 { 111 {
112 margin: 0 auto; 112 margin: 0 auto;
113 margin-top: 10%; 113 margin-top: 10%;
114 width: 675px; 114 width: 580px;
115 height: 420px; 115 height: 430px;
116 116
117 border-radius: 3px; 117 border-radius: 3px;
118 118
@@ -139,7 +139,7 @@ POSSIBILITY OF SUCH DAMAGE.
139 position: relative; 139 position: relative;
140 width: 700px; 140 width: 700px;
141 top: -10px; 141 top: -10px;
142 margin: 30px; 142 margin: 0px 30px;
143 } 143 }
144 144
145 #splashScreenTextBlock p:first-child 145 #splashScreenTextBlock p:first-child
@@ -304,6 +304,7 @@ POSSIBILITY OF SUCH DAMAGE.
304 <div id="ninja_logo"></div> 304 <div id="ninja_logo"></div>
305 305
306 <div id="splashScreenTextBlock" class="baseSplashScreenText"> 306 <div id="splashScreenTextBlock" class="baseSplashScreenText">
307 <p class="mediumSplashScreenText">Ninja&trade;</p>
307 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p> 308 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
308 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p> 309 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
309 <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> 310 <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.
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>
diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index 58d60b55..e40b01bc 100755
--- a/scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
@@ -1,33 +1,35 @@
1/* <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4 2
5Redistribution and use in source and binary forms, with or without 3// <copyright>
6modification, are permitted provided that the following conditions are met: 4// Copyright (c) 2012, Motorola Mobility LLC.
7 5// All Rights Reserved.
8* Redistributions of source code must retain the above copyright notice, 6//
9 this list of conditions and the following disclaimer. 7// Redistribution and use in source and binary forms, with or without
10 8// modification, are permitted provided that the following conditions are met:
11* Redistributions in binary form must reproduce the above copyright notice, 9//
12 this list of conditions and the following disclaimer in the documentation 10// * Redistributions of source code must retain the above copyright notice,
13 and/or other materials provided with the distribution. 11// this list of conditions and the following disclaimer.
14 12//
15* Neither the name of Motorola Mobility LLC nor the names of its 13// * Redistributions in binary form must reproduce the above copyright notice,
16 contributors may be used to endorse or promote products derived from this 14// this list of conditions and the following disclaimer in the documentation
17 software without specific prior written permission. 15// and/or other materials provided with the distribution.
18 16//
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 17// * Neither the name of Motorola Mobility LLC nor the names of its
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 18// contributors may be used to endorse or promote products derived from this
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 19// software without specific prior written permission.
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 20//
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29POSSIBILITY OF SUCH DAMAGE. 27// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30</copyright> */ 28// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31// POSSIBILITY OF SUCH DAMAGE.
32// </copyright>
31 33
32.CodeMirror { 34.CodeMirror {
33 overflow: auto; 35 overflow: auto;
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index f92de35d..49f9f0b6 100755
--- a/scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
@@ -1,33 +1,35 @@
1/* <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4 2
5Redistribution and use in source and binary forms, with or without 3// <copyright>
6modification, are permitted provided that the following conditions are met: 4// Copyright (c) 2012, Motorola Mobility LLC.
7 5// All Rights Reserved.
8* Redistributions of source code must retain the above copyright notice, 6//
9 this list of conditions and the following disclaimer. 7// Redistribution and use in source and binary forms, with or without
10 8// modification, are permitted provided that the following conditions are met:
11* Redistributions in binary form must reproduce the above copyright notice, 9//
12 this list of conditions and the following disclaimer in the documentation 10// * Redistributions of source code must retain the above copyright notice,
13 and/or other materials provided with the distribution. 11// this list of conditions and the following disclaimer.
14 12//
15* Neither the name of Motorola Mobility LLC nor the names of its 13// * Redistributions in binary form must reproduce the above copyright notice,
16 contributors may be used to endorse or promote products