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

Upgrade Bulma V1.0 #212

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion assets/style.sass
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "bulma/bulma"
@use "bulma/sass/_index"
@import "fresh/core"
21 changes: 1 addition & 20 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,6 @@ module:
imports:
- path: github.com/jgthms/bulma
mounts:
- source: bulma.sass
target: assets/bulma/bulma.sass
- source: bulma-rtl.sass
target: assets/bulma/bulma-rtl.sass
- source: sass
target: assets/bulma/sass
- source: sass/base
target: assets/bulma/sass/base
- source: sass/components
target: assets/bulma/sass/components
- source: sass/elements
target: assets/bulma/sass/elements
- source: sass/form
target: assets/bulma/sass/form
- source: sass/grid
target: assets/bulma/sass/grid
- source: sass/helpers
target: assets/bulma/sass/helpers
- source: sass/layout
target: assets/bulma/sass/layout
- source: sass/utilities
target: assets/bulma/sass/utilities

3 changes: 1 addition & 2 deletions docs/content/deepmodifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ git init
# Add this theme as a git submodule
git submodule add https://github.com/StefMa/hugo-fresh.git themes/hugo-fresh

# Add the dependency to the css files as a git submodule and checkout version 0.9.4
# Add the dependency to the css files as a git submodule
git submodule add https://github.com/jgthms/bulma.git themes/bulma
cd themes/bulma && git checkout 0.9.4

# Go back from themes/bulma dir
cd ../..
Expand Down
2 changes: 1 addition & 1 deletion docs/content/getstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include_footer: false

To create a new site using this theme as hugo module:

Make sure `go` > 1.13 is installed on your system. [Download](https://go.dev/dl/) and install if needed.
Make sure `go` > 1.13 is installed on your system. [Download](https://go.dev/dl/) and install if needed. Dart Sass must also be installed, see details [here](https://gohugo.io/hugo-pipes/transpile-sass-to-css/#dart-sass).

```bash
# Create site and cd into it
Expand Down
4 changes: 2 additions & 2 deletions docs/content/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ sidebarlogo: fresh-white
include_footer: false
---

## Hugo extended
## Dart Sass

If you see `error: failed to transform resource: TOCSS: failed to transform "style.sass"` when attempting to run your `hugo server`, make sure you have the extended version of Hugo installed!
If you see `error: failed to transform resource: TOCSS: failed to transform "style.sass"` when attempting to run your `hugo server`, make sure you have the extended version of Dart Sass installed!
5 changes: 4 additions & 1 deletion docs/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ go 1.15

replace github.com/StefMa/hugo-fresh => ../

require github.com/StefMa/hugo-fresh v1.0.0 // indirect
require (
github.com/StefMa/hugo-fresh v1.1.0 // indirect
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 // indirect
)
2 changes: 2 additions & 0 deletions docs/go.sum
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
github.com/jgthms/bulma v0.0.0-20220508134905-3e00a8e6d0d0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 h1:e/bV4Y7Uy/rDpoiblIjZX5A1S498UsE0tmZjYRdSymw=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
22,719 changes: 22,719 additions & 0 deletions docs/resources/_gen/assets/style.sass_6ce9045686ce2e399fbb6ffd0bd31075.content

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Target":"css/style.css","MediaType":"text/css","Data":{}}
5 changes: 4 additions & 1 deletion exampleSite/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ go 1.12

replace github.com/StefMa/hugo-fresh => ../

require github.com/StefMa/hugo-fresh v1.0.0 // indirect
require (
github.com/StefMa/hugo-fresh v1.1.0 // indirect
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 // indirect
)
2 changes: 2 additions & 0 deletions exampleSite/go.sum
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
github.com/jgthms/bulma v0.0.0-20220508134905-3e00a8e6d0d0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 h1:e/bV4Y7Uy/rDpoiblIjZX5A1S498UsE0tmZjYRdSymw=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/StefMa/hugo-fresh

go 1.12

require github.com/jgthms/bulma v0.0.0-20220508134905-3e00a8e6d0d0 // indirect
require github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 // indirect
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
github.com/jgthms/bulma v0.0.0-20220508134905-3e00a8e6d0d0 h1:d61c8CjPFq6aGikBXMepfewc8/3IbrTCiC1xHcMcvHI=
github.com/jgthms/bulma v0.0.0-20220508134905-3e00a8e6d0d0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0 h1:e/bV4Y7Uy/rDpoiblIjZX5A1S498UsE0tmZjYRdSymw=
github.com/jgthms/bulma v0.0.0-20240727135340-230b21f7fbe0/go.mod h1:89FLBKXYFKfOKAoDeUT26V0pHGwzr205cMXAEqtAVOI=
2 changes: 1 addition & 1 deletion layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
<html lang="{{ .Site.LanguageCode }}" data-theme="light">
<head>
{{ partial "meta.html" . }}
<title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/css.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- $inServerMode := .Site.IsServer }}
{{- $sass := "style.sass" }}
{{- $cssTarget := "css/style.css" }}
{{- $cssOpts := cond ($inServerMode) (dict "targetPath" $cssTarget "enableSourceMap" true) (dict "targetPath" $cssTarget "outputStyle" "compressed") }}
{{- $cssOpts := cond ($inServerMode) (dict "targetPath" $cssTarget "enableSourceMap" true "transpiler" "dartsass") (dict "targetPath" $cssTarget "outputStyle" "compressed" "transpiler" "dartsass") }}
{{- $fontName := .Site.Params.font.name | default "Open Sans" }}
{{- $fontFace := replace $fontName " " "+" }}
{{- $fontSizes := delimit (.Site.Params.font.sizes | default (slice 300 400 600 700)) "," }}
Expand Down
Loading