diff --git a/artwork/LICENSE.rst b/artwork/LICENSE.rst deleted file mode 100644 index 99c58a21..00000000 --- a/artwork/LICENSE.rst +++ /dev/null @@ -1,19 +0,0 @@ -Copyright 2010 Pallets - -This logo or a modified version may be used by anyone to refer to the -Flask project, but does not indicate endorsement by the project. - -Redistribution and use in source (SVG) and binary (renders in PNG, etc.) -forms, with or without modification, are permitted provided that the -following conditions are met: - -1. Redistributions of source code must retain the above copyright - notice and this list of conditions. - -2. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -We would appreciate that you make the image a link to -https://palletsprojects.com/p/flask/ if you use it in a medium that -supports links. diff --git a/artwork/logo-full.svg b/artwork/logo-full.svg deleted file mode 100644 index 8c0748a2..00000000 --- a/artwork/logo-full.svg +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/logo-lineart.svg b/artwork/logo-lineart.svg deleted file mode 100644 index 615260dc..00000000 --- a/artwork/logo-lineart.svg +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/docs/_static/flask-horizontal.png b/docs/_static/flask-horizontal.png new file mode 100644 index 00000000..a0df2c61 Binary files /dev/null and b/docs/_static/flask-horizontal.png differ diff --git a/docs/_static/flask-icon.png b/docs/_static/flask-icon.png deleted file mode 100644 index 55cb8478..00000000 Binary files a/docs/_static/flask-icon.png and /dev/null differ diff --git a/docs/_static/flask-logo.png b/docs/_static/flask-logo.png deleted file mode 100644 index ce236061..00000000 Binary files a/docs/_static/flask-logo.png and /dev/null differ diff --git a/docs/_static/flask-vertical.png b/docs/_static/flask-vertical.png new file mode 100644 index 00000000..d1fd1499 Binary files /dev/null and b/docs/_static/flask-vertical.png differ diff --git a/docs/_static/no.png b/docs/_static/no.png deleted file mode 100644 index 644c3f70..00000000 Binary files a/docs/_static/no.png and /dev/null differ diff --git a/docs/_static/shortcut-icon.png b/docs/_static/shortcut-icon.png new file mode 100644 index 00000000..4d3e6c37 Binary files /dev/null and b/docs/_static/shortcut-icon.png differ diff --git a/docs/_static/yes.png b/docs/_static/yes.png deleted file mode 100644 index 56917ab2..00000000 Binary files a/docs/_static/yes.png and /dev/null differ diff --git a/docs/conf.py b/docs/conf.py index 88a73308..771a7228 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,8 +52,8 @@ html_sidebars = { } singlehtml_sidebars = {"index": ["project.html", "localtoc.html", "ethicalads.html"]} html_static_path = ["_static"] -html_favicon = "_static/flask-icon.png" -html_logo = "_static/flask-icon.png" +html_favicon = "_static/shortcut-icon.png" +html_logo = "_static/flask-vertical.png" html_title = f"Flask Documentation ({version})" html_show_sourcelink = False diff --git a/docs/index.rst b/docs/index.rst index 747749d0..c447bb05 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,10 +3,8 @@ Welcome to Flask ================ -.. image:: _static/flask-logo.png - :alt: Flask: web development, one drop at a time +.. image:: _static/flask-horizontal.png :align: center - :target: https://palletsprojects.com/p/flask/ Welcome to Flask's documentation. Get started with :doc:`installation` and then get an overview with the :doc:`quickstart`. There is also a @@ -16,14 +14,13 @@ complete application with Flask. Common patterns are described in the component of Flask in detail, with a full reference in the :doc:`api` section. -Flask depends on the `Jinja`_ template engine and the `Werkzeug`_ WSGI -toolkit. The documentation for these libraries can be found at: +Flask depends on the `Werkzeug`_ WSGI toolkit, the `Jinja`_ template engine, and the +`Click`_ CLI toolkit. Be sure to check their documentation as well as Flask's when +looking for information. -- `Jinja documentation `_ -- `Werkzeug documentation `_ - -.. _Jinja: https://www.palletsprojects.com/p/jinja/ -.. _Werkzeug: https://www.palletsprojects.com/p/werkzeug/ +.. _Werkzeug: https://werkzeug.palletsprojects.com +.. _Jinja: https://jinja.palletsprojects.com +.. _Click: https://click.palletsprojects.com User's Guide diff --git a/docs/license.rst b/docs/license.rst index f3f64823..a53a98cf 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -1,19 +1,4 @@ -License -======= - -BSD-3-Clause Source License ---------------------------- - -The BSD-3-Clause license applies to all files in the Flask repository -and source distribution. This includes Flask's source code, the -examples, and tests, as well as the documentation. +BSD-3-Clause License +==================== .. include:: ../LICENSE.rst - - -Artwork License ---------------- - -This license applies to Flask's logo. - -.. include:: ../artwork/LICENSE.rst