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/imports/themes/default/_mixins.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/imports/themes/default/_mixins.scss')
| -rw-r--r-- | _scss/imports/themes/default/_mixins.scss | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/_scss/imports/themes/default/_mixins.scss b/_scss/imports/themes/default/_mixins.scss index e6a38a93..9f61e7ef 100644 --- a/_scss/imports/themes/default/_mixins.scss +++ b/_scss/imports/themes/default/_mixins.scss | |||
| @@ -4,10 +4,8 @@ | |||
| 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | // </copyright> | 5 | // </copyright> |
| 6 | 6 | ||
| 7 | /* | 7 | // themes/themename/mixins.scss |
| 8 | * themes/themename/mixins.scss | 8 | // Mixins that are theme-dependent (e.g. sprite mixins, etc) |
| 9 | * Mixins that are theme-dependent (e.g. sprite mixins, etc) | ||
| 10 | */ | ||
| 11 | 9 | ||
| 12 | $Mx:0; | 10 | $Mx:0; |
| 13 | $My:0; | 11 | $My:0; |