diff --git a/layouts/partials/spacing_css.html b/layouts/partials/spacing_css.html deleted file mode 100644 index abb7d3e..0000000 --- a/layouts/partials/spacing_css.html +++ /dev/null @@ -1,5 +0,0 @@ -{{ - $spacingCSS := resources.Get "css/spacing.css" - | resources.ExecuteAsTemplate "css/spacing.css" . -}} -{{ return $spacingCSS }} diff --git a/layouts/partials/system_css.html b/layouts/partials/system_css.html index f666221..7e88ce3 100644 --- a/layouts/partials/system_css.html +++ b/layouts/partials/system_css.html @@ -1,6 +1,16 @@ -{{ $spacingCSS := partial "spacing_css.html" . }} -{{ $typographyCSS := partial "typography_css.html" . }} +{{ + $resetCSS := resources.Get "css/reset.css" + | resources.ExecuteAsTemplate "css/reset.css" . +}} +{{ + $spacingCSS := resources.Get "css/spacing.css" + | resources.ExecuteAsTemplate "css/spacing.css" (dict "Page" .) +}} +{{ + $typographyCSS := resources.Get "css/typography.css" + | resources.ExecuteAsTemplate "css/typography.css" (dict "Page" .) +}} -{{ $css := (slice $spacingCSS $typographyCSS) | resources.Concat "css/system.css" }} +{{ $css := (slice $resetCSS $spacingCSS $typographyCSS) | resources.Concat "css/system.css" }} {{ return $css }} diff --git a/layouts/partials/typography_css.html b/layouts/partials/typography_css.html deleted file mode 100644 index 9dd24dc..0000000 --- a/layouts/partials/typography_css.html +++ /dev/null @@ -1,5 +0,0 @@ -{{ - $css := resources.Get "css/typography.css" - | resources.ExecuteAsTemplate "css/spacing.css" . -}} -{{ return $css }}