diff options
author | Nivesh Rajbhandari | 2012-02-14 09:43:58 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-14 09:43:58 -0800 |
commit | 328bad7578f57a740b2f92f592ce7c79cda19b2e (patch) | |
tree | afe64477a328b098dd70ad1afa9d3c754cfa6d9f /scss | |
parent | c9a2d809558dd441eb63c2a34625d1b2a66f5c02 (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-328bad7578f57a740b2f92f592ce7c79cda19b2e.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'scss')
-rw-r--r-- | scss/imports/scss/_MontageOverrides.scss | 19 | ||||
-rwxr-xr-x | scss/ninja.scss | 1 |
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 | ||
35 | body { | 36 | body { |
36 | } | 37 | } |