From 1036911011d4634999dc96205515b13f8b7b9554 Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Tue, 05 Jan 2021 09:59:44 +0000
Subject: [PATCH] Reverted breaking SCSS changes
---
layouts/partials/head.html | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 983fa1d..c09cf55 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -11,17 +11,6 @@
{{- end -}}
<!-- CSS -->
-<<<<<<< HEAD
- {{ $styles := resources.Get "scss/main.scss" | resources.ExecuteAsTemplate "style.main.scss" . | toCSS | minify | fingerprint }}
-
- <link rel="stylesheet"
- href="{{ $styles.Permalink }}"
- integrity="{{ $styles.Data.Integrity }}"
- media="screen">
- {{- $css := "" -}}
- {{- range .Site.Params.customCss -}}
- {{ $css := resources.Get . | fingerprint }}
-=======
{{ $style := resources.Get "css/style.css" | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet"
href="{{ $style.Permalink }}"
@@ -29,7 +18,6 @@
crossorigin="anonymous"
type="text/css">
{{ $markupHighlightStyle := resources.Get "css/markupHighlight.css" | resources.Minify | resources.Fingerprint }}
->>>>>>> upstream/master
<link rel="stylesheet"
href="{{ $markupHighlightStyle.Permalink }}"
integrity="{{ $markupHighlightStyle.Data.Integrity }}"
--
Gitblit v1.10.0