aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss
diff options
context:
space:
mode:
authorJonathan Duran2012-02-23 07:37:17 -0800
committerJonathan Duran2012-02-23 07:37:17 -0800
commitb7402018659cf8058d5646c08b2a916492269e33 (patch)
tree26ffeeaae45bbaaca9931e747e9532c1831c50fd /js/panels/Timeline/Style.reel/scss
parentcc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff)
downloadninja-b7402018659cf8058d5646c08b2a916492269e33.tar.gz
Timeline Reset to clean Master branch. Code scrub.
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
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;