Skip to content

Commit

Permalink
Merge branch 'main' into deployment-updates
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/mastering-plone-5/buildout_1.md
#	docs/mastering-plone-5/deployment_sites.md
#	docs/mastering-plone-5/installation.md
#	docs/mastering-plone-5/restapi.md
  • Loading branch information
stevepiercy committed Dec 1, 2024
2 parents 017cc82 + 402ca67 commit bda8c38
Show file tree
Hide file tree
Showing 89 changed files with 16 additions and 15,000 deletions.
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"[markdown]": {
"editor.formatOnSave": false
}
}
16 changes: 9 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# Makefile for Sphinx documentation
#
.DEFAULT_GOAL = help
SHELL = bash

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXOPTS ?=
VALEOPTS ?=

SPHINXBUILD = "$(realpath venv/bin/sphinx-build)"
SPHINXAUTOBUILD = "$(realpath venv/bin/sphinx-autobuild)"
PAPER =
DOCS_DIR = ./docs/
BUILDDIR = ../_build
PAPER =
DOCS_DIR = ./docs/
BUILDDIR = ../_build

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
Expand All @@ -16,7 +19,6 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
VALEFILES := $(shell find $(DOCS_DIR) -type f -name "*.md" -print)
VALEOPTS ?=

# Add the following 'help' target to your Makefile
# And add help text after each target name starting with '\#\#'
Expand Down Expand Up @@ -48,7 +50,7 @@ html: venv/bin/python ## Build html

.PHONY: livehtml
livehtml: venv/bin/python ## Rebuild Sphinx documentation on changes, with live-reload in the browser
cd "$(DOCS_DIR)" && $(SPHINXAUTOBUILD) \
cd "$(DOCS_DIR)" && ${SPHINXAUTOBUILD} \
--ignore "*.swp" \
-b html . "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)

Expand Down
3 changes: 1 addition & 2 deletions docs/customizing-volto-light-theme/installing-vlt.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ myst:
"keywords": "Plone, Volto, Training, Volto Light Theme"
---


# Installing Volto Light Theme

Follow the steps below to install and configure VLT in your project. VLT provides a clean and modern design with ready-to-use blocks and components.
Expand All @@ -21,7 +20,7 @@ For now we'll be using an `alpha` release, so we need to specify the correct ver
```

```shell
pnpm install @kitconcept/[email protected].1
pnpm install @kitconcept/[email protected].2
```

While in your project package folder, add VLT to the `addons` list in your {file}`package.json`, as follows:
Expand Down
6 changes: 0 additions & 6 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ A collection of trainings developed and created by the Plone community.
:hidden: true
mastering-plone/index
mastering-plone-5/index
volto-customization/index
customizing-volto-light-theme/index
voltohandson/index
Expand Down Expand Up @@ -47,11 +46,6 @@ teaching/index

: Best practices of Plone development for both the backend and frontend.

{ref}`mastering-plone5-label`

: Mastering Plone 5 development training is the predecessor of the Plone 6 version.
It includes also Plone Classic UI topics including viewlets, views, portlets, and other customizations.

{doc}`testing/index`

: Best practices for testing Plone add-ons.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
139 changes: 0 additions & 139 deletions docs/mastering-plone-5/about_mastering.md

This file was deleted.

Loading

0 comments on commit bda8c38

Please sign in to comment.