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/_Components.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/_Components.scss')
| -rw-r--r-- | _scss/imports/scss/_Components.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/_scss/imports/scss/_Components.scss b/_scss/imports/scss/_Components.scss index 2fda5afc..c4182c73 100644 --- a/_scss/imports/scss/_Components.scss +++ b/_scss/imports/scss/_Components.scss | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | 8 | ||
| 9 | /* Begin: Styles for the Tree component */ | 9 | // Begin: Styles for the Tree component |
| 10 | 10 | ||
| 11 | .tree | 11 | .tree |
| 12 | { | 12 | { |
| @@ -30,4 +30,4 @@ | |||
| 30 | -webkit-transition: -webkit-transform 0.05s linear; | 30 | -webkit-transition: -webkit-transform 0.05s linear; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | /* End: styles for the Tree component */ \ No newline at end of file | 33 | // End: styles for the Tree component \ No newline at end of file |