Consolidate stylesheets

This removes styles.scss as intermediate stylesheet. Only main.scss
is now built, thereby also removing duplicated imports.

3 files changed, 10 insertions, 16 deletions

diff --git a/web-ui/app/scss/_mascot.scss b/web-ui/app/scss/_mascot.scss
index 5cfac90d..74279063 100644
--- a/web-ui/app/scss/_mascot.scss
+++ b/web-ui/app/scss/_mascot.scss
@@ -1,5 +1,3 @@
-/* SHEEP */
-
 #no-message-selected-pane {
   position: absolute;
   top: 0;
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/_styles.scss
index a5a6dca1..a7d6dedf 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/_styles.scss
@@ -1,13 +1,6 @@
-
-@import "compass/css3";
-@import "colors";
-@import "mixins";
-@import "alerts";
-@import "read";
-@import "reply";
-@import "compose";
-@import "security";
-
+/*
+ * Miscellaneous styles without apparent grouping
+ */
 
 #logo {
   color: $white;
@@ -901,6 +894,3 @@ div.side-nav-bottom {
     cursor: progress;
   }
 }
-
-
-@import "mascot.scss";
diff --git a/web-ui/app/scss/main.scss b/web-ui/app/scss/main.scss
index 7d081ad1..b582a5d5 100644
--- a/web-ui/app/scss/main.scss
+++ b/web-ui/app/scss/main.scss
@@ -2,9 +2,15 @@
 @import "reset";
 @import "foundation";
 @import "colors";
+@import "mixins";
+@import "alerts";
+@import "read";
+@import "reply";
+@import "compose";
+@import "security";
+@import "mascot";
 @import "styles";
 
-
 html {
     height:100%;
 }