diff options
| author | Kruti Shah | 2012-07-18 10:15:03 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-18 10:15:03 -0700 |
| commit | 0e18e829e4cb81fec9230db6f23c64fd10851a74 (patch) | |
| tree | 70396fd08a3566c51e5fb7b67774d0c0d8fad1c6 /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | 49233086e159137bf6d6b0ee73947475b0d08092 (diff) | |
| parent | c075d1ce399dabe270214e1fe707be55d2e28c0c (diff) | |
| download | ninja-0e18e829e4cb81fec9230db6f23c64fd10851a74.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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 { |