diff --git a/LICENSE b/LICENSE index 7df85271..b96179cc 100644 --- a/LICENSE +++ b/LICENSE @@ -11,8 +11,4 @@ Redistribution and use in source and binary forms, with or without modification, THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- -favicon.svg - -Copyright 2022 Gustave Choutri - -Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0) +Logo is Copyright 2023 Léo Susana diff --git a/README.md b/README.md index 2bf8132d..26f92068 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -

Flora
A package index for the Haskell ecosystem

-

- Logo + + + Flora +

+

A package index for the Haskell ecosystem

+

CI badge diff --git a/assets/favicon.svg b/assets/favicon.svg deleted file mode 100644 index 94ba6dfa..00000000 --- a/assets/favicon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/android-chrome-192x192.png b/assets/icons/android-chrome-192x192.png new file mode 100644 index 00000000..68d5c91c Binary files /dev/null and b/assets/icons/android-chrome-192x192.png differ diff --git a/assets/icons/android-chrome-512x512.png b/assets/icons/android-chrome-512x512.png new file mode 100644 index 00000000..955b691e Binary files /dev/null and b/assets/icons/android-chrome-512x512.png differ diff --git a/assets/icons/apple-touch-icon.png b/assets/icons/apple-touch-icon.png new file mode 100644 index 00000000..d9133304 Binary files /dev/null and b/assets/icons/apple-touch-icon.png differ diff --git a/assets/icons/browserconfig.xml b/assets/icons/browserconfig.xml new file mode 100644 index 00000000..b3930d0f --- /dev/null +++ b/assets/icons/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/assets/icons/favicon-16x16.png b/assets/icons/favicon-16x16.png new file mode 100644 index 00000000..5b39a3d6 Binary files /dev/null and b/assets/icons/favicon-16x16.png differ diff --git a/assets/icons/favicon-32x32.png b/assets/icons/favicon-32x32.png new file mode 100644 index 00000000..7776bc4b Binary files /dev/null and b/assets/icons/favicon-32x32.png differ diff --git a/assets/icons/favicon.ico b/assets/icons/favicon.ico new file mode 100644 index 00000000..d4e6b131 Binary files /dev/null and b/assets/icons/favicon.ico differ diff --git a/assets/icons/favicon_package_v0.16.zip b/assets/icons/favicon_package_v0.16.zip new file mode 100644 index 00000000..98d47bb6 Binary files /dev/null and b/assets/icons/favicon_package_v0.16.zip differ diff --git a/assets/icons/logo_dark_mode.svg b/assets/icons/logo_dark_mode.svg new file mode 100644 index 00000000..8aa25ba7 --- /dev/null +++ b/assets/icons/logo_dark_mode.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/icons/logo_light_mode.svg b/assets/icons/logo_light_mode.svg new file mode 100644 index 00000000..b99a4a11 --- /dev/null +++ b/assets/icons/logo_light_mode.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/icons/mstile-144x144.png b/assets/icons/mstile-144x144.png new file mode 100644 index 00000000..cfee877f Binary files /dev/null and b/assets/icons/mstile-144x144.png differ diff --git a/assets/icons/mstile-150x150.png b/assets/icons/mstile-150x150.png new file mode 100644 index 00000000..d51a35bf Binary files /dev/null and b/assets/icons/mstile-150x150.png differ diff --git a/assets/icons/mstile-310x150.png b/assets/icons/mstile-310x150.png new file mode 100644 index 00000000..3a8c6980 Binary files /dev/null and b/assets/icons/mstile-310x150.png differ diff --git a/assets/icons/mstile-310x310.png b/assets/icons/mstile-310x310.png new file mode 100644 index 00000000..a2e7e02c Binary files /dev/null and b/assets/icons/mstile-310x310.png differ diff --git a/assets/icons/mstile-70x70.png b/assets/icons/mstile-70x70.png new file mode 100644 index 00000000..07d98fac Binary files /dev/null and b/assets/icons/mstile-70x70.png differ diff --git a/assets/icons/safari-pinned-tab.svg b/assets/icons/safari-pinned-tab.svg new file mode 100644 index 00000000..f850b24a --- /dev/null +++ b/assets/icons/safari-pinned-tab.svg @@ -0,0 +1,144 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + diff --git a/assets/icons/site.webmanifest b/assets/icons/site.webmanifest new file mode 100644 index 00000000..be98549e --- /dev/null +++ b/assets/icons/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "Flora", + "short_name": "Flora", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/banners/logo-dark-background.png b/banners/logo-dark-background.png new file mode 100644 index 00000000..9283a029 Binary files /dev/null and b/banners/logo-dark-background.png differ diff --git a/banners/logo-light-background.png b/banners/logo-light-background.png new file mode 100644 index 00000000..4a2228a9 Binary files /dev/null and b/banners/logo-light-background.png differ diff --git a/src/web/FloraWeb/Components/Header.hs b/src/web/FloraWeb/Components/Header.hs index baf446c0..77721ee5 100644 --- a/src/web/FloraWeb/Components/Header.hs +++ b/src/web/FloraWeb/Components/Header.hs @@ -12,6 +12,7 @@ import Flora.Environment.Config import FloraWeb.Components.Navbar (navbar) import FloraWeb.Components.Utils (property_, text) import FloraWeb.Templates.Types (FloraHTML, TemplateEnv (..)) +import Lucid.Svg.Attributes (color_) header :: FloraHTML header = do @@ -34,6 +35,15 @@ header = do meta_ [charset_ "UTF-8"] meta_ [name_ "viewport", content_ "width=device-width, initial-scale=1"] unless indexPage $ meta_ [name_ "robots", content_ "noindex"] + -- link_ [rel_ "icon", href_ "/static/icons/favicon.svg", type_ "image/svg+xml"] + link_ [rel_ "apple-touch-icon", sizes_ "180x180", href_ "/static/icons/apple-touch-icon.png"] + link_ [rel_ "icon", type_ "image/png", sizes_ "32x32", href_ "/static/icons/favicon-32x32.png"] + link_ [rel_ "icon", type_ "image/png", sizes_ "16x16", href_ "/static/icons/favicon-16x16.png"] + link_ [rel_ "manifest", href_ "/static/icons/site.webmanifest"] + link_ [rel_ "mask-icon", href_ "/static/icons/safari-pinned-tab.svg", color_ "#5bbad5"] + meta_ [name_ "msapplication-TileColor", content_ "#da532c"] + meta_ [name_ "theme-color", content_ "#ffffff"] + title_ (text title) script_ [type_ "module"] $! do @@ -54,7 +64,6 @@ header = do meta_ [name_ "description", content_ "A package repository for the Haskell ecosystem"] ogTags theme - link_ [rel_ "icon", href_ "/static/favicon.svg", type_ "image/svg+xml"] -- link_ [rel_ "canonical", href_ $! getCanonicalURL assigns] meta_ [name_ "twitter:dnt", content_ "on"]