diff --git a/pinaxcon/templates/_styles.html b/pinaxcon/templates/_styles.html
index 1bf398fbcc602629e4d82e19e5c60ca25cbf86cc..3192eba06a8556a729e50f6ae0242323f67165b0 100644
--- a/pinaxcon/templates/_styles.html
+++ b/pinaxcon/templates/_styles.html
@@ -1,6 +1,7 @@
{% load compress %}
{% load staticfiles %}
+
{% compress css %}
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index 5a92266f186167d2295abdcfc14d0203b85383d0..5a890d2d8ee38702ce617fceee84da005dc4444b 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -1,7 +1,19 @@
body {
padding-top: 50px;
position: relative;
+ font-weight: 300; // Not overridable in bootstrap at the moment.
}
+
+// Not overridable in bootstrap at the moment
+.dropdown-menu >li >a {
+ font-weight: 300;
+}
+
+// Not overridable in bootstrap at the moment.
+strong {
+ font-weight: 500;
+}
+
section {
padding: 20px 0px;
}
@@ -64,7 +76,3 @@ body.reviews.voting-status {
.sponsor-list > div {
margin: 10px 0;
}
-
-
-
-
diff --git a/static/scss/site.scss b/static/scss/site.scss
index 429d7a66cf32921ecd6aa1edaa0709580a473f7d..4b001f60982d6ca0cb0590824b7530ab30da57db 100644
--- a/static/scss/site.scss
+++ b/static/scss/site.scss
@@ -1,11 +1,14 @@
+
+// Variables MUST be imported before bootstrap CSS, otherwise nothing gets done.
$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
+@import "variables.scss";
+
+// Bootstrap itself
@import "../bootstrap/stylesheets/_bootstrap.scss";
/* @import "bootstrap";
@import "font-awesome"; */
-@import "variables.scss";
-
// Account
@import "account.scss";
diff --git a/static/scss/variables.scss b/static/scss/variables.scss
index f63a06aeed06c6a57cb974ba980283b44a8dbc85..b9bf05216c732ee9d4ba8d8b40be4140d0542fb8 100644
--- a/static/scss/variables.scss
+++ b/static/scss/variables.scss
@@ -1,3 +1,15 @@
-$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
+// Used by links, buttons, and other background bits.
+$brand-primary: #1f6400;
+
+$font-family-sans-serif: 'Montserrat', Arial, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+
+
+// Navbar
+$navbar-default-bg: $brand-primary;
+$navbar-default-color: white;
+$navbar-default-link-color: darken($navbar-default-color, 6.5%);
+$navbar-default-link-hover-color: darken($navbar-default-link-color, 6.5%);
+$navbar-default-link-active-color: $navbar-default-link-hover-color;
+$navbar-default-link-disabled-color: lighten($navbar-default-bg, 6.5%);