From 1f5d5a2bd21c19ca6ae3e882c12abe9e86418fee Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 5 Feb 2015 15:30:12 +0100
Subject: [PATCH] Fix imports for styles

---
 app/styles/app.scss                   | 47 +++++++++++++++++++++++++--
 app/styles/app/_mixins/all.sass       |  1 -
 app/styles/app/ansi.sass              |  2 +-
 app/styles/app/app.sass               |  2 +-
 app/styles/app/auth.sass              |  2 +-
 app/styles/app/button.sass            |  2 +-
 app/styles/app/components/tiles.sass  |  2 +-
 app/styles/app/flash.sass             |  2 +-
 app/styles/app/github.sass            |  2 +-
 app/styles/app/layout.sass            |  4 +--
 app/styles/app/layouts/dashboard.sass |  2 +-
 app/styles/app/layouts/error.sass     |  2 +-
 app/styles/app/layouts/footer.sass    |  4 +--
 app/styles/app/left.sass              |  2 +-
 app/styles/app/left/list.sass         |  2 +-
 app/styles/app/loading.sass           |  2 +-
 app/styles/app/main.sass              |  2 +-
 app/styles/app/main/annotations.sass  |  2 +-
 app/styles/app/main/list.sass         |  2 +-
 app/styles/app/main/log.sass          |  2 +-
 app/styles/app/main/repository.sass   |  2 +-
 app/styles/app/main/summary.sass      |  4 +--
 app/styles/app/main/tools.sass        |  2 +-
 app/styles/app/maximize.sass          |  2 +-
 app/styles/app/misc.sass              |  2 +-
 app/styles/app/popup.sass             |  2 +-
 app/styles/app/pro.sass               |  2 +-
 app/styles/app/profile.sass           |  2 +-
 app/styles/app/profile/hooks.sass     |  2 +-
 app/styles/app/requests.sass          |  2 +-
 app/styles/app/right.sass             |  2 +-
 app/styles/app/right/lists.sass       |  2 +-
 app/styles/app/right/sponsors.sass    |  2 +-
 app/styles/app/stats.sass             |  2 +-
 app/styles/app/status.sass            |  2 +-
 app/styles/app/tabs.sass              |  4 +--
 36 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/app/styles/app.scss b/app/styles/app.scss
index 9adb5ad0..f38047fa 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1,3 +1,44 @@
-html, body {
-  margin: 20px;
-}
+@import "app/app";
+@import "app/ansi";
+@import "app/auth";
+@import "app/button";
+@import "app/caches";
+@import "app/charm";
+@import "app/components/loader";
+@import "app/components/tiles";
+@import "app/components/travis-switch";
+@import "app/flash";
+@import "app/forms";
+@import "app/getting_started";
+@import "app/github";
+@import "app/layout";
+@import "app/layouts/dashboard";
+@import "app/layouts/error";
+@import "app/layouts/footer";
+@import "app/left/list";
+@import "app/left";
+@import "app/loading";
+@import "app/main/annotations";
+@import "app/main/list";
+@import "app/main/log";
+@import "app/main/repository";
+@import "app/main/sponsors";
+@import "app/main/summary";
+@import "app/main/tools";
+@import "app/main";
+@import "app/maximize";
+@import "app/misc";
+@import "app/popup";
+@import "app/pro";
+@import "app/profile/hooks";
+@import "app/profile";
+@import "app/requests";
+@import "app/right/lists";
+@import "app/right/sponsors";
+@import "app/right";
+@import "app/settings";
+@import "app/stats";
+@import "app/status";
+@import "app/tabs";
+@import "app/tipsy.css";
+@import "app/top";
diff --git a/app/styles/app/_mixins/all.sass b/app/styles/app/_mixins/all.sass
index ed40fd4d..a1863a95 100644
--- a/app/styles/app/_mixins/all.sass
+++ b/app/styles/app/_mixins/all.sass
@@ -1,4 +1,3 @@
-@import "compass"
 @import "app/_mixins/colors"
 @import "app/_mixins/fonts"
 @import "app/_mixins/vars"
diff --git a/app/styles/app/ansi.sass b/app/styles/app/ansi.sass
index 165cca96..92b813dc 100644
--- a/app/styles/app/ansi.sass
+++ b/app/styles/app/ansi.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 // ansi styles, see javascripts/lib/deansi.js
 .ansi
diff --git a/app/styles/app/app.sass b/app/styles/app/app.sass
index 63688909..abb4639e 100644
--- a/app/styles/app/app.sass
+++ b/app/styles/app/app.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "_mixins/all"
 
 html, body
   font-family: 'Source Sans Pro', Helvetica, sans-serif
diff --git a/app/styles/app/auth.sass b/app/styles/app/auth.sass
index 6f6cc32b..79913e32 100644
--- a/app/styles/app/auth.sass
+++ b/app/styles/app/auth.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #auth
   #main
diff --git a/app/styles/app/button.sass b/app/styles/app/button.sass
index 17e61e2d..7c104999 100644
--- a/app/styles/app/button.sass
+++ b/app/styles/app/button.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .button
   position: relative
diff --git a/app/styles/app/components/tiles.sass b/app/styles/app/components/tiles.sass
index 435a34e5..865b468b 100644
--- a/app/styles/app/components/tiles.sass
+++ b/app/styles/app/components/tiles.sass
@@ -1,7 +1,7 @@
 /*
  * tile component as seen on dashboard
  */
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 .tiles
   background  : #f4f3ea
diff --git a/app/styles/app/flash.sass b/app/styles/app/flash.sass
index 698991b0..2ec5fedf 100644
--- a/app/styles/app/flash.sass
+++ b/app/styles/app/flash.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .flash
   color: #fff
diff --git a/app/styles/app/github.sass b/app/styles/app/github.sass
index 876b34b0..b55ba576 100644
--- a/app/styles/app/github.sass
+++ b/app/styles/app/github.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #github-wrapper
   position: absolute
diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass
index f390f2f4..e6f32d21 100644
--- a/app/styles/app/layout.sass
+++ b/app/styles/app/layout.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 
 .centered .row
@@ -203,4 +203,4 @@ a
 
 
 .no-padding
-  padding : 0
\ No newline at end of file
+  padding : 0
diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass
index b4ce52a5..b3595ef5 100644
--- a/app/styles/app/layouts/dashboard.sass
+++ b/app/styles/app/layouts/dashboard.sass
@@ -3,7 +3,7 @@
  * @todo: split into components: filter, search
  */
 
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 
 .wrapper-dashboard
diff --git a/app/styles/app/layouts/error.sass b/app/styles/app/layouts/error.sass
index 880cbb5b..9ed13efd 100644
--- a/app/styles/app/layouts/error.sass
+++ b/app/styles/app/layouts/error.sass
@@ -1,7 +1,7 @@
 /*
  * Error Pages
  */
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 .main--error
   min-height: 100%
diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass
index baa933a7..00549493 100644
--- a/app/styles/app/layouts/footer.sass
+++ b/app/styles/app/layouts/footer.sass
@@ -1,7 +1,7 @@
 /*
  * Footer on the dashboard
  */
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 footer
   padding          : 20px 0
@@ -54,7 +54,7 @@ footer a:hover,
 footer a:active
   text-decoration : underline
 
-a 
+a
   text-decoration : none
   display         : block
   color           : $footer-color
diff --git a/app/styles/app/left.sass b/app/styles/app/left.sass
index 4d62b786..05778c5d 100644
--- a/app/styles/app/left.sass
+++ b/app/styles/app/left.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all.sass"
+@import "./_mixins/all.sass"
 
 #left
   #search_box
diff --git a/app/styles/app/left/list.sass b/app/styles/app/left/list.sass
index ddcc8c4b..049c8115 100644
--- a/app/styles/app/left/list.sass
+++ b/app/styles/app/left/list.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #accounts,
 #repos
diff --git a/app/styles/app/loading.sass b/app/styles/app/loading.sass
index 09298adb..dbfc7c0d 100644
--- a/app/styles/app/loading.sass
+++ b/app/styles/app/loading.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .loading
   padding: 15px 25px 0 0
diff --git a/app/styles/app/main.sass b/app/styles/app/main.sass
index d2001036..295d5353 100644
--- a/app/styles/app/main.sass
+++ b/app/styles/app/main.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #main
   h3
diff --git a/app/styles/app/main/annotations.sass b/app/styles/app/main/annotations.sass
index bb5cd5d7..561e7552 100644
--- a/app/styles/app/main/annotations.sass
+++ b/app/styles/app/main/annotations.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #annotations
   margin: 8px 0 25px 12px
diff --git a/app/styles/app/main/list.sass b/app/styles/app/main/list.sass
index 497c5797..66e56805 100644
--- a/app/styles/app/main/list.sass
+++ b/app/styles/app/main/list.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 table.list
   width: 100%
diff --git a/app/styles/app/main/log.sass b/app/styles/app/main/log.sass
index f59d964e..b659f181 100644
--- a/app/styles/app/main/log.sass
+++ b/app/styles/app/main/log.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 pre#log
   position: relative
diff --git a/app/styles/app/main/repository.sass b/app/styles/app/main/repository.sass
index 7a081df5..bd1b11cc 100644
--- a/app/styles/app/main/repository.sass
+++ b/app/styles/app/main/repository.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #repo
   position: relative
diff --git a/app/styles/app/main/summary.sass b/app/styles/app/main/summary.sass
index b742e00f..66d64b24 100644
--- a/app/styles/app/main/summary.sass
+++ b/app/styles/app/main/summary.sass
@@ -1,5 +1,5 @@
-@import "app/_mixins/all"
-@import "app/foundation/scss/foundation/components/_grid"
+@import "../_mixins/all"
+@import "../foundation/scss/foundation/components/_grid"
 
 .green .build-status
   background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat
diff --git a/app/styles/app/main/tools.sass b/app/styles/app/main/tools.sass
index 71dedd0f..c728a3ac 100644
--- a/app/styles/app/main/tools.sass
+++ b/app/styles/app/main/tools.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #tools
 
diff --git a/app/styles/app/maximize.sass b/app/styles/app/maximize.sass
index deb4a98a..07bac35d 100644
--- a/app/styles/app/maximize.sass
+++ b/app/styles/app/maximize.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .pro.maximized
   #right
diff --git a/app/styles/app/misc.sass b/app/styles/app/misc.sass
index fbea60a1..b6ca55e2 100644
--- a/app/styles/app/misc.sass
+++ b/app/styles/app/misc.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .display
   display: block !important
diff --git a/app/styles/app/popup.sass b/app/styles/app/popup.sass
index ca551bdd..94238491 100644
--- a/app/styles/app/popup.sass
+++ b/app/styles/app/popup.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .help
   display: inline-block
diff --git a/app/styles/app/pro.sass b/app/styles/app/pro.sass
index a8c8e9d1..9e044787 100644
--- a/app/styles/app/pro.sass
+++ b/app/styles/app/pro.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .pro
   #log-container
diff --git a/app/styles/app/profile.sass b/app/styles/app/profile.sass
index 7e234f30..ca57a967 100644
--- a/app/styles/app/profile.sass
+++ b/app/styles/app/profile.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #profile
   #main
diff --git a/app/styles/app/profile/hooks.sass b/app/styles/app/profile/hooks.sass
index aeb2145a..cfd97be5 100644
--- a/app/styles/app/profile/hooks.sass
+++ b/app/styles/app/profile/hooks.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #profile
   #unadministerable-hooks
diff --git a/app/styles/app/requests.sass b/app/styles/app/requests.sass
index 6ed0112b..cc07beca 100644
--- a/app/styles/app/requests.sass
+++ b/app/styles/app/requests.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #request
   h3
diff --git a/app/styles/app/right.sass b/app/styles/app/right.sass
index 1ac9939b..0897c1bd 100644
--- a/app/styles/app/right.sass
+++ b/app/styles/app/right.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #profile
   #right
diff --git a/app/styles/app/right/lists.sass b/app/styles/app/right/lists.sass
index d9240341..a3f7371e 100644
--- a/app/styles/app/right/lists.sass
+++ b/app/styles/app/right/lists.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #right
   .tabs
diff --git a/app/styles/app/right/sponsors.sass b/app/styles/app/right/sponsors.sass
index afbe2b8c..d09f1eeb 100644
--- a/app/styles/app/right/sponsors.sass
+++ b/app/styles/app/right/sponsors.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "../_mixins/all"
 
 #right
   .sponsors
diff --git a/app/styles/app/stats.sass b/app/styles/app/stats.sass
index 32211b12..300c6d39 100644
--- a/app/styles/app/stats.sass
+++ b/app/styles/app/stats.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 #repo_count_container,
 #build_count_container
diff --git a/app/styles/app/status.sass b/app/styles/app/status.sass
index 92a85400..5a988561 100644
--- a/app/styles/app/status.sass
+++ b/app/styles/app/status.sass
@@ -1,4 +1,4 @@
-@import "app/_mixins/all"
+@import "./_mixins/all"
 
 .status
   display: inline-block
diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass
index e96e71bf..ec8e56e1 100644
--- a/app/styles/app/tabs.sass
+++ b/app/styles/app/tabs.sass
@@ -1,5 +1,5 @@
-@import "app/_mixins/all"
-@import "app/foundation/scss/foundation/_settings"
+@import "./_mixins/all"
+@import "./foundation/scss/foundation/_settings"
 
 .tabs