diff --git a/pinaxcon/templates/_styles.html b/pinaxcon/templates/_styles.html index f6e4cd8..972d0aa 100644 --- a/pinaxcon/templates/_styles.html +++ b/pinaxcon/templates/_styles.html @@ -1 +1,5 @@ - +{% load compress %} +{% load staticfiles %} +{% compress css %} + +{% endcompress %} diff --git a/static/scss/base.scss b/static/scss/base.scss deleted file mode 100644 index 6e47f8b..0000000 --- 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 dcb2562..fc5ae9d 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 da96c55..429d7a6 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";