Merge branch 'current' into next

This commit is contained in:
Otto Winter 2019-02-17 20:14:26 +01:00
commit 4a7ab166b6
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
9 changed files with 33 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
_static/favicon-128x128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
_static/favicon-192x192.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
_static/favicon-512x512.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -3,12 +3,27 @@
"short_name": "ESPHome",
"icons": [
{
"src": "/_static/android-chrome-192x192.png",
"src": "/_static/favicon-16x16.png",
"sizes": "16x16",
"type": "image/png"
},
{
"src": "/_static/favicon-32x32.png",
"sizes": "32x32",
"type": "image/png"
},
{
"src": "/_static/favicon-128x128.png",
"sizes": "128x128",
"type": "image/png"
},
{
"src": "/_static/favicon-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/_static/android-chrome-512x512.png",
"src": "/_static/favicon-512x512.png",
"sizes": "512x512",
"type": "image/png"
}

View File

@ -1,13 +1,20 @@
{% extends 'alabaster/layout.html' %}
{%- block doctype %}
<!DOCTYPE html>
{% endblock %}
{%- block extrahead %}
{{ super() }}
<link rel="stylesheet" href="{{ pathto('_static/custom.css', 1) }}" type="text/css" />
<link rel="apple-touch-icon" sizes="180x180" href="/_static/apple-touch-icon.png">
<link rel="shortcut icon" href="/_static/favicon.ico">
<link rel="icon" type="image/png" sizes="512x512" href="/_static/favicon-512x512.png">
<link rel="icon" type="image/png" sizes="192x192" href="/_static/favicon-192x192.png">
<link rel="icon" type="image/png" sizes="128x128" href="/_static/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="32x32" href="/_static/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/_static/favicon-16x16.png">
<link rel="manifest" href="/_static/site.webmanifest">
<link rel="mask-icon" href="/_static/safari-pinned-tab.svg" color="#646464">
<link rel="shortcut icon" href="/_static/favicon.ico">
<meta name="apple-mobile-web-app-title" content="ESPHome">
<meta name="application-name" content="ESPHome">
<meta name="msapplication-TileColor" content="#dfdfdf">
@ -16,6 +23,7 @@
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta property="og:site_name" content="ESPHome">
<meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9">
{% endblock %}
{% block footer %}

View File

@ -80,7 +80,7 @@ release = '1.10.1'
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
@ -120,7 +120,6 @@ html_theme_options = {
'sidebar_collapse': True,
'fixed_sidebar': True,
'show_powered_by': False,
'font_size': '1.05em',
}
html_logo = 'images/logo-text.svg'

View File

@ -39,6 +39,9 @@ def create_sitemap(app, exception):
encoding='utf-8',
method="xml")
if os.getenv('PRODUCTION') != 'YES':
with open(os.path.join(app.builder.outdir, 'robots.txt'), 'wt') as f:
with open(os.path.join(app.builder.outdir, 'robots.txt'), 'wt') as f:
if os.getenv('PRODUCTION') != 'YES':
f.write('User-agent: *\nDisallow: /\n')
else:
f.write('User-agent: *\nDisallow: \n\n'
'Sitemap: https://esphome.io/sitemap.xml\n')