diff --git a/website/CHANGES.md b/website/CHANGES.md index 81032fe..7f55cca 100644 --- a/website/CHANGES.md +++ b/website/CHANGES.md @@ -1,5 +1,8 @@ # Changes +## 2021-01-09 +* Added link to Mintronics. + ## 2019-05-05 * Added image of the TX-Pi cases to the index page (PeH) * Update of the SD card images (PeH) diff --git a/website/static/font/README.md b/website/static/font/README.md new file mode 100644 index 0000000..9d83959 --- /dev/null +++ b/website/static/font/README.md @@ -0,0 +1,6 @@ +Subset of Font Awesome (license: SIL) +created with https://fontello.com/ + +See also config.json + +Don't forget to update styles/txpi.css \ No newline at end of file diff --git a/website/static/font/config.json b/website/static/font/config.json new file mode 100644 index 0000000..0e1de6d --- /dev/null +++ b/website/static/font/config.json @@ -0,0 +1,40 @@ +{ + "name": "txpi", + "css_prefix_text": "icon-", + "css_use_suffix": false, + "hinting": true, + "units_per_em": 1000, + "ascent": 850, + "glyphs": [ + { + "uid": "5e0a374728ffa8d0ae1f331a8f648231", + "css": "github", + "code": 61715, + "src": "fontawesome" + }, + { + "uid": "fbede3c5584282a0e9b131926dff71da", + "css": "cube", + "code": 61874, + "src": "fontawesome" + }, + { + "uid": "5bb103cd29de77e0e06a52638527b575", + "css": "install", + "code": 59392, + "src": "fontawesome" + }, + { + "uid": "9affc98d652b86628d650ee58dbf0357", + "css": "basket", + "code": 59393, + "src": "fontawesome" + }, + { + "uid": "5f0f183e241d15cbe486bff88b188dff", + "css": "puzzle", + "code": 61742, + "src": "fontawesome" + } + ] +} \ No newline at end of file diff --git a/website/static/font/txpi.eot b/website/static/font/txpi.eot old mode 100755 new mode 100644 index 1e8c256..cf78afb Binary files a/website/static/font/txpi.eot and b/website/static/font/txpi.eot differ diff --git a/website/static/font/txpi.svg b/website/static/font/txpi.svg old mode 100755 new mode 100644 index 9d97b0a..b0ca859 --- a/website/static/font/txpi.svg +++ b/website/static/font/txpi.svg @@ -1,18 +1,16 @@ -Copyright (C) 2020 by original authors @ fontello.com +Copyright (C) 2021 by original authors @ fontello.com - + - - - + diff --git a/website/static/font/txpi.ttf b/website/static/font/txpi.ttf old mode 100755 new mode 100644 index 21eab12..cf2038e Binary files a/website/static/font/txpi.ttf and b/website/static/font/txpi.ttf differ diff --git a/website/static/font/txpi.woff b/website/static/font/txpi.woff old mode 100755 new mode 100644 index b272180..1e767dc Binary files a/website/static/font/txpi.woff and b/website/static/font/txpi.woff differ diff --git a/website/static/font/txpi.woff2 b/website/static/font/txpi.woff2 old mode 100755 new mode 100644 index 52210b1..50cc464 Binary files a/website/static/font/txpi.woff2 and b/website/static/font/txpi.woff2 differ diff --git a/website/static/styles/txpi.css b/website/static/styles/txpi.css index 6f150a7..f8e246b 100644 --- a/website/static/styles/txpi.css +++ b/website/static/styles/txpi.css @@ -1,11 +1,11 @@ @font-face { font-family: 'txpi'; - src: url('../font/txpi.eot?6463662'); - src: url('../font/txpi.eot?6463662#iefix') format('embedded-opentype'), - url('../font/txpi.woff2?6463662') format('woff2'), - url('../font/txpi.woff?6463662') format('woff'), - url('../font/txpi.ttf?6463662') format('truetype'), - url('../font/txpi.svg?6463662#txpi') format('svg'); + src: url('../font/txpi.eot?62794319'); + src: url('../font/txpi.eot?62794319#iefix') format('embedded-opentype'), + url('../font/txpi.woff2?62794319') format('woff2'), + url('../font/txpi.woff?62794319') format('woff'), + url('../font/txpi.ttf?62794319') format('truetype'), + url('../font/txpi.svg?62794319#txpi') format('svg'); font-weight: normal; font-style: normal; } @@ -15,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'txpi'; - src: url('../font/txpi.svg?6463662#txpi') format('svg'); + src: url('../font/txpi.svg?62794319#txpi') format('svg'); } } */ @@ -24,7 +24,7 @@ font-family: "txpi"; font-style: normal; font-weight: normal; - speak: none; + speak: never; display: inline-block; text-decoration: inherit; @@ -56,103 +56,7 @@ } .icon-install:before { content: '\e800'; } /* '' */ -.icon-floppy:before { content: '\e801'; } /* '' */ -.icon-download:before { content: '\e802'; } /* '' */ -.icon-gh:before { content: '\f09b'; } /* '' */ +.icon-basket:before { content: '\e801'; } /* '' */ +.icon-github:before { content: '\f113'; } /* '' */ .icon-puzzle:before { content: '\f12e'; } /* '' */ -.icon-cube:before { content: '\f1b2'; } /* '' */ - -/* carousel code */ - -/* Slideshow container */ -.slideshow-container { - max-width: 100px; - position: relative; - margin: auto; -} - -.slide { - display: none; -} - -/* Next & previous buttons */ -.prev, .next { - cursor: pointer; - position: absolute; - top: 50%; - width: auto; - margin-top: -22px; - padding: 16px; - color: black; - background-color: #ffffff00; - font-weight: bold; - font-size: 18px; - transition: 0.6s ease; - border-radius: 0 3px 3px 0; - user-select: none; -} - -/* Position the "next button" to the right */ -.next { - right: 0; - border-radius: 3px 0 0 3px; -} - -/* On hover, add a black background color with a little bit see-through */ -.prev:hover, .next:hover { - background-color: #ffffff80; -} - -/* Caption text */ -.caption { - margin: auto; - color: #000000; - background-color: #ffffff80; - font-size: 18px; - font-weight: bold; - padding: 8px 12px; - position: absolute; - bottom: 18px; - width: 100%; - text-align: center; -} - -.dots { - position: absolute; - top: 10px; - width: 100%; -} - -/* The dots/bullets/indicators */ -.dot { - cursor: pointer; - height: 10px; - width: 10px; - margin: 0 2px; - background-color: #bbb; - border-radius: 50%; - display: inline-block; -} - -.active, .dot:hover { - background-color: #717171; -} - -/* Fading animation */ -.fade { - animation-name: fade; - animation-duration: 1.5s; -} - -@keyframes fade { - 0% {opacity: 0} - 100% {opacity: 1} -} - -details > summary { - list-style: none; -} - -details > summary::-webkit-details-marker { - display: none; -} +.icon-cube:before { content: '\f1b2'; } /* '' */ \ No newline at end of file diff --git a/website/webapp.py b/website/webapp.py index 4b45dcb..f6d11ef 100644 --- a/website/webapp.py +++ b/website/webapp.py @@ -229,7 +229,9 @@ def inject_defaults(): main_menu = (MenuItem('Software', 'software', icon='icon-puzzle'), MenuItem('Hardware', 'hardware', icon='icon-install'), MenuItem('Cases' if is_en else 'Gehäuse', 'cases', icon='icon-cube'), - MenuItem('Github', _GITHUB_URL, icon='icon-gh'), + MenuItem('Shop', 'https://www.mintronics.de/shop/Raspberry-Pi-TX-Pi-c61868271', + icon='icon-basket'), + MenuItem('Github', _GITHUB_URL, icon='icon-github'), MenuItem('Deutsch' if is_en else 'English', ('/de/' if is_en else '/en/') + request.path[4:], icon=None)) language = 'en' if is_en else 'de'