From 8b49f62dc8dcc2a5fdf4586dd4cb5f53494d30e3 2017-06-07 22:01:31
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2017-06-07 22:01:31
Subject: [PATCH] Styleshees are now sass-based. Woo.
---

diff --git a/pinaxcon/templates/_styles.html b/pinaxcon/templates/_styles.html
index f6e4cd8ce4d73a13de6882f4d2eceb3ecffea27c..972d0aa8c4cad67bdd93994550e7af0225ce6501 100644
--- a/pinaxcon/templates/_styles.html
+++ b/pinaxcon/templates/_styles.html
@@ -1 +1,5 @@
-<link href='/site_media/static/css/site-0a247b924d.css' rel='stylesheet' />
+{% load compress %}
+{% load staticfiles %}
+{% compress css %}
+    <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}" />
+{% endcompress %}
diff --git a/static/scss/base.scss b/static/scss/base.scss
deleted file mode 100644
index 6e47f8bec82c3909ddf0f14096833ae234419211..0000000000000000000000000000000000000000
--- a/static/scss/base.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "variables.scss";
-@import "account.scss";
-@import "custom.scss";
-@import "editor.scss";
-@import "site.scss";
-@import "symposion-components.scss";
-@import "symposion-schedule.scss";
-@import "variables.scss";
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index dcb2562960eb1f9a04f4da77703fc03241d78ea7..fc5ae9dbca17415445fd53e440c2a3168bdf5443 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -23,8 +23,8 @@ p.login-signup {
             margin-bottom: 0.2em;
         }
         @include make-sm-column(4);
-        .text-center;
-        margin: 2em 0;
+        /*.text-center;
+        margin: 2em 0;*/
     }
 }
 
diff --git a/static/scss/site.scss b/static/scss/site.scss
index da96c552d21b607bc23177d7a7942a3dba23e658..429d7a66cf32921ecd6aa1edaa0709580a473f7d 100644
--- a/static/scss/site.scss
+++ b/static/scss/site.scss
@@ -1,15 +1,18 @@
-@import "bootstrap";
-@import "font-awesome";
+$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
+@import "../bootstrap/stylesheets/_bootstrap.scss";
 
-@import "variables.less";
+/* @import "bootstrap";
+@import "font-awesome"; */
+
+@import "variables.scss";
 
 // Account
-@import "account.less";
+@import "account.scss";
 
 // Symposion UI components
-@import "editor.less";
-@import "symposion-components.less";
-@import "symposion-schedule.less";
+@import "editor.scss";
+@import "symposion-components.scss";
+@import "symposion-schedule.scss";
 
 // Site overrides
-@import "custom.less";
+@import "custom.scss";