aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-14 10:16:18 -0800
committerArmen Kesablyan2012-02-14 10:16:18 -0800
commit581078a71995f36b7d3a85bc724bef7c7919bb81 (patch)
treef0ddd66c3b2ff6d5662e6dca3d4f8836388edd0f /scss
parentf979f47658a03640cc81e729e3cf88d80f8ec366 (diff)
parentace16ef22b3ff32663504df7720af481d76987d6 (diff)
downloadninja-581078a71995f36b7d3a85bc724bef7c7919bb81.tar.gz
Merge branch 'refs/heads/master' into text-tool
Diffstat (limited to 'scss')
-rw-r--r--scss/imports/scss/_MontageOverrides.scss19
-rwxr-xr-xscss/ninja.scss1
2 files changed, 20 insertions, 0 deletions
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}