diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /_scss/ninja.scss | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
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"; |