diff options
| author | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
| commit | 2f009ea40ca815a9aff27a5862bba5a6b335586c (patch) | |
| tree | 10a409394038c642c2aa811ba9a0ffaf667dfed7 /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | 9730dead250067abad10625c2da46cbd24fc0a1e (diff) | |
| parent | ecc2f1c6296ac5e706b1d6388254c8df24a01066 (diff) | |
| download | ninja-2f009ea40ca815a9aff27a5862bba5a6b335586c.tar.gz | |
Merge branch 'refs/heads/master' into menu-fixes
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
| -rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 2d1947b0..ad527ad5 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
| @@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 40 | // Import generic mixins and styles | 40 | // Import generic mixins and styles |
| 41 | @import "../../../../../scss/imports/scss/mixins"; | 41 | @import "../../../../../scss/imports/scss/mixins"; |
| 42 | 42 | ||
| 43 | .hidden { | 43 | .hideme { |
| 44 | display: none; | 44 | display: none; |
| 45 | } | 45 | } |
| 46 | .row-editor { | 46 | .row-editor { |