diff options
| author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
| commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
| tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/panels/Timeline/Style.reel/scss | |
| parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
| parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
| download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz | |
Merge branch 'refs/heads/master' into fixes_7.1
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 { |