diff options
author | Jose Antonio Marquez | 2012-07-18 11:42:46 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-07-18 11:42:46 -0700 |
commit | 00d11977825e56a1306f2ed13125b94cae369854 (patch) | |
tree | 4c5c6b03810ed5099a641d43939e39f28ba7797c /js/panels/Timeline/Style.reel/scss | |
parent | a8ca472ec3a1d1510000fd83d6904cbd0e9981b5 (diff) | |
parent | ecc2f1c6296ac5e706b1d6388254c8df24a01066 (diff) | |
download | ninja-00d11977825e56a1306f2ed13125b94cae369854.tar.gz |
Merge branch 'refs/heads/Ninja-Master' into Tracking
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 { |