create/skeletons: Use css.Build in theme skeleton

Closes #14626

diff --git a/create/skeletons/theme/assets/css/components/footer.css b/create/skeletons/theme/assets/css/components/footer.css
new file mode 100644 (file)
index 0000000..abe2b5a
--- /dev/null
+++ b/create/skeletons/theme/assets/css/components/footer.css
@@ -0,0 +1,4 @@
+footer {
+  border-top: 1px solid #222;
+  margin-top: 1rem;
+}

diff --git a/create/skeletons/theme/assets/css/components/header.css b/create/skeletons/theme/assets/css/components/header.css
new file mode 100644 (file)
index 0000000..8efea1e
--- /dev/null
+++ b/create/skeletons/theme/assets/css/components/header.css
@@ -0,0 +1,4 @@
+header {
+  border-bottom: 1px solid #222;
+  margin-bottom: 1rem;
+}

diff --git a/create/skeletons/theme/assets/css/main.css b/create/skeletons/theme/assets/css/main.css
index 166ade9245232d7735f4f92a1a5d78bfce45ddd2..6c0b66090683f496420f79ee2e8cabe7e9101134 100644 (file)
--- a/create/skeletons/theme/assets/css/main.css
+++ b/create/skeletons/theme/assets/css/main.css
@@ -1,3 +1,6 @@
+@import "components/header.css";
+@import "components/footer.css";
+
 body {
   color: #222;
   font-family: sans-serif;
@@ -6,16 +9,6 @@ body {
   max-width: 768px;
 }
 
-header {
-  border-bottom: 1px solid #222;
-  margin-bottom: 1rem;
-}
-
-footer {
-  border-top: 1px solid #222;
-  margin-top: 1rem;
-}
-
 a {
   color: #00e;
   text-decoration: none;

diff --git a/create/skeletons/theme/layouts/_partials/head/css.html b/create/skeletons/theme/layouts/_partials/head/css.html
index d76d23a16cec3ffb32230569bd97713194f1700f..889786684b135047e67ad224236dd49b68279aa0 100644 (file)
--- a/create/skeletons/theme/layouts/_partials/head/css.html
+++ b/create/skeletons/theme/layouts/_partials/head/css.html
@@ -1,9 +1,15 @@
 {{- with resources.Get "css/main.css" }}
-  {{- if hugo.IsDevelopment }}
-    <link rel="stylesheet" href="{{ .RelPermalink }}">
-  {{- else }}
-    {{- with . | minify | fingerprint }}
-      <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+  {{- $opts := dict
+    "minify" (cond hugo.IsDevelopment false true)
+    "sourceMap" (cond hugo.IsDevelopment "linked" "none")
+  }}
+  {{- with . | css.Build $opts }}
+    {{- if hugo.IsDevelopment }}
+      <link rel="stylesheet" href="{{ .RelPermalink }}">
+    {{- else }}
+      {{- with . | fingerprint }}
+        <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+      {{- end }}
     {{- end }}
   {{- end }}
 {{- end }}

diff --git a/create/skeletons/theme/layouts/_partials/head/js.html b/create/skeletons/theme/layouts/_partials/head/js.html
index 16ffbedfeaa75ab67400e913c68f920a893d49b9..0210efa8b427dd3538a8fd4e41ba2fda08cc8132 100644 (file)
--- a/create/skeletons/theme/layouts/_partials/head/js.html
+++ b/create/skeletons/theme/layouts/_partials/head/js.html
@@ -1,8 +1,7 @@
 {{- with resources.Get "js/main.js" }}
   {{- $opts := dict
-    "minify" (not hugo.IsDevelopment)
-    "sourceMap" (cond hugo.IsDevelopment "external" "")
-    "targetPath" "js/main.js"
+    "minify" (cond hugo.IsDevelopment false true)
+    "sourceMap" (cond hugo.IsDevelopment "linked" "none")
   }}
   {{- with . | js.Build $opts }}
     {{- if hugo.IsDevelopment }}