From 59f00b6a61fdcaa4d6311d81d155a8bb69fbd09b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 28 Aug 2018 16:09:32 +0200
Subject: [PATCH] [web] Fixed Netlify deploy previews (they serve css from
different domains).
---
web/layouts/partials/header.html | 4 ++--
.../scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content | 3 ---
.../scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.json | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
delete mode 100644 web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.json
diff --git a/web/layouts/partials/header.html b/web/layouts/partials/header.html
index 82f584e6182..8feec263db1 100644
--- a/web/layouts/partials/header.html
+++ b/web/layouts/partials/header.html
@@ -13,10 +13,10 @@
<!-- <link rel="stylesheet" href="/styles.css"> -->
{{ if .Site.IsServer }}
{{ $styles := resources.Get "scss/main.scss" | resources.ToCSS (dict "targetPath" "main.css" "enableSourceMap" true ) | resources.PostCSS }}
- <link rel="stylesheet" href="{{ $styles.RelPermalink }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.Permalink }}" media="screen">
{{ else }}
{{ $styles := resources.Get "scss/main.scss" | resources.ToCSS (dict "targetPath" "main.css" ) | resources.PostCSS | minify | fingerprint }}
- <link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.Permalink }}" media="screen"> <!-- integrity attribute did not work with netlify deploy previews -->
{{ end }}
<script type="text/x-mathjax-config">
diff --git a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
deleted file mode 100644
index 5e541574558..00000000000
--- a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f49a726114b7b3f039c98e50613faf8a6c34f5b00a990631d268a8acfdd80eb6
-size 411842
diff --git a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.json b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.json
deleted file mode 100644
index e332bb13b95..00000000000
--- a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Target":"main.css","MediaType":"text/css","Data":{}}
\ No newline at end of file
--
GitLab