From ac643c204cb3516ed8d1df9e7fefeb7e0de3d344 Mon Sep 17 00:00:00 2001
From: lucperkins <lucperkins@gmail.com>
Date: Thu, 26 Jul 2018 10:54:48 -0700
Subject: [PATCH] Update CSS generation logic in css.html partial

---
 layouts/partials/css.html                     | 22 ++++++++++++-------
 ..._8348eecb74b7f1dceadfa8f990b7802f.content} |  0
 ...ass_8348eecb74b7f1dceadfa8f990b7802f.json} |  0
 ..._892df88c65b3b9097bc19fe132ab934f.content} |  0
 ...sass_892df88c65b3b9097bc19fe132ab934f.json |  1 +
 ...sass_cb957da2191fde4902dd41b139c8069d.json |  1 -
 ..._8348eecb74b7f1dceadfa8f990b7802f.content} |  0
 ...ass_8348eecb74b7f1dceadfa8f990b7802f.json} |  0
 8 files changed, 15 insertions(+), 9 deletions(-)
 rename resources/_gen/assets/sass/cn/sass/{styles.sass_cb957da2191fde4902dd41b139c8069d.content => styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content} (100%)
 rename resources/_gen/assets/sass/cn/sass/{styles.sass_cb957da2191fde4902dd41b139c8069d.json => styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json} (100%)
 rename resources/_gen/assets/sass/sass/{case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.content => case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.content} (100%)
 create mode 100644 resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.json
 delete mode 100644 resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.json
 rename resources/_gen/assets/sass/sass/{styles.sass_cb957da2191fde4902dd41b139c8069d.content => styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content} (100%)
 rename resources/_gen/assets/sass/sass/{styles.sass_cb957da2191fde4902dd41b139c8069d.json => styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json} (100%)

diff --git a/layouts/partials/css.html b/layouts/partials/css.html
index b5341a6c55..e2cf92071f 100644
--- a/layouts/partials/css.html
+++ b/layouts/partials/css.html
@@ -1,22 +1,28 @@
+{{- $inServerMode := .Site.IsServer }}
+{{- $caseStudyStyles := .Params.case_study_styles }}
 {{- $mainSass := "sass/styles.sass" }}
 {{- $caseStudySass := "sass/case_study_styles.sass" }}
-<link rel="stylesheet" type="text/css" href="/css/base_fonts.css">
-{{- if .Site.IsServer }}
-{{- $mainCssOpts := (dict "targetPath" "css/styles.css") }}
+{{- $mainCssOpts := cond ($inServerMode) (dict "targetPath" "css/styles.css" "enableSourceMap" true) (dict "targetPath" "css/styles.css" "outputStyle" "compressed") }}
+{{- $caseStudyCssOpts := cond ($inServerMode) (dict "targetPath" "css/case_study_styles.css" "enableSourceMap" true) (dict "targetPath" "css/case_study_styles.css" "outputStyle" "compressed") }}
+{{- if $inServerMode }}
 {{- $mainCss := resources.Get $mainSass | toCSS $mainCssOpts }}
 <link rel="stylesheet" media="screen" href="{{ $mainCss.RelPermalink }}"><!-- default styles.css on -->
+{{- if $caseStudyStyles }}
+{{- $caseStudyCss := resources.Get $caseStudySass }}
+<link rel="stylesheet" media="screen" href="{{ $caseStudyCss.RelPermalink }}"><!-- custom case_study_styles on -->
+{{- end }}
 {{- else }}
-{{- $mainCssOpts := (dict "targetPath" "css/styles.css") }}
 {{- $mainCss := resources.Get $mainSass | toCSS $mainCssOpts | minify | fingerprint }}
 <link rel="stylesheet" media="screen" href="{{ $mainCss.RelPermalink }}" integrity="{{ $mainCss.Data.Integrity }}"><!-- default styles.css on -->
-{{- end }}
-{{- if .Params.case_study_styles }}
-{{- $caseStudyCssOpts := (dict "targetPath" "css/styles.css") }}
+{{- if $caseStudyStyles }}
 {{- $caseStudyCss := resources.Get $caseStudySass | toCSS $caseStudyCssOpts | minify | fingerprint }}
-<link rel="stylesheet" media="screen" href="{{ $caseStudyCss.Permalink }}" integrity="{{ $caseStudyCss.Data.Integrity }}"><!-- custom case_study_styles on -->
+<link rel="stylesheet" media="screen" href="{{ $caseStudyCss.RelPermalink }}" integrity="{{ $mainCss.Data.Integrity }}"><!-- custom case_study_styles on -->
 {{- end }}
+{{- end }}
+
 <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+<link rel="stylesheet" type="text/css" href="{{ "/css/base_fonts.css" | relURL }}">
 <link rel="stylesheet" type="text/css" href="{{ "css/callouts.css" | relURL }}">
 <link rel="stylesheet" type="text/css" href="{{ "css/custom-jekyll/tags.css" | relURL }}">
 {{- if .Params.deprecated }}
diff --git a/resources/_gen/assets/sass/cn/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.content b/resources/_gen/assets/sass/cn/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content
similarity index 100%
rename from resources/_gen/assets/sass/cn/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.content
rename to resources/_gen/assets/sass/cn/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content
diff --git a/resources/_gen/assets/sass/cn/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.json b/resources/_gen/assets/sass/cn/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json
similarity index 100%
rename from resources/_gen/assets/sass/cn/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.json
rename to resources/_gen/assets/sass/cn/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json
diff --git a/resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.content b/resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.content
similarity index 100%
rename from resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.content
rename to resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.content
diff --git a/resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.json b/resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.json
new file mode 100644
index 0000000000..da5d007bd7
--- /dev/null
+++ b/resources/_gen/assets/sass/sass/case_study_styles.sass_892df88c65b3b9097bc19fe132ab934f.json
@@ -0,0 +1 @@
+{"Target":"css/case_study_styles.min.3a4a157b6c0f5130dd7ada2cc65c770a1e7b22b443594d9f713ff99fd6ca0425.css","MediaType":"text/css","Data":{"Integrity":"sha256-OkoVe2wPUTDdetosxlx3Ch57IrRDWU2fcT/5n9bKBCU="}}
\ No newline at end of file
diff --git a/resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.json b/resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.json
deleted file mode 100644
index f3a8ef4b59..0000000000
--- a/resources/_gen/assets/sass/sass/case_study_styles.sass_cb957da2191fde4902dd41b139c8069d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Target":"css/styles.min.3a4a157b6c0f5130dd7ada2cc65c770a1e7b22b443594d9f713ff99fd6ca0425.css","MediaType":"text/css","Data":{"Integrity":"sha256-OkoVe2wPUTDdetosxlx3Ch57IrRDWU2fcT/5n9bKBCU="}}
\ No newline at end of file
diff --git a/resources/_gen/assets/sass/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.content b/resources/_gen/assets/sass/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content
similarity index 100%
rename from resources/_gen/assets/sass/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.content
rename to resources/_gen/assets/sass/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.content
diff --git a/resources/_gen/assets/sass/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.json b/resources/_gen/assets/sass/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json
similarity index 100%
rename from resources/_gen/assets/sass/sass/styles.sass_cb957da2191fde4902dd41b139c8069d.json
rename to resources/_gen/assets/sass/sass/styles.sass_8348eecb74b7f1dceadfa8f990b7802f.json