Browse Source

Merge branch 'master' into next

index-subcmd
Vincent Prouillet GitHub 6 years ago
parent
commit
c05f7c8362
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 6 deletions
  1. +1
    -0
      EXAMPLES.md
  2. +1
    -1
      docs/content/documentation/content/image-processing/index.md
  3. +1
    -1
      docs/content/documentation/getting-started/cli-usage.md
  4. +2
    -1
      docs/content/documentation/getting-started/installation.md
  5. +0
    -2
      docs/content/documentation/templates/rss.md
  6. +3
    -1
      docs/content/documentation/themes/installing-and-using-themes.md
  7. +2
    -0
      docs/content/documentation/themes/overview.md

+ 1
- 0
EXAMPLES.md View File

@@ -17,3 +17,4 @@
| [Axiomatic Semantics](https://axiomatic.neophilus.net) | https://github.com/Libbum/AxiomaticSemantics | | [Axiomatic Semantics](https://axiomatic.neophilus.net) | https://github.com/Libbum/AxiomaticSemantics |
| [Tinkering](https://tinkering.xyz) | | | [Tinkering](https://tinkering.xyz) | |
| [Daniel Sockwell's codesections.com](https://www.codesections.com) | https://gitlab.com/codesections/codesections-website | | [Daniel Sockwell's codesections.com](https://www.codesections.com) | https://gitlab.com/codesections/codesections-website |
| [Jens Getreu's blog](https://blog.getreu.net) | |

+ 1
- 1
docs/content/documentation/content/image-processing/index.md View File

@@ -3,7 +3,7 @@ title = "Image processing"
weight = 120 weight = 120
+++ +++


Gutengerb provides support for automatic image resizing through the built-in function `resize_image`,
Gutenberg provides support for automatic image resizing through the built-in function `resize_image`,
which is available in template code as well as in shortcodes. which is available in template code as well as in shortcodes.


The function usage is as follows: The function usage is as follows:


+ 1
- 1
docs/content/documentation/getting-started/cli-usage.md View File

@@ -36,7 +36,7 @@ $ zola build --base-url $DEPLOY_URL
This is useful for example when you want to deploy previews of a site to a dynamic URL, such as Netlify This is useful for example when you want to deploy previews of a site to a dynamic URL, such as Netlify
deploy previews. deploy previews.


+You can override the default output directory 'public' by passing a other value to the `output-dir` flag.
You can override the default output directory 'public' by passing a other value to the `output-dir` flag.


```bash ```bash
$ zola build --output-dir $DOCUMENT_ROOT $ zola build --output-dir $DOCUMENT_ROOT


+ 2
- 1
docs/content/documentation/getting-started/installation.md View File

@@ -6,7 +6,8 @@ weight = 1
Zola provides pre-built binaries for MacOS, Linux and Windows on the Zola provides pre-built binaries for MacOS, Linux and Windows on the
[GitHub release page](https://github.com/getzola/zola/releases). [GitHub release page](https://github.com/getzola/zola/releases).


## Mac OS

## macOS


Zola is available on [Brew](https://brew.sh): Zola is available on [Brew](https://brew.sh):




+ 0
- 2
docs/content/documentation/templates/rss.md View File

@@ -7,8 +7,6 @@ If the site `config.toml` file sets `generate_rss = true`, then Zola will
generate an `rss.xml` page for the site, which will live at `base_url/rss.xml`. To generate an `rss.xml` page for the site, which will live at `base_url/rss.xml`. To
generate the `rss.xml` page, Zola will look for a `rss.xml` file in the `templates` generate the `rss.xml` page, Zola will look for a `rss.xml` file in the `templates`
directory or, if one does not exist, will use the use the built-in rss template. directory or, if one does not exist, will use the use the built-in rss template.
Currently it is only possible to have one RSS feed for the whole site; you cannot
create a RSS feed per section or taxonomy.


**Only pages with a date and that are not draft will be available.** **Only pages with a date and that are not draft will be available.**




+ 3
- 1
docs/content/documentation/themes/installing-and-using-themes.md View File

@@ -18,6 +18,8 @@ Cloning the repository using Git or another VCS will allow you to easily
update it but you can also simply download the files manually and paste update it but you can also simply download the files manually and paste
them in a folder. them in a folder.


You can find a list of themes [on this very website](./themes/_index.md).

## Using a theme ## Using a theme


Now that you have the theme in your `themes` directory, you only need to tell Now that you have the theme in your `themes` directory, you only need to tell
@@ -38,7 +40,7 @@ templates/macros.html -> replace themes/simple-blog/templates/macros.html
static/js/site.js -> replace themes/simple-blog/static/js/site.js static/js/site.js -> replace themes/simple-blog/static/js/site.js
``` ```


You can also choose to only parts of a page if a theme define some blocks by extending it. If we wanted
You can also choose to only override parts of a page if a theme define some blocks by extending it. If we wanted
to only change a single block from the `post.html` page in the example above, we could do the following: to only change a single block from the `post.html` page in the example above, we could do the following:


``` ```


+ 2
- 0
docs/content/documentation/themes/overview.md View File

@@ -8,3 +8,5 @@ but still easy to update if needed.


All themes can use the full power of Zola, from shortcodes to Sass compilation. All themes can use the full power of Zola, from shortcodes to Sass compilation.


A list of themes is available [on this very website](./themes/_index.md).


Loading…
Cancel
Save