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/scss/_ToolsSample.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/scss/_ToolsSample.scss')
| -rw-r--r-- | _scss/imports/scss/_ToolsSample.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_scss/imports/scss/_ToolsSample.scss b/_scss/imports/scss/_ToolsSample.scss index 8c354f14..2e1da9a8 100644 --- a/_scss/imports/scss/_ToolsSample.scss +++ b/_scss/imports/scss/_ToolsSample.scss | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 6 | // </copyright> | 6 | // </copyright> |
| 7 | 7 | ||
| 8 | /*Image Sprinting */ | 8 | // Image Sprinting |
| 9 | .ovalToolUp { | 9 | .ovalToolUp { |
| 10 | background-image: url("../images/SpriteSheets/NinjaSpriteSheet.png"); | 10 | background-image: url("../images/SpriteSheets/NinjaSpriteSheet.png"); |
| 11 | background-repeat: no-repeat; | 11 | background-repeat: no-repeat; |