Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily remove Hugo Pipes Sass conversion #10373

Merged
merged 5 commits into from
Oct 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ production-build: build check-headers-file ## Build the production site and ensu
non-production-build: ## Build the non-production site, which adds noindex headers to prevent indexing
hugo --enableGitInfo

sass-build:
scripts/sass.sh build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit: HUGO_VERSION is set in Makefile and netlify.toml. Is there a better place to set this variable that all scripts/configuration can use?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately there really isn't a way around that AFAIK. Netlify needs to have that information in the config and the Makefile needs it for people to be able to easily build the Docker image. Ideally the Dockerfile could extract that information from the Netlify config but I'm not sure there's a way to do that that doesn't add a lot of complexity.


sass-develop:
scripts/sass.sh develop

serve: ## Boot the development server.
hugo server --ignoreCache --disableFastRender

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/contribute/intermediate.md
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ Slack channel or the
If you aren't ready to create a pull request but you want to see what your
changes look like, you can use the `hugo` command to stage the changes locally.

1. Install Hugo version `0.40.3` or later.
1. Install Hugo version {{< hugoVersion >}} or later.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice update! ✨


2. In a terminal, go to the root directory of your clone of the Kubernetes
docs, and enter this command:
Expand Down
19 changes: 4 additions & 15 deletions layouts/partials/css.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
{{- $mainSass := "sass/styles.sass" }}
{{- $caseStudySass := "sass/case_study_styles.sass" }}
<link rel="stylesheet" href="/css/base_fonts.css">
{{- if .Site.IsServer }}
{{- $mainCssOpts := (dict "targetPath" "css/styles.css") }}
{{- $mainCss := resources.Get $mainSass | toCSS $mainCssOpts }}
<link rel="stylesheet" media="screen" href="{{ $mainCss.RelPermalink }}"><!-- default styles.css on -->
{{- 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 }}
<link rel="stylesheet" href="/css/styles.css">
{{- if .Params.case_study_styles }}
{{- $caseStudyCssOpts := (dict "targetPath" "css/styles.css") }}
{{- $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="stylsheet" href="/css/case-study-styles.css">
{{- end }}
<link rel="stylesheet" href="{{ "css/jquery-ui.min.css" | relURL }}">
<link rel="stylesheet" href="{{ "css/sweetalert.min.css" | relURL }}">
Expand All @@ -26,7 +14,8 @@
<link rel="stylesheet" href="{{ "css/gridpage.css" | relURL }}">
{{- end }}
{{- with .Params.css }}
{{- range (split . ",") }}
{{- $extraCss := split . "," }}
{{- range $extraCss }}
{{- $url := trim . " " | relURL }}
<link rel="stylesheet" href="{{ $url }}"><!-- custom css added -->
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions layouts/shortcodes/hugoVersion.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ getenv "HUGO_VERSION" }}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

File renamed without changes.
Loading