From 0e7b78746599c790992b17d87fa327a719597cae Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Fri, 17 Jul 2015 12:16:20 +0200
Subject: [PATCH] Simplify mixin loading

---
 config.rb                                              | 5 ++---
 couchpotato/core/media/_base/search/static/search.scss | 2 +-
 couchpotato/core/media/movie/_base/static/movie.scss   | 2 +-
 couchpotato/core/plugins/category/static/category.scss | 2 +-
 couchpotato/core/plugins/log/static/log.scss           | 2 +-
 couchpotato/core/plugins/profile/static/profile.scss   | 2 +-
 couchpotato/core/plugins/quality/static/quality.scss   | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config.rb b/config.rb
index d201eee..a26a2ee 100644
--- a/config.rb
+++ b/config.rb
@@ -29,9 +29,8 @@ http_path = "/"
 ##
 ## You probably don't need to edit anything below this.
 ##
-
-sass_dir = "./"
-css_dir = "./static/style_compiled"
+sass_dir = "./couchpotato/static/style"
+css_dir = "./couchpotato/static/style"
 
 # You can select your preferred output style here (can be overridden via the command line):
 # output_style = :expanded or :nested or :compact or :compressed
diff --git a/couchpotato/core/media/_base/search/static/search.scss b/couchpotato/core/media/_base/search/static/search.scss
index c98b382..4ff6225 100644
--- a/couchpotato/core/media/_base/search/static/search.scss
+++ b/couchpotato/core/media/_base/search/static/search.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 .search_form {
 	display: inline-block;
diff --git a/couchpotato/core/media/movie/_base/static/movie.scss b/couchpotato/core/media/movie/_base/static/movie.scss
index 55186a9..be92895 100644
--- a/couchpotato/core/media/movie/_base/static/movie.scss
+++ b/couchpotato/core/media/movie/_base/static/movie.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 $mass_edit_height: 44px;
 
diff --git a/couchpotato/core/plugins/category/static/category.scss b/couchpotato/core/plugins/category/static/category.scss
index dfc9497..24ba16e 100644
--- a/couchpotato/core/plugins/category/static/category.scss
+++ b/couchpotato/core/plugins/category/static/category.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 .add_new_category {
 	padding: 20px;
diff --git a/couchpotato/core/plugins/log/static/log.scss b/couchpotato/core/plugins/log/static/log.scss
index 4b4d51f..9a3dd35 100644
--- a/couchpotato/core/plugins/log/static/log.scss
+++ b/couchpotato/core/plugins/log/static/log.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 .page.log {
 
diff --git a/couchpotato/core/plugins/profile/static/profile.scss b/couchpotato/core/plugins/profile/static/profile.scss
index 1cb9af7..6fd4577 100644
--- a/couchpotato/core/plugins/profile/static/profile.scss
+++ b/couchpotato/core/plugins/profile/static/profile.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 .add_new_profile {
 	padding: 20px;
diff --git a/couchpotato/core/plugins/quality/static/quality.scss b/couchpotato/core/plugins/quality/static/quality.scss
index cef35ec..c2aa9f9 100644
--- a/couchpotato/core/plugins/quality/static/quality.scss
+++ b/couchpotato/core/plugins/quality/static/quality.scss
@@ -1,4 +1,4 @@
-@import "couchpotato/static/style/_mixins";
+@import "_mixins";
 
 .group_sizes {
 
@@ -16,4 +16,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+}