Merge branch 'refs/heads/NinjaInternal' into FileIO

3 files changed, 24 insertions, 0 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 48590fc8..d22cfc22 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -986,4 +986,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; }
 
+.montage-modal { border: 0px; }
+
+.montage-popup-container { background: none; }
+
 /*77*/
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
new file mode 100644
index 00000000..65b9ede0
--- /dev/null
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -0,0 +1,19 @@
+// <copyright>
+// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+// (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+// </copyright>
+
+
+//MontageOverrides.scss
+//Montage overrides.
+//Note that colors and font definitions go in 
+//_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
+
+.montage-modal {
+    border: 0px;
+
+}
+.montage-popup-container {
+    background: none;
+}
\ No newline at end of file
diff --git a/scss/ninja.scss b/scss/ninja.scss
index 002ab8e8..13db5588 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -31,6 +31,7 @@
 @import "imports/scss/UserContent";
 @import "imports/scss/ScrollBars";
 @import "imports/scss/Components";
+@import "imports/scss/MontageOverrides";
 
 body {
 }