From 9d752685cdecfcb63eb1da778f33168d517ba799 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 31 May 2018 11:27:02 -0600
Subject: [PATCH 1/2] resolved custom css loading issue

---
 views/embed/stream.njk      | 3 +++
 views/login.njk             | 3 +++
 views/templates/account.njk | 3 +++
 views/templates/base.njk    | 1 -
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index ddc620f8e..c9504b3d0 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -5,6 +5,9 @@
 {% block css %}
 <link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
 <link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}
diff --git a/views/login.njk b/views/login.njk
index 6a3c1112f..55e4ef45b 100644
--- a/views/login.njk
+++ b/views/login.njk
@@ -4,6 +4,9 @@
 
 {% block css %}
 <link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}
diff --git a/views/templates/account.njk b/views/templates/account.njk
index 7e1b6e6c9..0ff558c9d 100644
--- a/views/templates/account.njk
+++ b/views/templates/account.njk
@@ -3,4 +3,7 @@
 {% block css %}
 <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
 <link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
diff --git a/views/templates/base.njk b/views/templates/base.njk
index 23048151e..3a5331a1d 100644
--- a/views/templates/base.njk
+++ b/views/templates/base.njk
@@ -19,7 +19,6 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
-    {% include "partials/custom-css.njk" %}
     {% block css %}{% endblock %}
 
     {# Static data injection #}

From 135f0e300f0039d7031b9f782c96b9f4fe6dc43e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 31 May 2018 13:33:34 -0400
Subject: [PATCH 2/2] Small typo

---
 views/embed/stream.njk      | 2 +-
 views/login.njk             | 2 +-
 views/templates/account.njk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index c9504b3d0..9b237b5c2 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -6,7 +6,7 @@
 <link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
 <link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}
 
diff --git a/views/login.njk b/views/login.njk
index 55e4ef45b..7198dbdff 100644
--- a/views/login.njk
+++ b/views/login.njk
@@ -5,7 +5,7 @@
 {% block css %}
 <link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}
 
diff --git a/views/templates/account.njk b/views/templates/account.njk
index 0ff558c9d..bcda22a67 100644
--- a/views/templates/account.njk
+++ b/views/templates/account.njk
@@ -4,6 +4,6 @@
 <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
 <link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}