diff options
| author | John Mayhew | 2012-07-24 15:46:16 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-24 15:46:16 -0700 |
| commit | 9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch) | |
| tree | 407564eaa6466e8d4cf2eeee0c56dc623243586f /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | d25359c75089215ee48838db081fd3d51cbbd85f (diff) | |
| parent | 21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff) | |
| download | ninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja
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 { |