aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss/Style.scss
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:31 -0800
committerJose Antonio Marquez2012-02-28 13:33:31 -0800
commit3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree657d55ad394de168dd627cf89b875906d10584e2 /js/panels/Timeline/Style.reel/scss/Style.scss
parentd764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss12
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;