Skip to content

Commit fa08a96

Browse files
committed
Refactor installation page templates
1 parent c077d03 commit fa08a96

File tree

11 files changed

+227
-320
lines changed

11 files changed

+227
-320
lines changed

docs/installation/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: Installation
44
hide:
55
- navigation
66
- toc
7+
os_button: null
78
---
89

9-
{{newline}}
10+
{{newline}}

docs/installation/linux.md

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,85 @@ title: Linux Installation
44
hide:
55
- navigation
66
- toc
7+
os_button: linux
8+
compile_guide: https://github.com/xournalpp/xournalpp/blob/master/readme/LinuxBuild.md
9+
10+
version_class: linux
11+
versions:
12+
- name: Stable
13+
subtitle: (Recommended)
14+
description: Suits most users with its focus on stability.
15+
links:
16+
- label: AppImage
17+
attr: linux.appimage
18+
- label: Flatpak
19+
attr: linux.flatpak
20+
- label: Snap
21+
attr: linux.snap
22+
- label: ".deb"
23+
attr: linux.debianStable
24+
- name: Nightly
25+
subtitle: (Unstable)
26+
description: Get new features as soon as they're implemented, in exchange for stability.
27+
links:
28+
- label: AppImage
29+
attr: nightly
30+
- label: ".deb"
31+
attr: nightly
732
---
833

9-
{{newline}}
34+
=== "Ubuntu and derivatives"
35+
36+
Install the latest stable release from the following unofficial ppa
37+
```bash
38+
sudo add-apt-repository ppa:apandada1/xournalpp-stable
39+
sudo apt update
40+
sudo apt install xournalpp
41+
```
42+
43+
Install the latest unstable nightly release from the following unofficial ppa
44+
```bash
45+
sudo add-apt-repository ppa:apandada1/xournalpp-master
46+
sudo apt update
47+
sudo apt install xournalpp
48+
```
49+
50+
Both of these can be easily upgraded via
51+
```bash
52+
sudo apt update && sudo apt upgrade
53+
```
54+
55+
=== "Fedora"
56+
57+
Install the latest stable release via
58+
```bash
59+
dnf install xournalpp
60+
```
61+
62+
=== "Solus"
63+
64+
Install the latest stable release via
65+
```bash
66+
sudo eopkg it xournalpp
67+
```
68+
69+
=== "openSUSE"
70+
71+
Install the latest stable release via
72+
```bash
73+
zypper in xournalpp
74+
```
75+
76+
=== "NixOS / Nix"
77+
78+
Install the latest stable release via
79+
```bash
80+
nix-env -iA nixpkgs.xournalpp
81+
```
82+
83+
=== "Arch"
84+
85+
Install the latest stable release via
86+
```bash
87+
pacman -S xournalpp
88+
```

docs/installation/macos.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@ title: MacOS Installation
44
hide:
55
- navigation
66
- toc
7+
os_button: macos
8+
compile_guide: https://github.com/xournalpp/xournalpp/blob/master/readme/MacBuild.md
9+
10+
version_class: windows-macos
11+
versions:
12+
- name: Stable
13+
subtitle: (Recommended)
14+
description: Suits most users with its focus on stability.
15+
links: macos.stable
16+
- name: Nightly
17+
subtitle: (Unstable)
18+
description: Get new features as soon as they're implemented, in exchange for stability.
19+
links: nightly
720
---
821

9-
{{newline}}
22+
1. Unzip the downloaded archive file
23+
2. Run the installation program within
24+
3. Success!

docs/installation/windows.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ title: Windows Installation
44
hide:
55
- navigation
66
- toc
7+
os_button: windows
8+
compile_guide: https://github.com/xournalpp/xournalpp/blob/master/readme/WindowsBuild.md
9+
10+
version_class: windows-macos
11+
versions:
12+
- name: Stable
13+
subtitle: (Recommended)
14+
description: Suits most users with its focus on stability.
15+
links: windows.stable
16+
- name: Nightly
17+
subtitle: (Unstable)
18+
description: Get new features as soon as they're implemented, in exchange for stability.
19+
links: nightly
720
---
821

9-
{{newline}}
22+
1. Unzip archive which should be named something like `xournalpp-{version}-windows.zip`
23+
2. Run the setup program contained in `xournalpp-{version}-windows.zip`.
24+
3. Follow the installation steps
25+
4. Success!

overrides/installation/distro-installation.md

Lines changed: 0 additions & 130 deletions
This file was deleted.

overrides/installation/download-links.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set default = "https://github.com/xournalpp/xournalpp/releases" %}
22
{% set allVersions = "https://github.com/xournalpp/xournalpp/releases" %}
3-
{% set nightly = "https://github.com/xournalpp/xournalpp/releases" %}
3+
{% set nightly = "https://github.com/xournalpp/xournalpp/releases/tag/nightly" %}
44
{% set windows =
55
({
66
"stable" : "https://github.com/xournalpp/xournalpp/releases/download/1.1.0/xournalpp-1.1.0-windows.zip"

overrides/installation/installation.css

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ a.mobile-option {
174174
font-size: 18px;
175175
}
176176

177-
.version .download-mac-windows {
177+
.version .download-windows-macos {
178178
margin: 0 auto;
179179
align-self: flex-end;
180180
padding: 7px;
@@ -211,21 +211,14 @@ a.mobile-option {
211211
margin-top: 7px;
212212
}
213213

214-
.step-container p {
214+
.step-container p, .step-container li {
215215
font-size: 18px;
216216
}
217217

218218
.installation-guide ol > * {
219219
list-style-type: decimal;
220220
}
221221

222-
.installation-guide span {
223-
background-color: #f5f5f5;
224-
font-family: "Roboto Mono" , monospace;
225-
font-size: 16px;
226-
font-weight: 400;
227-
}
228-
229222
.installation-guide {
230223
margin-bottom: 20px;
231224
}
@@ -310,12 +303,16 @@ a.mobile-option {
310303
margin-bottom: 0;
311304
}
312305

313-
.code-instruction {
306+
.distro-list div.highlight {
314307
background-color: #f5f5f5;
315308
padding: 10px 15px;
316309
}
317310

318-
.code-instruction code {
311+
.distro-list pre {
312+
margin: 0;
313+
}
314+
315+
.distro-list code {
319316
font-size: 16px;
320317
line-height: 20px;
321318
}

0 commit comments

Comments
 (0)