Skip to content

Commit 29dc735

Browse files
committed
Content cleanup
1 parent a459e99 commit 29dc735

10 files changed

Lines changed: 60 additions & 40 deletions

File tree

content/download/addons.en.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ layout: "addons"
99

1010
There is a [growing list of GRASS addons](/grass-devel/manuals/addons/)
1111
available which are not (yet) part of the core software package.
12-
They can be easily installed.
1312

14-
## Install with the GRASS GUI
13+
## Installation
14+
15+
---
16+
17+
### GRASS GUI (Graphical User Interface)
1518

1619
We recommend to use the [wxGUI](https://grasswiki.osgeo.org/wiki/WxGUI)
1720
[Extension Manager](https://grasswiki.osgeo.org/wiki/WxGUI#Extension_Manager)
@@ -27,11 +30,11 @@ In the main menu:
2730
class="ma0 w-60"
2831
>}}
2932
30-
## Install from the command line
33+
### Command line
3134

3235
g.extension extension=r.fuzzy.system
3336

34-
## Install with Python
37+
### Python
3538

3639
Addons can also be installed from the Python using either the `grass.script`
3740
or `grass.tools` modules. For example, to install the `r.fuzzy.system`
@@ -46,7 +49,7 @@ or with `grass.tools`:
4649
tools = Tools()
4750
tools.g_extension(extension='r.fuzzy.system')
4851

49-
## Install from source
52+
### Source
5053

5154
The Addons source code is also hosted in [GitHub](https://github.com/OSGeo/grass-addons):
5255

content/download/conda.en.md

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,21 @@ _build:
99

1010
## GRASS with conda
1111

12-
{{< support-button style="outline" text="Support Us" >}}
12+
{{< support-button style="outline" text="Support GRASS" >}}
1313

14+
## Installation
15+
16+
---
1417
The `grass` package is available on
1518
[conda-forge](https://anaconda.org/conda-forge/grass)
1619
for **Windows** (64-bit), **Linux** (64-bit), and
1720
**macOS** (Intel and Apple Silicon).
18-
See the
19-
[conda-forge grass feedstock](https://github.com/conda-forge/grass-feedstock)
20-
for packaging details.
2121

22-
### Install with conda
22+
<!-- TODO: Make admonitions once scss is fixed. -->
23+
See the [conda-forge grass feedstock](https://github.com/conda-forge/grass-feedstock)
24+
for packaging details.
2325

24-
Add into an existing environment:
26+
To add GRASS into an existing environment:
2527

2628
```bash
2729
conda install -c conda-forge grass
@@ -63,7 +65,8 @@ conda activate grass
6365

6466
### Install with pixi
6567

66-
For faster dependency across multiple platforms, support for `pyproject.toml` and `environment.yml`, and global installation of tools use [pixi](https://pixi.prefix.dev/):
68+
For faster dependency across multiple platforms, support for `pyproject.toml`
69+
and `environment.yml`, and global installation of tools use [pixi](https://pixi.prefix.dev/):
6770

6871
```bash
6972
# Installing grass as part of a workspace
@@ -74,15 +77,18 @@ pixi add grass
7477
pixi shell
7578
```
7679

77-
If you want to install GRASS as a globally available tool across your system without having to activate an environment:
80+
If you want to install GRASS as a globally available tool across your system
81+
without having to activate an environment:
7882

7983
```bash
8084
pixi global install grass
8185
```
8286

8387
### Environment file with pixi
8488

85-
By default, dependencies for the workspace are stored in the `pixi.toml` file. The `pixi.lock` file is the machine-readable file that lists all of the dependencies for your workspace.
89+
By default, dependencies for the workspace are stored in the `pixi.toml` file.
90+
The `pixi.lock` file is the machine-readable file that lists all of the
91+
dependencies for your workspace.
8692

8793
If you're using pixi and want to share your environment with conda or mamba users:
8894

@@ -118,6 +124,7 @@ grass
118124

119125
## Contribute
120126

121-
Please consider a financial contribution to the GRASS project to help us improve and maintain the software.
127+
Please consider a financial contribution to the GRASS project to help us
128+
improve and maintain the software.
122129

123130
{{< support-button text="Support Us" >}}

content/download/data.en.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ categories: [nl]
77
layout: "data"
88
---
99

10-
11-
#### Quick links
10+
<!-- TODO: Rewrite in pure markdown, remove all the "IGNORE" lines, and remove the "TODO" line. -->
11+
## Quick links
1212

1313
[ [**North Carolina dataset**](#NorthCarolinaDataset) | [**Datasets for special topics**](#SpecialTopicDatasets) | [**Spearfish dataset**](#SpearFishDataset) | [**Global datasets**](#GlobalDatasets) ]
1414

15-
1615
<div class="row">
1716
<div class="col-sm-4">
1817
<div class="alert rounded-0 alert-default row">
@@ -28,7 +27,7 @@ layout: "data"
2827
</div>
2928
</div>
3029

31-
<hr>
30+
---
3231

3332
### <a name="NorthCarolinaDataset"></a> North Carolina dataset
3433

@@ -50,7 +49,7 @@ The North Carolina dataset can be downloaded in two versions:
5049
</li>
5150
</ul>
5251

53-
<hr>
52+
---
5453

5554
### <a name="SpecialTopicDatasets"></a> Datasets for special topics
5655

@@ -96,7 +95,7 @@ The North Carolina dataset can be downloaded in two versions:
9695
</li>
9796
</ul>
9897

99-
<hr>
98+
---
10099

101100
### <a name="SpearFishDataset"></a> Spearfish dataset
102101

@@ -112,7 +111,7 @@ the short <a href="/sampledata/spearDB.pdf">documentation</a> and
112111
</li>
113112
</ul>
114113

115-
<hr>
114+
---
116115

117116
### <a name="GlobalDatasets"></a> Global datasets
118117
Based on the <a href="https://www.naturalearthdata.com/">Natural Earth data collection</a>, a GRASS project with global
@@ -132,8 +131,8 @@ a more comprehensive collection with additional hydrological and ecological data
132131
</li>
133132
</ul>
134133

134+
In the [Global datasets](https://grasswiki.osgeo.org/wiki/Global_datasets) wiki,
135+
the community shares information on other open datasets all over the globe and
136+
how they can be imported into GRASS.
135137

136-
In the [Global datasets](https://grasswiki.osgeo.org/wiki/Global_datasets) wiki, the community shares information on other open datasets
137-
all over the globe and how they can be imported into GRASS.
138-
139-
<hr>
138+
---

content/download/docker.en.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ _build:
66
list: never
77
---
88

9-
## GRASS Docker images
9+
## Docker Images
1010

11-
{{< support-button style="outline" text="Support Us" >}}
11+
{{< support-button style="outline" text="Support GRASS" >}}
1212

13+
## Installation
14+
15+
---
1316
Official GRASS Docker images are available on
1417
[Docker Hub (osgeo/grass-gis)](https://hub.docker.com/r/osgeo/grass-gis/).
1518
For a list of GRASS versions, see the
1619
[docker tag list](https://hub.docker.com/r/osgeo/grass-gis/tags).
1720

18-
## Installation
21+
## Stable images
1922

2023
The following Docker images are generated from the current stable
21-
<b>GRASS releasebranch {{< grassVersion version="current" type="short" >}}</b>:
24+
**GRASS releasebranch {{< grassVersion version="current" type="short" >}}**:
2225

2326
{{< installers os="docker" >}}
2427

@@ -36,6 +39,7 @@ Please refer to the
3639

3740
## Contribute
3841

39-
Please consider a financial contribution to the GRASS project to help us improve and maintain the software.
42+
Please consider a financial contribution to the GRASS project to help us improve
43+
and maintain the software.
4044

4145
{{< support-button text="Support Us" >}}

content/download/linux.en.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ _build:
66
list: never
77
---
88

9-
## Download GRASS for Linux
9+
## GRASS for Linux
1010

1111
{{< support-button style="outline" text="Support Us" >}}
1212

1313
## Installation
1414

15+
---
1516
Install the `grass` package on your Linux distribution. Have a look at
1617
[Repology](https://repology.org/project/grass-gis/versions) for an extended
1718
list of GRASS packages or directly check the

content/download/mac.en.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Find GRASS binary installers for current, legacy, and preview releases on
1515

1616
## Installation
1717

18+
---
19+
1820
{{< installers os="mac" >}}
1921

2022
See this brief

content/download/source.en.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ _build:
88

99
## Source Code
1010

11+
{{< support-button style="outline" text="Support GRASS" >}}
12+
13+
## Compile and install
14+
15+
---
1116
Source code is available on
1217
[GitHub](https://github.com/OSGeo/grass/). You can download the latest release
1318
at
1419
[https://github.com/OSGeo/grass/releases](https://github.com/OSGeo/grass/releases).
1520

16-
## Compile and install
17-
1821
To compile and install GRASS from source, follow these steps from the
1922
[GRASS wiki](https://grasswiki.osgeo.org/wiki/Compile_and_Install).
2023

content/download/windows.en.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ available for Windows (64-bit) from conda-forge — see the **Conda** tab.
1515

1616
## Installation
1717

18+
---
19+
1820
### OSGeo4W {#osgeo4w}
1921

2022
OSGeo4W is an installer for a broad set of open source geospatial software

themes/grass/assets/sass/_styles.scss

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ main {
2626
p,
2727
.paragraph {
2828
color: $gs-black-color;
29-
font-size: 1rem;
30-
line-height: 1.8;
3129
font-family: $gs-grass-font;
3230
}
3331

@@ -1984,7 +1982,7 @@ html {
19841982
/* White text color */
19851983
align-items: center;
19861984
gap: 0.5rem;
1987-
margin: 0.2rem;
1985+
margin: 0rem 0rem 1rem 0rem;
19881986
display: inline-flex;
19891987
}
19901988

@@ -2003,7 +2001,7 @@ html {
20032001
color: $gs-white-color;
20042002
align-items: center;
20052003
gap: 0.5rem;
2006-
margin: 0.2rem;
2004+
margin: 0rem 0rem 1rem 0rem;
20072005
display: inline-flex;
20082006
}
20092007

@@ -2023,7 +2021,7 @@ html {
20232021
/* Larger font size */
20242022
color: $gs-support-color;
20252023
/* White text color */
2026-
margin: 0.2rem;
2024+
margin: 0rem 0rem 1rem 0.5rem;
20272025
align-items: center;
20282026
gap: 0.5rem;
20292027
display: inline-flex;
@@ -2047,7 +2045,7 @@ html {
20472045
align-items: center;
20482046
text-align: center;
20492047
gap: 0.5rem;
2050-
margin: 0.2rem;
2048+
margin: 0rem 0rem 0.2rem 0rem;
20512049
overflow: hidden;
20522050
text-overflow: ellipsis;
20532051
width: inherit;

themes/grass/layouts/partials/grass-download.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</div>
2525
{{ else }}
2626
<a href="{{ .url }}"
27+
type="button"
2728
class="btn btn-download"
2829
target="_blank" rel="noopener"><i class="fa-solid fa-download"></i> Download GRASS ( {{ .version }} )</a>
2930
{{ end }}

0 commit comments

Comments
 (0)