diff options
| author | Ananya Sen | 2012-02-23 17:57:06 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 17:57:06 -0800 |
| commit | a23455a887982d306d794b6afca497259cfa7f4a (patch) | |
| tree | 7396eb7b5e0759035f666a7eee9d325979887d4a /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | 6e66f411ba02eaaeb33471115345ecf3c7ce4ce9 (diff) | |
| parent | 97d6314f96f309332a655d49b95ec651c378bcf2 (diff) | |
| download | ninja-a23455a887982d306d794b6afca497259cfa7f4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
| -rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index f15f553d..827a0c43 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
| @@ -3,11 +3,11 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | // Import theme settings | 5 | // Import theme settings |
| 6 | @import "../../../../../_scss/imports/themes/default/colors"; | 6 | @import "../../../../../scss/imports/themes/default/colors"; |
| 7 | @import "../../../../../_scss/imports/themes/default/mixins"; | 7 | @import "../../../../../scss/imports/themes/default/mixins"; |
| 8 | 8 | ||
| 9 | // Import generic mixins and styles | 9 | // Import generic mixins and styles |
| 10 | @import "../../../../../_scss/imports/scss/mixins"; | 10 | @import "../../../../../scss/imports/scss/mixins"; |
| 11 | 11 | ||
| 12 | .hidden { | 12 | .hidden { |
| 13 | display: none; | 13 | display: none; |