aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 21:16:08 -0800
committerJose Antonio Marquez2012-02-13 21:16:08 -0800
commitf3865671aa75277f6eb35c417408dee9e665589a (patch)
tree0431ce512936f963e4764d21b0e52494525d3244
parentc8712e6bc9b5b63fbfca08a0989ea05948f2f4a4 (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-f3865671aa75277f6eb35c417408dee9e665589a.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
-rwxr-xr-xcss/ninja.css4
-rw-r--r--scss/imports/scss/_MontageOverrides.scss19
-rwxr-xr-xscss/ninja.scss1
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
986 986
987.tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; } 987.tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; }
988 988
989.montage-modal { border: 0px; }
990
991.montage-popup-container { background: none; }
992
989/*77*/ 993/*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 @@
1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5// </copyright>
6
7
8//MontageOverrides.scss
9//Montage overrides.
10//Note that colors and font definitions go in
11//_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
12
13.montage-modal {
14 border: 0px;
15
16}
17.montage-popup-container {
18 background: none;
19} \ 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 @@
31@import "imports/scss/UserContent"; 31@import "imports/scss/UserContent";
32@import "imports/scss/ScrollBars"; 32@import "imports/scss/ScrollBars";
33@import "imports/scss/Components"; 33@import "imports/scss/Components";
34@import "imports/scss/MontageOverrides";
34 35
35body { 36body {
36} 37}