aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 17:05:43 -0800
committerValerio Virgillito2012-02-23 17:05:43 -0800
commitafc53c6f553c97ab778154154aa2b7a146cb5fef (patch)
tree66b5ec886a49894feda44ccf8b5233ef39a46536 /js/panels/Timeline/Style.reel
parent8974ecd564563a991ff96f9cb6d47da172174242 (diff)
parentdb2fd02a1b0e909bb536fa63cefd2144f4642ead (diff)
downloadninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-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;