From 131f911891063d0a1b71a816d5939ed99a878a5b Mon Sep 17 00:00:00 2001 From: Mazurel Date: Sun, 7 Feb 2021 22:56:11 +0100 Subject: [PATCH 1/6] Reworked installation page and added buttons in css --- docs/css/buttons.css | 49 ++++++++++++++++++++++ docs/index.md | 13 +++++- docs/installation.md | 81 ------------------------------------ docs/installation/general.md | 11 +++++ docs/installation/linux.md | 75 +++++++++++++++++++++++++++++++++ docs/installation/macos.md | 21 ++++++++++ docs/installation/windows.md | 25 +++++++++++ mkdocs.yml | 21 +++++++++- 8 files changed, 212 insertions(+), 84 deletions(-) create mode 100644 docs/css/buttons.css delete mode 100644 docs/installation.md create mode 100644 docs/installation/general.md create mode 100644 docs/installation/linux.md create mode 100644 docs/installation/macos.md create mode 100644 docs/installation/windows.md diff --git a/docs/css/buttons.css b/docs/css/buttons.css new file mode 100644 index 0000000..b5dd161 --- /dev/null +++ b/docs/css/buttons.css @@ -0,0 +1,49 @@ +a.xournalppButton { + background-color: var(--md-primary-fg-color); + color: var(--md-primary-bg-color); + padding: 10px; + cursor: pointer; + margin: 8px; + font-size: 20px; +} + +a.xournalppButton:hover { + color: var(--md-primary-bg-color--light) ; +} + +a.bigXournalppButton { + background-color: var(--md-primary-fg-color); + color: var(--md-primary-bg-color); + padding: 10px; + cursor: pointer; + margin: 8px; + font-size: 24px; +} + +a.bigXournalppButton:hover { + color: var(--md-primary-bg-color--light); +} + +#osContainer { + display: grid; + justify-content: center; + grid-template-columns: repeat(3, 1fr); + text-align: center; + margin-top: 20px; +} + +#macosDownloadsContainer, #windowsDownloadsContainer { + display: grid; + justify-content: center; + grid-template-columns: repeat(3, 1fr); + text-align: center; + margin-top: 20px; +} + +#linuxDownloadsContainer { + display: grid; + justify-content: center; + grid-template-columns: repeat(4, 1fr); + text-align: center; + margin-top: 20px; +} diff --git a/docs/index.md b/docs/index.md index 47d0a09..f9c9948 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,14 @@ # Xournal++ +
+Download +Github Page +Xournalpp mobile + +
+ +## General info + **Note: this website is new and a work-in-progress. In the meantime, please use the [GitHub page](https://github.com/xournalpp/xournalpp) for more information.** @@ -9,8 +18,8 @@ target of flexibility, functionality, and speed. It is a modern rewrite and more feature-rich version of the wonderful [Xournal](http://sourceforge.net/projects/xournal/) program. -To install Xournal++, please follow the instructions on the [installation -page](installation). +To install Xournal++, please follow to the [installation +page](installation/general). ## Some highlighted features diff --git a/docs/installation.md b/docs/installation.md deleted file mode 100644 index dfc6ac1..0000000 --- a/docs/installation.md +++ /dev/null @@ -1,81 +0,0 @@ -# Installation Guide - -On this page we summarize the main installation options. For more details see [the main page of the repository](https://github.com/xournalpp/xournalpp#Installing). - -Depending on your operation system you mainly have the following options to install Xournal++ on your device. - -## Windows - -* Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) -* Bulid the latest development version (currently version {{ version.latest_unstable }}) from source as described on [this wiki page](https://github.com/xournalpp/xournalpp/blob/master/readme/WindowsBuild.md) - -## MacOS - -* Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) -* Bulid the latest development version (currently version {{ version.latest_unstable }}) from source as described on [this wiki page](https://github.com/xournalpp/xournalpp/blob/master/readme/MacBuild.md) - -## Linux - -### Options for all/most distros - -The following options are available on _most major Linux distros. - -* Install the FlatPak (currently version {{ version.latest_stable }}) from the [official FlatHub release](https://flathub.org/apps/details/com.github.xournalpp.xournalpp) -* Install the AppImage (latest stable release, currently {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the Snap Package (currently version {{ version.latest_stable }}) from the [SnapCraft release](https://snapcraft.io/xournalpp). This package is unofficial. -* Bulid the latest development version (currently version {{ version.latest_unstable }}) from source as described on [this wiki page](https://github.com/xournalpp/xournalpp/blob/master/readme/LinuxBuild.md) - -### Options for specific distros (potentially preferable) - -On _specific Linux distros_ you have the following extra options: - -#### Ubuntu and derivatives - -* Install the latest *unstable* nightly release from the following ppa - - sudo add-apt-repository ppa:andreasbutti/xournalpp-master - sudo apt update - sudo apt install xournalpp - - which you can easily upgrade via `sudo apt update && sudo apt upgrade` - -* Install the latest *stable* release from the following *unofficial* ppa - - sudo add-apt-repository ppa:apandada1/xournalpp-stable - sudo apt update - sudo apt install xournalpp - -* Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) - -#### Debian Buster - -* Install the latest stable release (version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/1.0.18) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) - -#### Fedora - -Install the latest stable release via - - dnf install xournalpp - -#### openSuse - -Install the latest stable release via - - zypper in xournalpp - -#### Solus - -Install the latest stable release via - - sudo eopkg it xournalpp - -#### Arch - -Install the latest stable release from the _community_ repository via - - pacman -S xournalpp - \ No newline at end of file diff --git a/docs/installation/general.md b/docs/installation/general.md new file mode 100644 index 0000000..f076d98 --- /dev/null +++ b/docs/installation/general.md @@ -0,0 +1,11 @@ +# Please choose your OS + +Xournalpp is a free and open source program and is avaible on most of the desktop OSes. Please choose operating system that you are using and follow the appropiate guide. If you are having trouble with your guide, you may want to visit the [Github page](https://github.com/xournalpp/xournalpp#Installing) or [report an issue](https://github.com/xournalpp/xournalpp.github.io/issues). + +
+Windows +MacOS +Linux +
+ + diff --git a/docs/installation/linux.md b/docs/installation/linux.md new file mode 100644 index 0000000..23a71a0 --- /dev/null +++ b/docs/installation/linux.md @@ -0,0 +1,75 @@ +# Linux installation + +## General information + +Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/LinuxBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. + +## Options for all/most distros + +The following options are available on most major Linux distros. + +
+FlatPak +AppImage +Snap Package +Other versions +Or use distro specific method +
+ +## Options for specific distros (potentially preferable) + +On _specific Linux distros_ you have the following extra options: + +### Ubuntu and derivatives + +* Install the latest *unstable* nightly release from the following ppa + + sudo add-apt-repository ppa:andreasbutti/xournalpp-master + sudo apt update + sudo apt install xournalpp + + which you can easily upgrade via `sudo apt update && sudo apt upgrade` + +* Install the latest *stable* release from the following *unofficial* ppa + + sudo add-apt-repository ppa:apandada1/xournalpp-stable + sudo apt update + sudo apt install xournalpp + +* Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) +* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) + +### Debian Buster + +* Install the latest stable release (version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/1.0.18) +* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) + +### Fedora + +Install the latest stable release via + + dnf install xournalpp + +### openSuse + +Install the latest stable release via + + zypper in xournalpp + +### Solus + +Install the latest stable release via + + sudo eopkg it xournalpp + +### Arch + +Install the latest stable release from the _community_ repository via + + pacman -S xournalpp + +### NixOS/Nix + +Install the latest stable release via + + nix-env -iA nixpkgs.xournalpp diff --git a/docs/installation/macos.md b/docs/installation/macos.md new file mode 100644 index 0000000..e353135 --- /dev/null +++ b/docs/installation/macos.md @@ -0,0 +1,21 @@ +# MacOS installation + +## General information + +Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/MacBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. + +## Downloading the program + +
+Stable (Recommended) +Nightly +Other versions +
+ +> In case of downloading other version than stable one, remember to download the `macos` version. + +## Installing program + +> After installation, it would be nice if you could improve this guide + +Just download the archive and run unzipped executable. diff --git a/docs/installation/windows.md b/docs/installation/windows.md new file mode 100644 index 0000000..0f4ccc3 --- /dev/null +++ b/docs/installation/windows.md @@ -0,0 +1,25 @@ +# Windows installation guide + +## General information + +Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary (in .exe form). In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/WindowsBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. + +## Downloading the program + +
+Stable (Recommended) +Nightly +Other versions +
+ +> In case of downloading other version than stable one, remember to download the `windows` version. + +## Installing the program + +Installing Xournalpp is really easy: + +1. Unzip archive which should be named something like `xournalpp-{version}-windows.zip`. +2. Run the installation executable (`xournalpp-{version}-windows.exe`). +3. Follow the installation steps. +4. Success ! + diff --git a/mkdocs.yml b/mkdocs.yml index 37c0d36..2a63962 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,7 +5,11 @@ remote_branch: master edit_uri: https://github.com/xournalpp/xournalpp.github.io/edit/site/docs nav: - Home: index.md - - Install: installation.md + - Installation: + - OS selection: installation/general.md + - Windows: installation/windows.md + - MacOS: installation/macos.md + - Linux: installation/linux.md - Guide: - Overview: guide/overview.md - Configuration: guide/config.md @@ -38,12 +42,27 @@ theme: - navigation.tabs - toc.integrate +# Custom styles +extra_css: + - css/buttons.css + #Enable macros plugins: - search - macros extra: + downloads: + default: "https://github.com/xournalpp/xournalpp/releases" + nightly: "https://github.com/xournalpp/xournalpp/releases/tag/nightly" + windows: + stable: "https://github.com/xournalpp/xournalpp/releases/download/1.0.20/xournalpp-1.0.20-windows.zip" + macos: + stable: "https://github.com/xournalpp/xournalpp/releases/download/1.0.20/xournalpp-1.0.20-macos.zip" + linux: + flatpak: "https://flathub.org/apps/details/com.github.xournalpp.xournalpp" + appimage: "https://github.com/xournalpp/xournalpp/releases/download/1.0.20/xournalpp-1.0.20-x86_64.AppImage" + snap: "https://snapcraft.io/xournalpp" version: latest_stable: "1.0.20" latest_unstable: "1.1.0+dev" From d0bd06deaf213faca2d8a1c4508717ae865be0d8 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Mon, 8 Feb 2021 14:29:03 +0100 Subject: [PATCH 2/6] Applied rolandlo and Technius comments and suggestions. --- docs/css/buttons.css | 47 ++++++++-------- docs/icons/download.svg | 100 +++++++++++++++++++++++++++++++++++ docs/index.md | 6 +-- docs/installation/general.md | 11 ---- docs/installation/index.md | 11 ++++ docs/installation/linux.md | 21 ++++---- docs/installation/macos.md | 14 ++--- docs/installation/windows.md | 14 ++--- mkdocs.yml | 3 +- 9 files changed, 164 insertions(+), 63 deletions(-) create mode 100644 docs/icons/download.svg delete mode 100644 docs/installation/general.md create mode 100644 docs/installation/index.md diff --git a/docs/css/buttons.css b/docs/css/buttons.css index b5dd161..b6b45fe 100644 --- a/docs/css/buttons.css +++ b/docs/css/buttons.css @@ -1,49 +1,48 @@ a.xournalppButton { + display: inline-flex; + justify-content: center; + align-items: center; + flex-direction: column; background-color: var(--md-primary-fg-color); color: var(--md-primary-bg-color); - padding: 10px; + padding: 8px; cursor: pointer; - margin: 8px; font-size: 20px; } a.xournalppButton:hover { - color: var(--md-primary-bg-color--light) ; -} - -a.bigXournalppButton { - background-color: var(--md-primary-fg-color); - color: var(--md-primary-bg-color); - padding: 10px; - cursor: pointer; - margin: 8px; - font-size: 24px; + color: var(--md-primary-bg-color--light); } -a.bigXournalppButton:hover { - color: var(--md-primary-bg-color--light); +a.downloadButton:after { + display: block; + content: ""; + width: 34px; + height: 34px; + background: url(/icons/download.svg); + background-size: cover; + background-repeat: no-repeat; } -#osContainer { +.downloadsContainer { display: grid; justify-content: center; - grid-template-columns: repeat(3, 1fr); text-align: center; margin-top: 20px; + grid-gap: 8px; +} + +#osContainer { + grid-template-columns: repeat(3, 1fr); +} +#osContainer > a { + font-size: 24px; } #macosDownloadsContainer, #windowsDownloadsContainer { - display: grid; - justify-content: center; grid-template-columns: repeat(3, 1fr); - text-align: center; - margin-top: 20px; } #linuxDownloadsContainer { - display: grid; - justify-content: center; grid-template-columns: repeat(4, 1fr); - text-align: center; - margin-top: 20px; } diff --git a/docs/icons/download.svg b/docs/icons/download.svg new file mode 100644 index 0000000..66aebd6 --- /dev/null +++ b/docs/icons/download.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/docs/index.md b/docs/index.md index f9c9948..76e1110 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,9 @@ # Xournal++
-Download -Github Page -Xournalpp mobile +Download +Github Page +Xournal++ mobile
diff --git a/docs/installation/general.md b/docs/installation/general.md deleted file mode 100644 index f076d98..0000000 --- a/docs/installation/general.md +++ /dev/null @@ -1,11 +0,0 @@ -# Please choose your OS - -Xournalpp is a free and open source program and is avaible on most of the desktop OSes. Please choose operating system that you are using and follow the appropiate guide. If you are having trouble with your guide, you may want to visit the [Github page](https://github.com/xournalpp/xournalpp#Installing) or [report an issue](https://github.com/xournalpp/xournalpp.github.io/issues). - - - - diff --git a/docs/installation/index.md b/docs/installation/index.md new file mode 100644 index 0000000..9da0946 --- /dev/null +++ b/docs/installation/index.md @@ -0,0 +1,11 @@ +# Please choose your OS + +Xournal++ is a free and open source program and is available on most of the desktop OSes. Please choose the operating system that you are using and follow the appropriate guide. If you are having trouble with your guide, you may want to visit the [Github page](https://github.com/xournalpp/xournalpp#Installing) or [report an issue](https://github.com/xournalpp/xournalpp.github.io/issues). + + + + diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 23a71a0..bfca8ee 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -2,19 +2,20 @@ ## General information -Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/LinuxBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. +Xournal++ is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/LinuxBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. ## Options for all/most distros The following options are available on most major Linux distros. - +Snap Package +Other versions +Nightly (including nightly AppImage) +Or use distro specific method + ## Options for specific distros (potentially preferable) @@ -37,12 +38,12 @@ On _specific Linux distros_ you have the following extra options: sudo apt install xournalpp * Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) +* Install the latest unstable release (automated nightly build) from the [releases page]({{downloads.nightly}}) ### Debian Buster -* Install the latest stable release (version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/1.0.18) -* Install the latest unstable release (automated nightly build) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/nightly) +* Install the latest stable release (version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/1.0.20-hotfix) +* Install the latest unstable release (automated nightly build) from the [releases page]({{downloads.nightly}}) ### Fedora diff --git a/docs/installation/macos.md b/docs/installation/macos.md index e353135..851ec32 100644 --- a/docs/installation/macos.md +++ b/docs/installation/macos.md @@ -2,20 +2,20 @@ ## General information -Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/MacBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. +Xournal++ is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary. In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/MacBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. ## Downloading the program - +Other versions + -> In case of downloading other version than stable one, remember to download the `macos` version. +In case of downloading a different version than the stable one, remember to download the `macos` version. ## Installing program > After installation, it would be nice if you could improve this guide -Just download the archive and run unzipped executable. +Just download the archive and run the unzipped executable. diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 0f4ccc3..1b4f575 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -1,18 +1,18 @@ -# Windows installation guide +# Windows installation ## General information -Xournalpp is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary (in .exe form). In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/WindowsBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. +Xournal++ is a free and open source program and can be easily compiled from source, although for user convenience it is also distributed via precompiled binary (in .exe form). In case you want to compile xournalpp on your own you should follow the guide on the [github page](https://github.com/xournalpp/xournalpp/blob/master/readme/WindowsBuild.md). If you decide to do otherwise, then this guide is dedicated to that process. ## Downloading the program - +Other versions + -> In case of downloading other version than stable one, remember to download the `windows` version. +In case of downloading a different version than the stable one, remember to download the `windows` version. ## Installing the program diff --git a/mkdocs.yml b/mkdocs.yml index 2a63962..b8f24b1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,7 +6,7 @@ edit_uri: https://github.com/xournalpp/xournalpp.github.io/edit/site/docs nav: - Home: index.md - Installation: - - OS selection: installation/general.md + - OS selection: installation/index.md - Windows: installation/windows.md - MacOS: installation/macos.md - Linux: installation/linux.md @@ -54,6 +54,7 @@ plugins: extra: downloads: default: "https://github.com/xournalpp/xournalpp/releases" + allVersions: "https://github.com/xournalpp/xournalpp/tags" nightly: "https://github.com/xournalpp/xournalpp/releases/tag/nightly" windows: stable: "https://github.com/xournalpp/xournalpp/releases/download/1.0.20/xournalpp-1.0.20-windows.zip" From 8a9c4dd0519a5488b702779db5802a3799c7a890 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Mon, 8 Feb 2021 22:51:44 +0100 Subject: [PATCH 3/6] Fixed invalid links and added buttons for ubuntu and debian --- docs/css/buttons.css | 5 +---- docs/index.md | 4 ++-- docs/installation/linux.md | 17 ++++++++++++----- docs/installation/macos.md | 2 +- docs/installation/windows.md | 2 +- mkdocs.yml | 2 ++ 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/docs/css/buttons.css b/docs/css/buttons.css index b6b45fe..c3cfda3 100644 --- a/docs/css/buttons.css +++ b/docs/css/buttons.css @@ -32,14 +32,11 @@ a.downloadButton:after { grid-gap: 8px; } -#osContainer { - grid-template-columns: repeat(3, 1fr); -} #osContainer > a { font-size: 24px; } -#macosDownloadsContainer, #windowsDownloadsContainer { +#debianContainer, #ubuntuContainer, #osContainer, #macosDownloadsContainer, #windowsDownloadsContainer { grid-template-columns: repeat(3, 1fr); } diff --git a/docs/index.md b/docs/index.md index 76e1110..6b008b4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,7 @@ # Xournal++
-Download +Download Github Page Xournal++ mobile @@ -19,7 +19,7 @@ feature-rich version of the wonderful [Xournal](http://sourceforge.net/projects/xournal/) program. To install Xournal++, please follow to the [installation -page](installation/general). +page](installation). ## Some highlighted features diff --git a/docs/installation/linux.md b/docs/installation/linux.md index bfca8ee..a3bc96c 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -13,7 +13,7 @@ The following options are available on most major Linux distros. FlatPak Snap Package Other versions -Nightly (including nightly AppImage) +Nightly (latest unstable, including nightly AppImage) Or use distro specific method @@ -37,13 +37,20 @@ On _specific Linux distros_ you have the following extra options: sudo apt update sudo apt install xournalpp -* Install the latest stable release (currently version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases) -* Install the latest unstable release (automated nightly build) from the [releases page]({{downloads.nightly}}) +* Or: + ### Debian Buster -* Install the latest stable release (version {{ version.latest_stable }}) from the [releases page](https://github.com/xournalpp/xournalpp/releases/tag/1.0.20-hotfix) -* Install the latest unstable release (automated nightly build) from the [releases page]({{downloads.nightly}}) + ### Fedora diff --git a/docs/installation/macos.md b/docs/installation/macos.md index 851ec32..f53ddcd 100644 --- a/docs/installation/macos.md +++ b/docs/installation/macos.md @@ -8,7 +8,7 @@ Xournal++ is a free and open source program and can be easily compiled from sour diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 1b4f575..9bb77bd 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -8,7 +8,7 @@ Xournal++ is a free and open source program and can be easily compiled from sour diff --git a/mkdocs.yml b/mkdocs.yml index b8f24b1..edfe4fc 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -64,6 +64,8 @@ extra: flatpak: "https://flathub.org/apps/details/com.github.xournalpp.xournalpp" appimage: "https://github.com/xournalpp/xournalpp/releases/download/1.0.20/xournalpp-1.0.20-x86_64.AppImage" snap: "https://snapcraft.io/xournalpp" + debianStable: "https://github.com/xournalpp/xournalpp/releases/tag/1.0.20-hotfix" + ubuntuStable: "https://github.com/xournalpp/xournalpp/releases/tag/1.0.20" version: latest_stable: "1.0.20" latest_unstable: "1.1.0+dev" From 9648da8e576e9d22d948f16f7bce95aec1a0bb8b Mon Sep 17 00:00:00 2001 From: Mazurel Date: Tue, 9 Feb 2021 13:43:21 +0100 Subject: [PATCH 4/6] Changed icon to one from octicons and css changes --- docs/css/buttons.css | 31 +++++-- docs/icons/download.svg | 100 ----------------------- docs/icons/octicons/LICENSE | 21 +++++ docs/icons/octicons/desktop-download.svg | 1 + docs/icons/octicons/link-external.svg | 1 + docs/index.md | 6 +- docs/installation/linux.md | 24 +++--- docs/installation/macos.md | 4 +- docs/installation/windows.md | 4 +- 9 files changed, 64 insertions(+), 128 deletions(-) delete mode 100644 docs/icons/download.svg create mode 100644 docs/icons/octicons/LICENSE create mode 100644 docs/icons/octicons/desktop-download.svg create mode 100644 docs/icons/octicons/link-external.svg diff --git a/docs/css/buttons.css b/docs/css/buttons.css index c3cfda3..a80121c 100644 --- a/docs/css/buttons.css +++ b/docs/css/buttons.css @@ -1,8 +1,9 @@ a.xournalppButton { display: inline-flex; + position: relative; justify-content: center; align-items: center; - flex-direction: column; + flex-shrink: 0; background-color: var(--md-primary-fg-color); color: var(--md-primary-bg-color); padding: 8px; @@ -14,13 +15,25 @@ a.xournalppButton:hover { color: var(--md-primary-bg-color--light); } -a.downloadButton:after { +a.linkButton:before { display: block; content: ""; - width: 34px; - height: 34px; - background: url(/icons/download.svg); + width: 24px; + height: 24px; + background: url(/icons/octicons/link-external.svg); background-size: cover; + margin-right: 10px; + background-repeat: no-repeat; +} + +a.downloadButton:before { + display: block; + content: ""; + width: 24px; + height: 24px; + background: url(/icons/octicons/desktop-download.svg); + background-size: cover; + margin-right: 10px; background-repeat: no-repeat; } @@ -36,10 +49,10 @@ a.downloadButton:after { font-size: 24px; } -#debianContainer, #ubuntuContainer, #osContainer, #macosDownloadsContainer, #windowsDownloadsContainer { - grid-template-columns: repeat(3, 1fr); +#osContainer, #macosDownloadsContainer, #windowsDownloadsContainer { + grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); } -#linuxDownloadsContainer { - grid-template-columns: repeat(4, 1fr); +#linuxDownloadsContainer, #debianContainer, #ubuntuContainer { + grid-template-columns: repeat(auto-fill, minmax(460px, 1fr)); } diff --git a/docs/icons/download.svg b/docs/icons/download.svg deleted file mode 100644 index 66aebd6..0000000 --- a/docs/icons/download.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/docs/icons/octicons/LICENSE b/docs/icons/octicons/LICENSE new file mode 100644 index 0000000..af732f0 --- /dev/null +++ b/docs/icons/octicons/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 GitHub Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/docs/icons/octicons/desktop-download.svg b/docs/icons/octicons/desktop-download.svg new file mode 100644 index 0000000..85b9e98 --- /dev/null +++ b/docs/icons/octicons/desktop-download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/icons/octicons/link-external.svg b/docs/icons/octicons/link-external.svg new file mode 100644 index 0000000..8d207aa --- /dev/null +++ b/docs/icons/octicons/link-external.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 6b008b4..6c6075a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,9 @@ # Xournal++ diff --git a/docs/installation/linux.md b/docs/installation/linux.md index a3bc96c..bb9b3c5 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -10,11 +10,11 @@ The following options are available on most major Linux distros. ## Options for specific distros (potentially preferable) @@ -39,17 +39,17 @@ On _specific Linux distros_ you have the following extra options: * Or: ### Debian Buster -
    -Download stable -Download nightly (latest unstable) version -Other versions + ### Fedora diff --git a/docs/installation/macos.md b/docs/installation/macos.md index f53ddcd..d15ab01 100644 --- a/docs/installation/macos.md +++ b/docs/installation/macos.md @@ -8,8 +8,8 @@ Xournal++ is a free and open source program and can be easily compiled from sour In case of downloading a different version than the stable one, remember to download the `macos` version. diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 9bb77bd..71ea328 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -8,8 +8,8 @@ Xournal++ is a free and open source program and can be easily compiled from sour In case of downloading a different version than the stable one, remember to download the `windows` version. From 9f8771b737d701f094c7a3ca8a91431a5b27743c Mon Sep 17 00:00:00 2001 From: Mazurel Date: Tue, 23 Feb 2021 10:09:32 +0100 Subject: [PATCH 5/6] Changed icons color to white and fixed their position. Fixed invalid html. --- docs/css/buttons.css | 28 ++++++++++++++++++++++-- docs/icons/octicons/desktop-download.svg | 2 +- docs/icons/octicons/link-external.svg | 2 +- docs/index.md | 8 +++---- docs/installation/index.md | 6 ++--- docs/installation/linux.md | 24 ++++++++++---------- docs/installation/macos.md | 6 ++--- docs/installation/windows.md | 6 ++--- 8 files changed, 53 insertions(+), 29 deletions(-) diff --git a/docs/css/buttons.css b/docs/css/buttons.css index a80121c..21ad893 100644 --- a/docs/css/buttons.css +++ b/docs/css/buttons.css @@ -9,25 +9,34 @@ a.xournalppButton { padding: 8px; cursor: pointer; font-size: 20px; + width: 100%; + height: 100%; } a.xournalppButton:hover { color: var(--md-primary-bg-color--light); } +a.linkButton, a.downloadButton { + padding-left: 35px; +} + a.linkButton:before { display: block; + position: absolute; + left: 5px; content: ""; width: 24px; height: 24px; background: url(/icons/octicons/link-external.svg); background-size: cover; - margin-right: 10px; background-repeat: no-repeat; } a.downloadButton:before { display: block; + position: absolute; + left: 5px; content: ""; width: 24px; height: 24px; @@ -37,6 +46,16 @@ a.downloadButton:before { background-repeat: no-repeat; } +.flexedButtonsContainer { + display: flex; + justify-content: left; +} + +.flexedButtonsContainer > li { + margin-right: 10px; + list-style-type: none; +} + .downloadsContainer { display: grid; justify-content: center; @@ -45,6 +64,11 @@ a.downloadButton:before { grid-gap: 8px; } +.downloadsContainer > li { + list-style-type: none; + margin: 0 !important; +} + #osContainer > a { font-size: 24px; } @@ -54,5 +78,5 @@ a.downloadButton:before { } #linuxDownloadsContainer, #debianContainer, #ubuntuContainer { - grid-template-columns: repeat(auto-fill, minmax(460px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); } diff --git a/docs/icons/octicons/desktop-download.svg b/docs/icons/octicons/desktop-download.svg index 85b9e98..ae224e0 100644 --- a/docs/icons/octicons/desktop-download.svg +++ b/docs/icons/octicons/desktop-download.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/docs/icons/octicons/link-external.svg b/docs/icons/octicons/link-external.svg index 8d207aa..592c620 100644 --- a/docs/icons/octicons/link-external.svg +++ b/docs/icons/octicons/link-external.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/docs/index.md b/docs/index.md index 6c6075a..438242f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,9 @@ # Xournal++ -
    -Download -Github Page -Xournal++ mobile +
    +
  • Download
    • +
  • Github Page
    • +
  • Xournal++ mobile
    • diff --git a/docs/installation/index.md b/docs/installation/index.md index 9da0946..2e88423 100644 --- a/docs/installation/index.md +++ b/docs/installation/index.md @@ -3,9 +3,9 @@ Xournal++ is a free and open source program and is available on most of the desktop OSes. Please choose the operating system that you are using and follow the appropriate guide. If you are having trouble with your guide, you may want to visit the [Github page](https://github.com/xournalpp/xournalpp#Installing) or [report an issue](https://github.com/xournalpp/xournalpp.github.io/issues). diff --git a/docs/installation/linux.md b/docs/installation/linux.md index bb9b3c5..491d919 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -9,12 +9,12 @@ Xournal++ is a free and open source program and can be easily compiled from sour The following options are available on most major Linux distros. ## Options for specific distros (potentially preferable) @@ -39,17 +39,17 @@ On _specific Linux distros_ you have the following extra options: * Or: ### Debian Buster ### Fedora diff --git a/docs/installation/macos.md b/docs/installation/macos.md index d15ab01..b3ca8e1 100644 --- a/docs/installation/macos.md +++ b/docs/installation/macos.md @@ -7,9 +7,9 @@ Xournal++ is a free and open source program and can be easily compiled from sour ## Downloading the program In case of downloading a different version than the stable one, remember to download the `macos` version. diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 71ea328..73204aa 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -7,9 +7,9 @@ Xournal++ is a free and open source program and can be easily compiled from sour ## Downloading the program In case of downloading a different version than the stable one, remember to download the `windows` version. From 2ef7d9d2380978dcda0cc3b58718050447bcb935 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Tue, 23 Feb 2021 10:59:36 +0100 Subject: [PATCH 6/6] Added rounded buttons --- docs/css/buttons.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/css/buttons.css b/docs/css/buttons.css index 21ad893..70b27af 100644 --- a/docs/css/buttons.css +++ b/docs/css/buttons.css @@ -6,11 +6,12 @@ a.xournalppButton { flex-shrink: 0; background-color: var(--md-primary-fg-color); color: var(--md-primary-bg-color); - padding: 8px; + padding: 7px; cursor: pointer; font-size: 20px; width: 100%; height: 100%; + border-radius: 3px; } a.xournalppButton:hover {