Skip to content

Commit

Permalink
Merge branch 'main' into build-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
mortendk committed Jan 6, 2023
2 parents b4474ea + 48f73c2 commit 3082f1b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
3 changes: 1 addition & 2 deletions UPGRADE-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Both will be regenered when you `npm install` and `npm start`
/eleventy.config.js
/netlify.toml
/src/system


/src/themes/grunn
/src/themes/nakinn
/src/themes/styleguide
Expand All @@ -25,3 +23,4 @@ Both will be regenered when you `npm install` and `npm start`
## Config
package.json

the package file holds the scripts to build the site.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "saga11",
"version": "0.7.4beta",
"version": "0.7.5beta",
"description": "Website builder based on 11ty & netlifycms",
"main": "eleventy.config.js",
"scripts": {
Expand All @@ -21,7 +21,7 @@
"author": "mortendk",
"license": "MIT",
"devDependencies": {
"@11ty/eleventy": "^2.0.0-canary.23",
"@11ty/eleventy": "^2.0.0-canary.24",
"@11ty/eleventy-fetch": "^3.0.0",
"@11ty/eleventy-img": "^2.0.1",
"@11ty/eleventy-navigation": "^0.3.5",
Expand Down
1 change: 0 additions & 1 deletion src/content/styleguide/index.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
title: Styleguide
permalink: styleguide/index.html

---
<div class="h-full w-full flex flex-col items-center justify-center bg-gradient-to-r from-indigo-500 via-purple-500 to-pink-500">

Expand Down

0 comments on commit 3082f1b

Please sign in to comment.