diff options
author | hwc487 | 2012-01-30 16:09:00 -0800 |
---|---|---|
committer | hwc487 | 2012-01-30 16:09:00 -0800 |
commit | c41d2c2b749b67921f243fb7594ce0cdb1ccce36 (patch) | |
tree | cf25c9583b371b41e9d2da7e714bfbd657db22dc /_scss/ninja.scss | |
parent | 86a801c057fc3b0580d6130be5740c2ee503444f (diff) | |
parent | f129a23ff0b69f27a05a07badcdbd10fb76b86b4 (diff) | |
download | ninja-c41d2c2b749b67921f243fb7594ce0cdb1ccce36.tar.gz |
Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to '_scss/ninja.scss')
-rwxr-xr-x | _scss/ninja.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/_scss/ninja.scss b/_scss/ninja.scss index 9980b04a..11c04afb 100755 --- a/_scss/ninja.scss +++ b/_scss/ninja.scss | |||
@@ -6,11 +6,11 @@ | |||
6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
7 | </copyright> */ | 7 | </copyright> */ |
8 | 8 | ||
9 | /* */ | ||
10 | 9 | ||
11 | /* ninja.scss | 10 | |
12 | * Main SCSS file for ninja, compiled by SASS into the file ninja.css. | 11 | // ninja.scss |
13 | */ | 12 | // Main SCSS file for ninja, compiled by SASS into the file ninja.css. |
13 | |||
14 | 14 | ||
15 | // Import theme settings | 15 | // Import theme settings |
16 | @import "imports/themes/default/colors"; | 16 | @import "imports/themes/default/colors"; |