diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/ninja.reel/ninja.css | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/ninja.reel/ninja.css')
| -rwxr-xr-x | js/ninja.reel/ninja.css | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 83c0e569..61251eff 100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
| @@ -7,3 +7,7 @@ | |||
| 7 | .main { | 7 | .main { |
| 8 | padding: 100px; | 8 | padding: 100px; |
| 9 | } | 9 | } |
| 10 | |||
| 11 | .hidden { | ||
| 12 | display: none; | ||
| 13 | } | ||