diff options
| author | Ananya Sen | 2012-07-23 17:01:14 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-23 17:01:14 -0700 |
| commit | 48d9ed19573a07c68da305d14ca6ab3a04d31d64 (patch) | |
| tree | b4bf6c48c7fdade2cf531d84cac3359489d38405 /js/panels/Timeline/Style.reel/scss | |
| parent | c07a7a9d11bc8299fa9686544b18840cc8e640c2 (diff) | |
| parent | afc7ad4f240fdf7890a79c2d4d7f8eb2e7c30a34 (diff) | |
| download | ninja-48d9ed19573a07c68da305d14ca6ab3a04d31d64.tar.gz | |
Merge branch 'refs/heads/Jose-Document' into Document
Diffstat (limited to 'js/panels/Timeline/Style.reel/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 { |