Move SCSS includes to separate directory.

This prevents warnings/errors when compiling in newer versions of SASS
to do with overlapping filenames.

20 files changed, 32 insertions, 32 deletions

diff --git a/web/cobrands/barnet/base.scss b/web/cobrands/barnet/base.scss
index 2dd0640a6..bc1642e22 100644
--- a/web/cobrands/barnet/base.scss
+++ b/web/cobrands/barnet/base.scss
@@ -1,9 +1,9 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 #mast,
 #breadcrumb,
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss
index 3ea439dea..4c035386c 100644
--- a/web/cobrands/barnet/layout.scss
+++ b/web/cobrands/barnet/layout.scss
@@ -1,5 +1,5 @@
 @import "_colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 #mast,
 #breadcrumb,
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 9c5ff2b0f..7975197ff 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -1,9 +1,9 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 a, a:visited {
     color: #369;
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 6fa4c1c7c..2dcc73cc4 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -1,5 +1,5 @@
 @import "_colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 body { background: #9b9b9b url('https://www.bromley.gov.uk/site/styles/css_img/repeater.gif') repeat-x; }
 #bromley-wrapper { background: #fff url('https://www.bromley.gov.uk/site/styles/css_img/header-corners.gif') center 110px no-repeat; margin: 1px auto 0; padding: 0 15px; width: 955px;}
diff --git a/web/cobrands/default/base.scss b/web/cobrands/default/base.scss
index 4594f832f..9fccf92db 100644
--- a/web/cobrands/default/base.scss
+++ b/web/cobrands/default/base.scss
@@ -1,7 +1,7 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
diff --git a/web/cobrands/default/layout.scss b/web/cobrands/default/layout.scss
index 7e33d3f1f..5d1fab968 100644
--- a/web/cobrands/default/layout.scss
+++ b/web/cobrands/default/layout.scss
@@ -1,5 +1,5 @@
 @import "_colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 /*
 Note: The fact that the below has to override the CSS, though it is for the
diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss
index 6f31f223d..9088efa71 100644
--- a/web/cobrands/fixmybarangay/base.scss
+++ b/web/cobrands/fixmybarangay/base.scss
@@ -1,11 +1,11 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
 $image-sprite: 'images/sprite.png';
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 #site-logo{
   width: 225px !important;
diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss
index ec35c0f0c..675a185b1 100644
--- a/web/cobrands/fixmybarangay/layout.scss
+++ b/web/cobrands/fixmybarangay/layout.scss
@@ -2,7 +2,7 @@
 
 $image-sprite: 'images/sprite.png';
 
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 @mixin box_round($radius) {
   -webkit-border-radius: $radius; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 21cc16cb4..044abed64 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -4,9 +4,9 @@
  * layout for browsers that can't handle media queries. Baseline grid of 1.5em.
  */
 
-@import "_h5bp";
+@import "../sass/h5bp";
 @import "_colours";
-@import "_mixins";
+@import "../sass/mixins";
 @import "compass";
-@import "_base";
+@import "../sass/base";
 
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index a20a4b889..bc61f09e4 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -64,7 +64,7 @@ h3, h4 {
 }
 
 @import "_colours";
-@import "_layout";
+@import "../sass/layout";
 
 // Tiled main body background
 body {
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index bb09ba07b..cf20374da 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -1,9 +1,9 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 
 // Colour tab to match colour scheme
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 366af0522..8e6b9f227 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -1,5 +1,5 @@
 @import "_colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 body {
   background-color: #fff;
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/sass/_base.scss
index a7670b434..a7670b434 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/sass/_base.scss
diff --git a/web/cobrands/fixmystreet/_h5bp.scss b/web/cobrands/sass/_h5bp.scss
index f4078cca6..f4078cca6 100644
--- a/web/cobrands/fixmystreet/_h5bp.scss
+++ b/web/cobrands/sass/_h5bp.scss
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/sass/_layout.scss
index 07f944ffa..07f944ffa 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/sass/_mixins.scss
index 4c7bc5af8..4c7bc5af8 100644
--- a/web/cobrands/fixmystreet/_mixins.scss
+++ b/web/cobrands/sass/_mixins.scss
diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss
index 36f37bff1..f17061356 100644
--- a/web/cobrands/stevenage/base.scss
+++ b/web/cobrands/stevenage/base.scss
@@ -1,13 +1,13 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
 $body-font: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif;
 $meta-font: $body-font;
 $heading-font: 'PTSansCaptionRegular', "PT Sans Caption", Verdana, Arial, sans-serif;
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 @import "council_header";
 
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index a46c15875..697d32799 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -1,5 +1,5 @@
 @import "colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 
 // d523b431 - "Stevenage Home page styles"
 // 2a23e09f - Moved menu on map page and reverted to full header.
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss
index a89aec2fd..27aab1d63 100644
--- a/web/cobrands/zurich/base.scss
+++ b/web/cobrands/zurich/base.scss
@@ -1,9 +1,9 @@
-@import "../fixmystreet/_h5bp";
+@import "../sass/h5bp";
 @import "./_colours";
-@import "../fixmystreet/_mixins";
+@import "../sass/mixins";
 @import "compass";
 
-@import "../fixmystreet/_base";
+@import "../sass/base";
 
 /* Front page main box is in content now, so get rid of its margin from parent */
 #front-main {
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index 2b16636b9..0c42924d4 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -1,5 +1,5 @@
 @import "colours";
-@import "../fixmystreet/_layout";
+@import "../sass/layout";
 @import "zurich";
 
 // Things to override from parent stylesheet