aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss
diff options
context:
space:
mode:
authorhwc4872012-02-23 15:21:56 -0800
committerhwc4872012-02-23 15:21:56 -0800
commit26bb2894c29d4608e843de01829d352dd3d00823 (patch)
treec5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/Style.reel/scss
parent64280907f31e6f6e5659acb0893df3e0da5bb044 (diff)
parent81ce79819ba574b03b46e91e9a153dab82b550cd (diff)
downloadninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss')
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss6
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;