Skip to content

Commit 7a35275

Browse files
jstriebelnormanrz
andauthored
Rebranding Docs (#852)
* adaptions for rebranding * cofnig * remove extra.css config * webKnossos -> WEBKNOSSOS * new favicon * more renames Co-authored-by: Norman Rzepka <[email protected]>
1 parent 6970850 commit 7a35275

38 files changed

+107
-120
lines changed

CONTRIBUTING.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Contributing Guide
22

3-
**Welcome to the webKnossos-libs contributing guide :sparkles: **
3+
**Welcome to the WEBKNOSSOS-libs contributing guide :sparkles: **
44

5-
Thank you for taking the time to contribute to this project! The following is a set of guidelines for contributing to the different webKnossos related Python libraries, which are part of the [webKnossos-libs repository on GitHub](https://github.com/scalableminds/webknossos-libs). These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
5+
Thank you for taking the time to contribute to this project! The following is a set of guidelines for contributing to the different WEBKNOSSOS related Python libraries, which are part of the [WEBKNOSSOS-libs repository on GitHub](https://github.com/scalableminds/webknossos-libs). These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
66

77
## Code of Conduct
88

9-
webKnossos-libs and everyone contributing and collaborating on this project is expected to follow the [webKnossos-libs Code of Conduct](CODE_OF_CONDUCT.md). Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
9+
WEBKNOSSOS-libs and everyone contributing and collaborating on this project is expected to follow the [WEBKNOSSOS-libs Code of Conduct](CODE_OF_CONDUCT.md). Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
1010

1111

1212
## How can I help?
@@ -20,20 +20,20 @@ We welcome community feedback and contributions! We are happy to have
2020

2121
## Feedback, Observations and Questions
2222

23-
We'd love to hear your feedback on the webKnossos Python libraries!
23+
We'd love to hear your feedback on the WEBKNOSSOS Python libraries!
2424
We're also interested in hearing if these tools don't work for your usecase,
2525
or if you have questions regarding their usage.
2626

2727
Please leave a message on the [image.sc forum](https://forum.image.sc/tag/webknossos)
2828
using the `webknossos` tag to enable public communication on those topics.
29-
If you prefer to share information only with the webKnossos team, please write an email
29+
If you prefer to share information only with the WEBKNOSSOS team, please write an email
3030
to [[email protected]](mailto:[email protected]). For commercial support please
3131
reach out to [scalable minds](https://scalableminds.com).
3232

3333

3434
## Issues: Feature Suggestions and Bug Reports
3535

36-
We track feature requests and bug reports in the [webKnossos-libs repository issues](https://github.com/scalableminds/webknossos-libs/issues).
36+
We track feature requests and bug reports in the [WEBKNOSSOS-libs repository issues](https://github.com/scalableminds/webknossos-libs/issues).
3737
Before opening a new issue, please do a quick search of existing issues to make sure your suggestion hasn’t already been added.
3838
If your issue doesn’t already exist, and you’re ready to create a new one, make sure to state what you would like to implement, improve or bugfix.
3939
Please use one of the provided templates to make this process easier for you.
@@ -54,8 +54,8 @@ that you use the API as intended. If that's the case, please
5454

5555
If you are missing a feature to support your use-case, please consider the following points:
5656

57-
1. Please verify if this feature is directly related to webKnossos.
58-
Does it belong into the webKnossos Python libraries?
57+
1. Please verify if this feature is directly related to WEBKNOSSOS.
58+
Does it belong into the WEBKNOSSOS Python libraries?
5959
2. Double-check if an issue for this feature exists already. If there is one with a very similar scope,
6060
please considering commenting there.
6161
3. If possible, consider how the implementation might look like (e.g. how would the public API change),
@@ -88,13 +88,13 @@ Please include the following in your pull request:
8888
* Adapt or add the documentation.
8989
* Consider enhancing the examples.
9090

91-
The specific coding styles, test frameworks and documentation setup of webKnossos-libs are described
91+
The specific coding styles, test frameworks and documentation setup of WEBKNOSSOS-libs are described
9292
in the following sections:
9393

9494

9595
### Development
9696

97-
The [webknossos-libs repository](https://github.com/scalableminds/webknossos-libs) is structured as a mono-repo, containing multiple packages:
97+
The [WEBKNOSSOS-libs repository](https://github.com/scalableminds/webknossos-libs) is structured as a mono-repo, containing multiple packages:
9898

9999
* `cluster_tools`
100100
* `webknossos`
@@ -136,10 +136,10 @@ Internal workflows for scalable minds:
136136

137137
The `webknossos` folder contains examples, which are not part of the package, but are tested via `tests/test_examples.py` and added to the documentation (see `docs/src/webknossos-py/examples`).
138138

139-
The tests also contain functionality for the webKnossos client. There a two modes to run the tests:
139+
The tests also contain functionality for the WEBKNOSSOS client. There a two modes to run the tests:
140140

141-
1. `./test.sh --refresh-snapshots`, sending network requests to a webKnossos instance:
142-
This expects a local webKnossos setup with specific test data, which is shipped with webKnossos. If you're starting and running webKnossos manually, please use port 9000 (the default) and run the `tools/postgres/prepareTestDb.sh` script in the webKnossos repository (⚠️ this overwrites your local webKnossos database). Alternatively, a docker-compose setup is started automatically for the tests, see `./test.sh` and `tests/docker-compose.yml` for details. The network requests & response are recorded as "cassettes" by [vcr.py](https://vcrpy.readthedocs.io), see next point:
141+
1. `./test.sh --refresh-snapshots`, sending network requests to a WEBKNOSSOS instance:
142+
This expects a local WEBKNOSSOS setup with specific test data, which is shipped with WEBKNOSSOS. If you're starting and running WEBKNOSSOS manually, please use port 9000 (the default) and run the `tools/postgres/prepareTestDb.sh` script in the WEBKNOSSOS repository (⚠️ this overwrites your local WEBKNOSSOS database). Alternatively, a docker-compose setup is started automatically for the tests, see `./test.sh` and `tests/docker-compose.yml` for details. The network requests & response are recorded as "cassettes" by [vcr.py](https://vcrpy.readthedocs.io), see next point:
143143
2. `./test.sh` replays responses from previous network snapshots using [vcr.py](https://vcrpy.readthedocs.io) via [pytest-recording](https://github.com/kiwicom/pytest-recording). No additional network requests are allowed in this mode.
144144

145145
`./test.sh --store-durations` updates the durations for
@@ -171,15 +171,15 @@ For testing the `kubernetes` setup, we recommend a [Kubernetes-in-Docker setup](
171171

172172
### Documentation
173173

174-
We render a common documentation for webKnossos itself and webknossos-libs from this repository using [mkdocs](https://www.mkdocs.org/). Source-files for the documentation are stored at `docs/src`:
174+
We render a common documentation for WEBKNOSSOS itself and WEBKNOSSOS-libs from this repository using [mkdocs](https://www.mkdocs.org/). Source-files for the documentation are stored at `docs/src`:
175175

176176
* `docs/src/webknossos`: Server & Website documentation, linked from the [webknossos repository](https://github.com/scalableminds/webknossos) (must be available under `docs/wk-repo`, see below).
177177
* `docs/src/api`: Generated using [pdoc](https://pdoc.dev) from Python docstrings.
178178
* `docs/src/webknossos-py` & `docs/src/wkcuber`: Documentation for the respective Python Packages
179179

180180
The structure of the documentation page is given by `docs/mkdocs.yml`.
181181

182-
To generate the documentation locally, clone or link the webKnossos repository to `docs/wk-repo` first and then start the documentation server
182+
To generate the documentation locally, clone or link the WEBKNOSSOS repository to `docs/wk-repo` first and then start the documentation server
183183
```shell
184184
git clone --depth 1 [email protected]:scalableminds/webknossos.git docs/wk-repo
185185
docs/generate.sh

docs/md_extensions/mdlightbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self, md, group = True):
4545
def run(self, root):
4646
parent_map = {c:p for p in root.iter() for c in p}
4747
i = 0
48-
images = root.getiterator("img")
48+
images = root.iter("img")
4949
for image in images:
5050
desc = image.attrib["alt"]
5151
h = self.hidden_re.match(desc)

docs/mkdocs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
site_name: webKnossos Documentation
1+
site_name: WEBKNOSSOS Documentation
22
docs_dir: src
33
site_dir: out
44
site_url: https://docs.webknossos.org/
@@ -10,8 +10,8 @@ edit_uri: ""
1010
theme:
1111
name: material
1212
custom_dir: overrides
13-
favicon: https://static.webknossos.org/assets/favicon-docs.png
14-
logo: https://static.webknossos.org/assets/icon-white.png
13+
favicon: https://static.webknossos.org/assets/favicon-docs2.png
14+
logo: https://static.webknossos.org/assets/icon-only-white.svg
1515
icon:
1616
repo: fontawesome/brands/github
1717
font: false
@@ -35,7 +35,7 @@ theme:
3535
- navigation.top
3636

3737
nav:
38-
- webKnossos:
38+
- WEBKNOSSOS:
3939
- webknossos/index.md
4040
- webknossos/getting_started.md
4141
- Guides:
@@ -126,7 +126,7 @@ nav:
126126
- Commercial Support: https://scalableminds.com" target="_blank
127127
- GitHub: https://github.com/scalableminds/webknossos-libs/tree/master/webknossos" target="_blank
128128
- Blog: https://medium.com/scalableminds" target="_blank
129-
- webKnossos Cuber:
129+
- WEBKNOSSOS Cuber:
130130
- wkcuber CLI: wkcuber/index.md
131131
- wkcuber/changelog.md
132132
- Getting Help:

docs/overrides/main.html

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,28 @@
1010
<link rel="stylesheet" href="{{ base_url }}/css/lists.css">
1111
<style type="text/css">
1212
@font-face {
13-
font-family: "Titillium Web";
14-
src: local("Titillium Web"), url("https://static.webknossos.org/assets/fonts/titilliumweb-300.woff2") format("woff2"),
15-
url("https://static.webknossos.org/assets/fonts/titilliumweb-300.woff") format("woff");
16-
font-weight: 300;
17-
font-style: normal;
18-
}@font-face {
19-
font-family: "Titillium Web";
20-
src: local("Titillium Web"), url("https://static.webknossos.org/assets/fonts/titilliumweb-400.woff2") format("woff2"),
21-
url("https://static.webknossos.org/assets/fonts/titilliumweb-400.woff") format("woff");
22-
font-weight: 400;
13+
font-family: "Nunito";
14+
src: local("Nunito"), url("https://static.webknossos.org/assets/fonts/Nunito-VariableFont_wght.ttf") format("truetype") tech(variations);
2315
font-style: normal;
2416
}
2517
@font-face {
26-
font-family: "Titillium Web";
27-
src: local("Titillium Web"), url("https://static.webknossos.org/assets/fonts/titilliumweb-400i.woff2") format("woff2"),
28-
url("https://static.webknossos.org/assets/fonts/titilliumweb-400i.woff") format("woff");
29-
font-weight: 400;
18+
font-family: "Nunito";
19+
src: local("Nunito"), url("https://static.webknossos.org/assets/fonts/Nunito-Italic-VariableFont_wght.ttf") format("truetype") tech(variations);
3020
font-style: italic;
3121
}
3222
@font-face {
33-
font-family: "Titillium Web";
34-
src: local("Titillium Web"), url("https://static.webknossos.org/assets/fonts/titilliumweb-700.woff2") format("woff2"),
35-
url("https://static.webknossos.org/assets/fonts/titilliumweb-700.woff") format("woff");
36-
font-weight: 700;
37-
font-style: normal;
38-
} @font-face {
3923
font-family: "Roboto Mono";
4024
src: local("Roboto Mono"), url("https://static.webknossos.org/assets/fonts/robotomono-400.woff2") format("woff2"),
4125
url("https://static.webknossos.org/assets/fonts/robotomono-400.woff") format("woff");
4226
font-weight: 400;
4327
font-style: normal;
4428
}
4529
:root {
46-
--md-text-font: "Titillium Web";
30+
--md-text-font: "Nunito";
4731
--md-code-font: "Roboto Mono";
32+
--md-primary-fg-color: #5660ff;
33+
--md-primary-fg-color--light: #AABAFF;
34+
--md-primary-fg-color--dark: #59F8E8;
4835
}
4936
.pdoc .attr {
5037
font-family: var(--md-code-font);

docs/overrides/partials/nav.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565

6666
{% if not rendered_toc %}
6767
<li class="{{ class }}">
68-
<nav class="md-nav md-nav--secondary" aria-label="webKnossos Documentation">
68+
<nav class="md-nav md-nav--secondary" aria-label="WEBKNOSSOS Documentation">
6969
<label class="md-nav__title" for="__toc">
7070
<span class="md-nav__icon md-icon"></span>
71-
webKnossos Documentation
71+
WEBKNOSSOS Documentation
7272
</label>
7373
<ul class="md-nav__list" data-md-component="toc">
7474
<li class="md-nav__item">
7575
<a href="{{ base_url }}/webknossos/" class="md-nav__link">
76-
webKnossos
76+
WEBKNOSSOS
7777
</a>
7878
</li>
7979
<li class="md-nav__item">

docs/poetry.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/src/webknossos-py/examples/apply_merger_mode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This example applies a merger mode annotation to a segmentation.
44

55
It downloads a [sample dataset](https://webknossos.org/datasets/scalable_minds/l4_sample_dev/view) with a [sample annotation](https://webknossos.org/annotations/Explorational/6204d2cd010000db0003db91).
66
The annotation has been created with "merger mode", where skeleton trees are used to merge segments.
7-
Read more about the [merger mode in the webKnossos documentation](/webknossos/volume_annotation.html#proof-reading-and-merging-segments).
7+
Read more about the [merger mode in the WEBKNOSSOS documentation](/webknossos/volume_annotation.html#proof-reading-and-merging-segments).
88
The example then uses the [Dataset API](dataset_usage.md) and [fastremap module](https://github.com/seung-lab/fastremap) for reading, remapping and rewriting the `segmentation` layer.
99

1010
_This example additionally needs the fastremap package._

docs/src/webknossos-py/examples/download_segments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Download segment masks
22

3-
This example [accesses a volume annotation on webKnososs](../../api/webknossos/annotation/annotation.md#Annotation.open_as_remote_dataset) and creates segment masks from selected segments. The segment masks are stored as tiff sequences. The segments have been selected from the "Segments" tab in webKnossos. The [BufferedSliceReader](../../api/webknossos/dataset/view.md#View.get_buffered_slice_reader) is used to efficiently request sections from the remote segmentation data.
3+
This example [accesses a volume annotation on webKnososs](../../api/webknossos/annotation/annotation.md#Annotation.open_as_remote_dataset) and creates segment masks from selected segments. The segment masks are stored as tiff sequences. The segments have been selected from the "Segments" tab in WEBKNOSSOS. The [BufferedSliceReader](../../api/webknossos/dataset/view.md#View.get_buffered_slice_reader) is used to efficiently request sections from the remote segmentation data.
44

55
```python
66
--8<--

docs/src/webknossos-py/examples/upload_image_data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ webknossos/examples/upload_image_data.py
88
--8<--
99
```
1010

11-
![Cell Dataset uploaded to webKnossos](./upload_image_data_dataset.jpg)
11+
![Cell Dataset uploaded to WEBKNOSSOS](./upload_image_data_dataset.jpg)

docs/src/webknossos-py/examples/upload_tiff_stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Upload tiff stack
22

3-
This example shows how to [create a new dataset from a tiff sequence](../../api/webknossos/dataset/dataset.md#Dataset.from_images), [compress](../../api/webknossos/dataset/dataset.md#Dataset.compress) it, [downsample](../../api/webknossos/dataset/dataset.md#Dataset.downsample) it and [upload](../../api/webknossos/dataset/dataset.md#Dataset.upload) it to webKnossos.
3+
This example shows how to [create a new dataset from a tiff sequence](../../api/webknossos/dataset/dataset.md#Dataset.from_images), [compress](../../api/webknossos/dataset/dataset.md#Dataset.compress) it, [downsample](../../api/webknossos/dataset/dataset.md#Dataset.downsample) it and [upload](../../api/webknossos/dataset/dataset.md#Dataset.upload) it to WEBKNOSSOS.
44

55
```python
66
--8<--

0 commit comments

Comments
 (0)