From 55ea6b33e6b575249f2f77fda23e6729ff9d02df Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 2 Aug 2021 20:09:25 +0200 Subject: [PATCH] Changing badges to be better and closer to the originals, also adding their copyright notice. --- LICENSE.md | 11 +- README.md | 13 +- config.yaml | 3 +- content/logarithmplotter.fr.md | 6 +- content/logarithmplotter.md | 6 +- .../img/{platforms => badges}/en/amo-text.svg | 37 +- static/img/badges/en/amo.svg | 113 ++ .../img/{platforms/fr => badges/en}/export.sh | 2 +- .../fr => badges/en}/flathub-text.svg | 4 +- static/img/badges/en/flathub.svg | 58 + static/img/badges/en/snapcraft-text.svg | 87 ++ static/img/badges/en/snapcraft.svg | 19 + .../img/{platforms => badges}/fr/amo-text.svg | 43 +- static/img/badges/fr/amo.svg | 119 ++ .../img/{platforms/en => badges/fr}/export.sh | 2 +- .../en => badges/fr}/flathub-text.svg | 10 +- static/img/badges/fr/flathub.svg | 63 + static/img/badges/fr/snapcraft-text.svg | 87 ++ static/img/badges/fr/snapcraft.svg | 19 + static/img/platforms/en/amo.svg | 1123 ----------------- static/img/platforms/en/flathub.svg | 229 ---- static/img/platforms/en/snapcraft-text.svg | 106 -- static/img/platforms/en/snapcraft.svg | 179 --- static/img/platforms/fr/amo.svg | 135 -- static/img/platforms/fr/flathub.svg | 65 - static/img/platforms/fr/snapcraft-text.svg | 106 -- static/img/platforms/fr/snapcraft.svg | 50 - 27 files changed, 626 insertions(+), 2069 deletions(-) rename static/img/{platforms => badges}/en/amo-text.svg (96%) create mode 100644 static/img/badges/en/amo.svg rename static/img/{platforms/fr => badges/en}/export.sh (88%) rename static/img/{platforms/fr => badges/en}/flathub-text.svg (98%) create mode 100644 static/img/badges/en/flathub.svg create mode 100644 static/img/badges/en/snapcraft-text.svg create mode 100644 static/img/badges/en/snapcraft.svg rename static/img/{platforms => badges}/fr/amo-text.svg (95%) create mode 100644 static/img/badges/fr/amo.svg rename static/img/{platforms/en => badges/fr}/export.sh (88%) rename static/img/{platforms/en => badges/fr}/flathub-text.svg (98%) create mode 100644 static/img/badges/fr/flathub.svg create mode 100644 static/img/badges/fr/snapcraft-text.svg create mode 100644 static/img/badges/fr/snapcraft.svg delete mode 100644 static/img/platforms/en/amo.svg delete mode 100644 static/img/platforms/en/flathub.svg delete mode 100644 static/img/platforms/en/snapcraft-text.svg delete mode 100644 static/img/platforms/en/snapcraft.svg delete mode 100644 static/img/platforms/fr/amo.svg delete mode 100644 static/img/platforms/fr/flathub.svg delete mode 100644 static/img/platforms/fr/snapcraft-text.svg delete mode 100644 static/img/platforms/fr/snapcraft.svg diff --git a/LICENSE.md b/LICENSE.md index 101cdad..ac065f7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,11 @@ ## License -- static/download/\* are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu). -- static/icons/\*, static/img/\* & content/ are under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode), with a possible exceptions given in written form for [authorized distributions platforms](https://ad5001.eu/distribution-platforms). +- `static/download/\*` binaries are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu). +- static/img/platforms/\* icons are owned by their respective owners: + - `amo.svg`, `amo-text.svg`: Firefox icon used to link to addons.mozilla.org. + Firefox is a trademark of the Mozilla Foundation in the US and other countries. + - `snapcraft.svg`, `snapcraft-text.svg`: Snapcraft icon used to link to snapcraft.io. + Snapcraft is a trademark of the Canonical in the UK and other countries + - `flathub.svg`, `flathub-text.svg`: Flathub icon used to link to flathub.org. + These icons are modified versions of [the official flathub badges](https://flathub.org/badges) under [CC0](http://creativecommons.org/publicdomain/zero/1.0/). +- `static/icons/\*`, rest of `static/img/\*`, `data/` & `content/` are under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode), with a possible exceptions for app content given in written form for [authorized distributions platforms](https://ad5001.eu/distribution-platforms). diff --git a/README.md b/README.md index 26a413c..b43238a 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,14 @@ You can build the website by running `hugo`. ## License -- static/download/\* binaries are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu). -- static/icons/\*, static/img/\*, data/ & content/ are under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode), with a possible exceptions for app content given in written form for [authorized distributions platforms](https://ad5001.eu/distribution-platforms). +- `static/download/\*` binaries are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu). +- `static/img/badges/\*` icons are owned by their respective owners: + - `amo.svg`, `amo-text.svg`: Firefox icon used to link to addons.mozilla.org. + Firefox is a trademark of the Mozilla Foundation in the US and other countries. + This badge is the translated and updated form of [the old badge](https://blog.mozilla.org/addons/2015/11/10/promote-your-add-ons-with-the-get-the-add-on-button/) with the new AMO colors and branding. + - `snapcraft.svg`, `snapcraft-text.svg`: Snapcraft icon used to link to snapcraft.io. + The Snapcraft logo is licensed under CC BY-ND 2.0 UK, a registered trademark of Canonical Limited, 2018. + These icons are adapted versions of [the official snapcraft badges](https://github.com/snapcore/snap-store-badges). + - `flathub.svg`, `flathub-text.svg`: Flathub icon used to link to flathub.org. + These icons are modified and translated versions of [the official flathub badges](https://flathub.org/badges) under [CC0](http://creativecommons.org/publicdomain/zero/1.0/). +- `static/icons/\*`, rest of `static/img/\*`, `data/` & `content/` are under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode), with a possible exceptions for app content given in written form for [authorized distributions platforms](https://ad5001.eu/distribution-platforms). diff --git a/config.yaml b/config.yaml index a76784b..6159858 100644 --- a/config.yaml +++ b/config.yaml @@ -7,8 +7,7 @@ copyright: Copyright © Ad5001 2021 params: brandWebsite: //ad5001.eu - usingTheme: Using - poweredBy: Powered by + websiteSource: https://git.ad5001.eu/Ad5001/apps.ad5001.eu includeAppsStyle: true languages: diff --git a/content/logarithmplotter.fr.md b/content/logarithmplotter.fr.md index 515b9c9..8e7d001 100644 --- a/content/logarithmplotter.fr.md +++ b/content/logarithmplotter.fr.md @@ -89,11 +89,9 @@ Download: Name: LogarithmPlotter--setup.dmg (112,1Mio) URL: "/download/logarithmplotter//LogarithmPlotter--setup.dmg" linux: - - Title: Flatpak (non disponible) - Name: via flathub.org + - Title: Flatpak URL: "https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter" - - Title: Snap (non disponible) - Name: via snapcraft.io + - Title: Snap URL: "https://snapcraft.io/logarithmplotter" - Title: Debian / Ubuntu Name: le paquet deb (174Kio) diff --git a/content/logarithmplotter.md b/content/logarithmplotter.md index 948fd51..d9f88fb 100644 --- a/content/logarithmplotter.md +++ b/content/logarithmplotter.md @@ -89,11 +89,9 @@ Download: Name: LogarithmPlotter--setup.dmg (112.1MiB) URL: "/download/logarithmplotter//LogarithmPlotter--setup.dmg" linux: - - Title: Flatpak (unavailable) - Name: via flathub.org + - Title: Flatpak URL: "https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter" - - Title: Snap (unavailable) - Name: via snapcraft.io + - Title: Snap URL: "https://snapcraft.io/logarithmplotter" - Title: Debian / Ubuntu Name: debian package (174KiB) diff --git a/static/img/platforms/en/amo-text.svg b/static/img/badges/en/amo-text.svg similarity index 96% rename from static/img/platforms/en/amo-text.svg rename to static/img/badges/en/amo-text.svg index f971668..e455d87 100644 --- a/static/img/platforms/en/amo-text.svg +++ b/static/img/badges/en/amo-text.svg @@ -21,9 +21,9 @@ showgrid="false" width="600px" inkscape:zoom="1.4731392" - inkscape:cx="307.84599" + inkscape:cx="246.07315" inkscape:cy="140.17684" - inkscape:current-layer="layer2" + inkscape:current-layer="layer1" inkscape:lockguides="false" showguides="false" /> Install from + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:40px;font-family:'Sharp Sans';-inkscape-font-specification:'Sharp Sans Medium';fill:#ffffff">Get it from Firefox Browser - Firefox Addons diff --git a/static/img/badges/en/amo.svg b/static/img/badges/en/amo.svg new file mode 100644 index 0000000..85af457 --- /dev/null +++ b/static/img/badges/en/amo.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/platforms/fr/export.sh b/static/img/badges/en/export.sh similarity index 88% rename from static/img/platforms/fr/export.sh rename to static/img/badges/en/export.sh index bb94e3e..d9c57e1 100755 --- a/static/img/platforms/fr/export.sh +++ b/static/img/badges/en/export.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script exports all fonts from svgs to path, and needs to be re-run every time the original file is modified. # Programs required: inkscape, scour -# Fonts required: Ubuntu, Sharp Sans +# Fonts required: Ubuntu, Sharp Sans, Source Sans Pro for file in *-text.svg; do basename="${file%-*}" rm $basename.svg diff --git a/static/img/platforms/fr/flathub-text.svg b/static/img/badges/en/flathub-text.svg similarity index 98% rename from static/img/platforms/fr/flathub-text.svg rename to static/img/badges/en/flathub-text.svg index 652c765..ec18dac 100644 --- a/static/img/platforms/fr/flathub-text.svg +++ b/static/img/badges/en/flathub-text.svg @@ -227,7 +227,7 @@ Télécharger depuis + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.6667px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro'">Download On diff --git a/static/img/badges/en/flathub.svg b/static/img/badges/en/flathub.svg new file mode 100644 index 0000000..60f8fe3 --- /dev/null +++ b/static/img/badges/en/flathub.svg @@ -0,0 +1,58 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/badges/en/snapcraft-text.svg b/static/img/badges/en/snapcraft-text.svg new file mode 100644 index 0000000..482911c --- /dev/null +++ b/static/img/badges/en/snapcraft-text.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + +[EN]-snap-store-black +Created with Sketch. +Get it from theSnap Store +[EN]-snap-store-black diff --git a/static/img/badges/en/snapcraft.svg b/static/img/badges/en/snapcraft.svg new file mode 100644 index 0000000..310421d --- /dev/null +++ b/static/img/badges/en/snapcraft.svg @@ -0,0 +1,19 @@ + + + + +[EN]-snap-store-black +Created with Sketch. + +[EN]-snap-store-black diff --git a/static/img/platforms/fr/amo-text.svg b/static/img/badges/fr/amo-text.svg similarity index 95% rename from static/img/platforms/fr/amo-text.svg rename to static/img/badges/fr/amo-text.svg index 9a4744d..9087abb 100644 --- a/static/img/platforms/fr/amo-text.svg +++ b/static/img/badges/fr/amo-text.svg @@ -21,8 +21,8 @@ showgrid="false" width="600px" inkscape:zoom="1.4731392" - inkscape:cx="307.84599" - inkscape:cy="140.17684" + inkscape:cx="248.10962" + inkscape:cy="139.83743" inkscape:current-layer="layer2" inkscape:lockguides="false" showguides="false" /> @@ -958,40 +958,27 @@ Installer depuis + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:40px;font-family:'Sharp Sans';-inkscape-font-specification:'Sharp Sans Medium';text-align:start;text-anchor:start;fill:#ffffff">Installer depuis Firefox Browser - Firefox Addons diff --git a/static/img/badges/fr/amo.svg b/static/img/badges/fr/amo.svg new file mode 100644 index 0000000..e251f8a --- /dev/null +++ b/static/img/badges/fr/amo.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/platforms/en/export.sh b/static/img/badges/fr/export.sh similarity index 88% rename from static/img/platforms/en/export.sh rename to static/img/badges/fr/export.sh index bb94e3e..d9c57e1 100755 --- a/static/img/platforms/en/export.sh +++ b/static/img/badges/fr/export.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script exports all fonts from svgs to path, and needs to be re-run every time the original file is modified. # Programs required: inkscape, scour -# Fonts required: Ubuntu, Sharp Sans +# Fonts required: Ubuntu, Sharp Sans, Source Sans Pro for file in *-text.svg; do basename="${file%-*}" rm $basename.svg diff --git a/static/img/platforms/en/flathub-text.svg b/static/img/badges/fr/flathub-text.svg similarity index 98% rename from static/img/platforms/en/flathub-text.svg rename to static/img/badges/fr/flathub-text.svg index df4b743..2c5e4db 100644 --- a/static/img/platforms/en/flathub-text.svg +++ b/static/img/badges/fr/flathub-text.svg @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4142136" - inkscape:cx="236.52722" - inkscape:cy="135.41095" + inkscape:cx="240.76985" + inkscape:cy="135.05739" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -227,14 +227,14 @@ Download On + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.6667px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro'">Installer depuis diff --git a/static/img/badges/fr/flathub.svg b/static/img/badges/fr/flathub.svg new file mode 100644 index 0000000..554d885 --- /dev/null +++ b/static/img/badges/fr/flathub.svg @@ -0,0 +1,63 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/badges/fr/snapcraft-text.svg b/static/img/badges/fr/snapcraft-text.svg new file mode 100644 index 0000000..7a4cfe9 --- /dev/null +++ b/static/img/badges/fr/snapcraft-text.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + +[EN]-snap-store-black +Created with Sketch. +Installer à partir duSnap Store +[EN]-snap-store-black diff --git a/static/img/badges/fr/snapcraft.svg b/static/img/badges/fr/snapcraft.svg new file mode 100644 index 0000000..3c7383c --- /dev/null +++ b/static/img/badges/fr/snapcraft.svg @@ -0,0 +1,19 @@ + + + + +[EN]-snap-store-black +Created with Sketch. + +[EN]-snap-store-black diff --git a/static/img/platforms/en/amo.svg b/static/img/platforms/en/amo.svg deleted file mode 100644 index cfe3ac2..0000000 --- a/static/img/platforms/en/amo.svg +++ /dev/null @@ -1,1123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/platforms/en/flathub.svg b/static/img/platforms/en/flathub.svg deleted file mode 100644 index 31da73b..0000000 --- a/static/img/platforms/en/flathub.svg +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/platforms/en/snapcraft-text.svg b/static/img/platforms/en/snapcraft-text.svg deleted file mode 100644 index d2e8df7..0000000 --- a/static/img/platforms/en/snapcraft-text.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Install from the - snapstore - - diff --git a/static/img/platforms/en/snapcraft.svg b/static/img/platforms/en/snapcraft.svg deleted file mode 100644 index a53bcc6..0000000 --- a/static/img/platforms/en/snapcraft.svg +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/platforms/fr/amo.svg b/static/img/platforms/fr/amo.svg deleted file mode 100644 index 68d2e4b..0000000 --- a/static/img/platforms/fr/amo.svg +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/platforms/fr/flathub.svg b/static/img/platforms/fr/flathub.svg deleted file mode 100644 index 3bf8e9e..0000000 --- a/static/img/platforms/fr/flathub.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/platforms/fr/snapcraft-text.svg b/static/img/platforms/fr/snapcraft-text.svg deleted file mode 100644 index 86f491d..0000000 --- a/static/img/platforms/fr/snapcraft-text.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - Installer depuis le - snapstore - - diff --git a/static/img/platforms/fr/snapcraft.svg b/static/img/platforms/fr/snapcraft.svg deleted file mode 100644 index aedeb8f..0000000 --- a/static/img/platforms/fr/snapcraft.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -