Skip to content

Commit

Permalink
Merge branch 'develop' into l10n_develop
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeDoctorDE committed May 19, 2024
2 parents 756826b + f5815e1 commit d3eb7bc
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
| 1.1.2 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.1.2) |
| 1.0.0 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.0.0) |

Older versions can be found [here](https://butterfly.linwood.dev/pre-1-0).
Older versions can be found [here](https://butterfly.linwood.dev/community/pre-1-0).

## Reporting a Vulnerability

Expand Down
2 changes: 1 addition & 1 deletion docs/src/content/docs/community/pre-1-0.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: "Pre-1.0 versions"
---

These versions are not supported anymore.
New versions are available at [versions](versions.md).
New versions are available at [versions](/community/versions).

| Version | Supported | |
| ------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/add.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Supported are butterfly documents, markdown, png, svg and pdf.
## Tools

To add more tools to your toolbar, click on them.
Read more about them [here](tools).
Read more about them [here](../tools).

## Surfaces

Expand Down
6 changes: 3 additions & 3 deletions docs/src/content/docs/docs/v2/areas.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {Monitor} from "@phosphor-icons/react";

![Area](area.png)

Areas are a way to restrict the size of the canvas. You can create areas by using the [area tool](tools/area). If you click on the background you can open the area list dialog using the context menu.
Areas are a way to restrict the size of the canvas. You can create areas by using the [area tool](../tools/area). If you click on the background you can open the area list dialog using the context menu.

## Creating and deleting areas

While you can directly edit the content on the canvas, it is common that you would like to restrict the region in which you can modify the content, or that you would like ot be able to be able to quickly access a part of the document. For that, you have the <Monitor className="inline-icon"/> Area tool. As explained in the [introduction section](./), you might need to add the <Monitor className="inline-icon"/> area button to your toolbar. Using the [area tool](tools/area), you can draw rectangle anywhere on the canvas to then define the area.
While you can directly edit the content on the canvas, it is common that you would like to restrict the region in which you can modify the content, or that you would like ot be able to be able to quickly access a part of the document. For that, you have the <Monitor className="inline-icon"/> Area tool. As explained in the [introduction section](../), you might need to add the <Monitor className="inline-icon"/> area button to your toolbar. Using the [area tool](../tools/area), you can draw rectangle anywhere on the canvas to then define the area.

## More control

Expand All @@ -26,7 +26,7 @@ You can further define area tool by clicking again on the <Monitor className="in
* `Enter the area` - Allowing you to edit content only borded by this area.
* `Delete` - Delete the area. This *does not* delete the content within this area
* `Export` - Export the content of the selected area.
* `Add to pack` - Add the area to a [pack](pack)
* `Add to pack` - Add the area to a [pack](../pack)

## Another option

Expand Down
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/layers.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Layers
---

Layers are an option to group elements together. Click on the element to see and change the layer. Use the [layer tool](tools/layer.md) to change the layers of multiple elements.
Layers are an option to group elements together. Click on the element to see and change the layer. Use the [layer tool](../tools/layer) to change the layers of multiple elements.

## The layers dialog

Expand Down
11 changes: 4 additions & 7 deletions docs/src/content/docs/docs/v2/shortcuts.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ Some of them are written below the buttons.
## Pen

By default, the the pen is configured to function as the following:
* `Pen`: configured as pen.
* `First` (Primary button, if supported): Change to hand tool while pressed.
* `Second` (Secondary button, if supported): Change to second tool (see [configure](#configure) section below) while pressed.


* `Pen`: configured as pen.
* `First` (Primary button, if supported): Change to hand tool while pressed.
* `Second` (Secondary button, if supported): Change to second tool (see [configure](#configure) section below) while pressed.

## Configure {#configure}

Expand All @@ -54,6 +53,4 @@ The configure options you have are the following:

* Empty - the tool is unchaged.
* 0 - the tool will function as moving (i.e., hand) in this mod.
* Positive number - The tool will follow the indexing as explain above.


* Positive number - The tool will follow the indexing as explain above.
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/tools/redo.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ You can't select it and it will run the action if you click on it.
:::

When clicking on this tool you can redo your last action.
See the [undo tool](undo) for undoing your last action.
See the [undo tool](../undo) for undoing your last action.
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/tools/stamp.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Stamp tool
---

The stamp tool allows you to add components to your canvas.
Use an existing pack, create your own or import a pack to use it. Read more [here](../pack).
Use an existing pack, create your own or import a pack to use it. Read more [here](../../pack).

## Configuration

Expand Down
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/tools/texture.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ The texture tool allows you to add the background to a small area of the canvas.

Valid types for texture are:

* [Pattern](../background#pattern)
* [Pattern](../../background#pattern)
2 changes: 1 addition & 1 deletion docs/src/content/docs/docs/v2/tools/undo.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ You can't select it and it will run the action if you click on it.
:::

When clicking on this tool you can undo your last action.
See the [redo tool](redo) for redoing your last action.
See the [redo tool](../redo) for redoing your last action.

0 comments on commit d3eb7bc

Please sign in to comment.