diff options
author | Valerio Virgillito | 2012-02-13 17:48:30 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 17:48:30 -0800 |
commit | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (patch) | |
tree | ca7290639e4b6b05a92a1481ccdd85e196d43d0d | |
parent | 30b23f8d0343c1af805d62894591001f19c6fb79 (diff) | |
parent | c6b02b723ae0ea7faab1506faf3415093b66036f (diff) | |
download | ninja-1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7.tar.gz |
Merge pull request #39 from mencio/montage-overrides
Adding a montage override sass file. Overriding the default css for montage popups.
-rw-r--r-- | css/ninja.css | 4 | ||||
-rw-r--r-- | scss/imports/scss/_MontageOverrides.scss | 19 | ||||
-rwxr-xr-x | scss/ninja.scss | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/css/ninja.css b/css/ninja.css index 54a4bbf1..934bd60b 100644 --- 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 | ||
35 | body { | 36 | body { |
36 | } | 37 | } |