From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 9 Jul 2012 16:27:52 -0700 Subject: BSD License --- js/components/about-box.reel/about-box.css | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js/components/about-box.reel/about-box.css') diff --git a/js/components/about-box.reel/about-box.css b/js/components/about-box.reel/about-box.css index 824979a6..efce5107 100644 --- a/js/components/about-box.reel/about-box.css +++ b/js/components/about-box.reel/about-box.css @@ -1,24 +1,25 @@ /* -Copyright (c) 2012, Motorola Mobility, Inc +Copyright (c) 2012, Motorola Mobility LLC. All Rights Reserved. -BSD License. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 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. - - Neither the name of Motorola Mobility nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* 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. + +* 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. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- cgit v1.2.3 From 08fa84476d323e4e17c0074af1a2c5568fd94299 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 16 Jul 2012 11:19:41 -0700 Subject: Trademark Update - added trademarked Ninja name to the splash screen and about box. --- js/components/about-box.reel/about-box.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/components/about-box.reel/about-box.css') 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 -- cgit v1.2.3