diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Timeline/Style.reel/scss/Style.scss | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
-rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 12 |
1 files changed, 9 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..30bf43fe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
@@ -1,13 +1,19 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | /* Layer.scss | 7 | /* Layer.scss |
2 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 8 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
3 | */ | 9 | */ |
4 | 10 | ||
5 | // Import theme settings | 11 | // Import theme settings |
6 | @import "../../../../../_scss/imports/themes/default/colors"; | 12 | @import "../../../../../scss/imports/themes/default/colors"; |
7 | @import "../../../../../_scss/imports/themes/default/mixins"; | 13 | @import "../../../../../scss/imports/themes/default/mixins"; |
8 | 14 | ||
9 | // Import generic mixins and styles | 15 | // Import generic mixins and styles |
10 | @import "../../../../../_scss/imports/scss/mixins"; | 16 | @import "../../../../../scss/imports/scss/mixins"; |
11 | 17 | ||
12 | .hidden { | 18 | .hidden { |
13 | display: none; | 19 | display: none; |