diff options
| author | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
| commit | bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch) | |
| tree | 5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | 23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff) | |
| parent | 41b69af7c0be3dd5fe4f772668862696af8b917a (diff) | |
| download | ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/controllers/document-controller.js
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; |