From 8c55cfcebf96292a8f1fed15be6371a8fe179c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Wed, 16 Jun 2021 10:29:54 +0200 Subject: [PATCH 1/5] Add devcontainer (#1247) --- .devcontainer/devcontainer.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..bcd20a4c7 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,27 @@ +// https://github.com/microsoft/vscode-dev-containers/tree/v0.183.0/containers/python-3 +{ + "name": "ESPHome - docs", + "image": "mcr.microsoft.com/vscode/devcontainers/python:0-3.6", + "postCreateCommand": "pip3 install -r requirements.txt", + "forwardPorts": [8000], + "settings": { + "python.pythonPath": "/usr/local/bin/python", + "python.languageServer": "Pylance", + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", + "python.formatting.blackPath": "/usr/local/py-utils/bin/black", + "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", + "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", + "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", + "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", + "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", + "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", + "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" + }, + + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance" + ] +} From ea49078810ec4215a2785d560186925f27e19b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Wed, 16 Jun 2021 10:47:49 +0200 Subject: [PATCH 2/5] Fallback to the beta branch if ref is missing (#1249) --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 99f18abd3..c6bacd6f1 100644 --- a/Makefile +++ b/Makefile @@ -21,14 +21,16 @@ help: api: mkdir -p _build/html/api @if [ ! -d "$(ESPHOME_PATH)" ]; then \ - git clone --branch $(ESPHOME_REF) https://github.com/esphome/esphome.git $(ESPHOME_PATH); \ + git clone --branch $(ESPHOME_REF) https://github.com/esphome/esphome.git $(ESPHOME_PATH) || \ + git clone --branch beta https://github.com/esphome/esphome.git $(ESPHOME_PATH); \ fi ESPHOME_PATH=$(ESPHOME_PATH) doxygen Doxygen netlify-api: netlify-dependencies mkdir -p _build/html/api @if [ ! -d "$(ESPHOME_PATH)" ]; then \ - git clone --branch $(ESPHOME_REF) https://github.com/esphome/esphome.git $(ESPHOME_PATH); \ + git clone --branch $(ESPHOME_REF) https://github.com/esphome/esphome.git $(ESPHOME_PATH) || \ + git clone --branch beta https://github.com/esphome/esphome.git $(ESPHOME_PATH); \ fi ESPHOME_PATH=$(ESPHOME_PATH) ../doxybin/doxygen Doxygen From 6694ce4d866f95653a6a5faac3528cadf6c94019 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 16 Jun 2021 12:51:32 +0200 Subject: [PATCH 3/5] Turn guide cards around (#1252) --- _static/custom.css | 42 +++++++++++++++++++++++++++++------------- index.rst | 32 ++++++++++++++++---------------- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/_static/custom.css b/_static/custom.css index c0b666de4..ef557e160 100644 --- a/_static/custom.css +++ b/_static/custom.css @@ -37,7 +37,7 @@ table.docutils { } 100% { visibility: visible; -} + } } @keyframes blink_effect { 0% { @@ -57,14 +57,14 @@ table.docutils { bottom: 0; right: 0; width: 100%; - background-color: rgba(20,20,20,0.8); + background-color: rgba(20, 20, 20, 0.8); min-height: 26px; font-size: 14px; color: #ccc; line-height: 26px; padding: 8px 0 8px 30px; z-index: 9999; - display: none + display: none; } .footer-button-container { margin: 0 60px 0 10px; @@ -118,7 +118,6 @@ div.index-shields { margin-right: auto; } - .guide-container { margin: 32px 0; display: flex; @@ -126,18 +125,16 @@ div.index-shields { } .guide-card { - color: #004B6B; + color: #004b6b; display: block; height: auto; width: 300px; background-color: #f3f6f6; border-radius: 8px; - box-shadow: -10px 10px 32px -12px #000; + box-shadow: 4px 4px 8px -4px #00000075; padding-bottom: 8px; -} - -.guide-card:not(:first-child) { - margin-left: -40px; + box-sizing: border-box; + transition: all 0.5s; } .guide-card-title { @@ -152,14 +149,33 @@ div.index-shields { white-space: pre-line; } +@media screen and (min-width: 870px) { + .guide-card:first-child { + z-index: 100; + } + .guide-card:nth-child(2) { + z-index: 50; + } + + .guide-card:not(:first-child) { + margin-left: -40px; + padding-left: 40px; + } + + .guide-card:not(:first-child):hover { + margin-left: -20px; + padding-left: 20px; + } +} @media screen and (max-width: 870px) { - .guide-container { - flex-direction: column-reverse; + .guide-container { + flex-direction: column; } .guide-card { width: 100%; margin: 8px 0; + padding: 0px; } .guide-card:not(:first-child) { margin-left: 0; @@ -167,4 +183,4 @@ div.index-shields { .guide-card ul { margin-left: 32px; } -} \ No newline at end of file +} diff --git a/index.rst b/index.rst index e272547a0..f17c3e2f6 100644 --- a/index.rst +++ b/index.rst @@ -17,27 +17,27 @@ ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configu
-

Keeping up

+

Getting started

                 esphome:
-                  name: Awesome
+                  name: awesome
                   platform: ESP32
                   board: nodemcu-32s
@@ -68,23 +68,23 @@ ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configu
-

Getting started

+

Keeping up

From ca8d5c7cc6f22fef2c70ae1aa72b16341e4802e6 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 16 Jun 2021 14:49:34 +0200 Subject: [PATCH 4/5] Remove min width from body for mobile (#1253) --- _static/custom.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_static/custom.css b/_static/custom.css index ef557e160..740516145 100644 --- a/_static/custom.css +++ b/_static/custom.css @@ -9,6 +9,10 @@ div.document { margin-bottom: 50px; } +div.body { + min-width: initial; +} + img.component-image { border: none; vertical-align: middle; From 061b7eef6e6e618d53ee9010a243147a0c433d84 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 16 Jun 2021 17:17:06 +0200 Subject: [PATCH 5/5] Remove hover animation from guide card (#1254) --- _static/custom.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_static/custom.css b/_static/custom.css index 740516145..d6723c9d8 100644 --- a/_static/custom.css +++ b/_static/custom.css @@ -138,7 +138,6 @@ div.index-shields { box-shadow: 4px 4px 8px -4px #00000075; padding-bottom: 8px; box-sizing: border-box; - transition: all 0.5s; } .guide-card-title { @@ -165,11 +164,6 @@ div.index-shields { margin-left: -40px; padding-left: 40px; } - - .guide-card:not(:first-child):hover { - margin-left: -20px; - padding-left: 20px; - } } @media screen and (max-width: 870px) {