Merge branch 'current' into next

This commit is contained in:
Franck Nijhof 2019-12-11 18:49:47 +01:00
commit d6aed6e1a0
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
15 changed files with 1942 additions and 123 deletions

View File

@ -100,9 +100,9 @@ social:
# Home Assistant release details # Home Assistant release details
current_major_version: 0 current_major_version: 0
current_minor_version: 102 current_minor_version: 103
current_patch_version: 3 current_patch_version: 0
date_released: 2019-11-29 date_released: 2019-12-11
# Either # or the anchor link to latest release notes in the blog post. # Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it. # Must be prefixed with a # and have double quotes around it.

View File

@ -10,9 +10,15 @@ $header-subtitle-font-family: $heading-font-family !default;
.heading { .heading {
font-family: $heading-font-family; font-family: $heading-font-family;
} }
.sans { font-family: $sans; } .sans {
.serif { font-family: $serif; } font-family: $sans;
.mono { font-family: $mono; } }
.serif {
font-family: $serif;
}
.mono {
font-family: $mono;
}
body > header h1 { body > header h1 {
font-size: 2.2em; font-size: 2.2em;
@ -37,8 +43,13 @@ h1 {
} }
@media only screen and (min-width: 992px) { @media only screen and (min-width: 992px) {
body { font-size: 1.15em; } body {
h1 { font-size: 2.6em; line-height: 1.2em; } font-size: 1.15em;
}
h1 {
font-size: 2.6em;
line-height: 1.2em;
}
} }
#{headings()} { #{headings()} {
@ -47,65 +58,157 @@ h1 {
margin-bottom: 1em; margin-bottom: 1em;
font-weight: bold; font-weight: bold;
} }
h2, section h1 { h2,
section h1 {
font-size: 1.5em; font-size: 1.5em;
} }
h3, section h2, section section h1 { h3,
section h2,
section section h1 {
font-size: 1.3em; font-size: 1.3em;
} }
h4, section h3, section section h2, section section section h1 { h4,
section h3,
section section h2,
section section section h1 {
font-size: 1em; font-size: 1em;
} }
h5, section h4, section section h3 { h5,
font-size: .9em; section h4,
section section h3 {
font-size: 0.9em;
} }
h6, section h5, section section h4, section section section h3 { h6,
font-size: .8em; section h5,
section section h4,
section section section h3 {
font-size: 0.8em;
} }
p, article blockquote, ul, ol { margin-bottom: 1.5em; } p,
article blockquote,
ul { list-style-type: disc; ul,
ul { list-style-type: circle; margin-bottom: 0px; ol {
ul { list-style-type: square; margin-bottom: 0px; }}} margin-bottom: 1.5em;
ol { list-style-type: decimal;
ol { list-style-type: lower-alpha; margin-bottom: 0px;
ol { list-style-type: lower-roman; margin-bottom: 0px; }}}
ul, ol { &, ul, ol { margin-left: 1.3em; }}
ul, ol { ul, ol { margin-bottom: 0em; }}
strong { font-weight: bold; }
em { font-style: italic; }
sup, sub { font-size: 0.75em; position: relative; display: inline-block; padding: 0 .2em; line-height: .8em;}
sup { top: -.5em; }
sub { bottom: -.5em; }
a[rev='footnote']{ font-size: .75em; padding: 0 .3em; line-height: 1; }
q { font-style: italic;
&:before { content: "\201C"; }
&:after { content: "\201D"; }
} }
em, dfn { font-style: italic; } ul {
list-style-type: disc;
ul {
list-style-type: circle;
margin-bottom: 0px;
ul {
list-style-type: square;
margin-bottom: 0px;
}
}
}
strong, dfn { font-weight: bold; } ol {
list-style-type: decimal;
ol {
list-style-type: lower-alpha;
margin-bottom: 0px;
ol {
list-style-type: lower-roman;
margin-bottom: 0px;
}
}
}
del, s { text-decoration: line-through; } ul,
ol {
&,
ul,
ol {
margin-left: 1.3em;
}
}
ul,
ol {
ul,
ol {
margin-bottom: 0em;
}
}
abbr, acronym { border-bottom: 1px dotted; cursor: help; } strong {
font-weight: bold;
}
pre, code, tt { @extend .mono; } em {
font-style: italic;
}
hr { margin-bottom: 0.2em; } sup,
sub {
font-size: 0.75em;
position: relative;
display: inline-block;
padding: 0 0.2em;
line-height: 0.8em;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.5em;
}
small { font-size: .8em; } a[rev="footnote"] {
font-size: 0.75em;
padding: 0 0.3em;
line-height: 1;
}
big { font-size: 1.2em; } q {
font-style: italic;
&:before {
content: '"';
}
&:after {
content: '"';
}
}
em,
dfn {
font-style: italic;
}
strong,
dfn {
font-weight: bold;
}
del,
s {
text-decoration: line-through;
}
abbr,
acronym {
border-bottom: 1px dotted;
cursor: help;
}
pre,
code,
tt {
@extend .mono;
}
hr {
margin-bottom: 0.2em;
}
small {
font-size: 0.8em;
}
big {
font-size: 1.2em;
}
article blockquote { article blockquote {
$bq-margin: 1.2em; $bq-margin: 1.2em;
@ -114,11 +217,21 @@ article blockquote {
font-size: 1.2em; font-size: 1.2em;
line-height: 1.5em; line-height: 1.5em;
padding-left: 1em; padding-left: 1em;
border-left: 4px solid rgba($text-color-light, .5); border-left: 4px solid rgba($text-color-light, 0.5);
cite { cite {
font-style: italic; font-style: italic;
a { color: $text-color-light !important; word-wrap: break-word; } a {
&:before { content: '\2014'; padding:{right: .3em; left: .3em;} color: $text-color-light; } color: $text-color-light !important;
word-wrap: break-word;
}
&:before {
content: "\2014";
padding: {
right: 0.3em;
left: 0.3em;
}
color: $text-color-light;
}
} }
@media only screen and (min-width: 992px) { @media only screen and (min-width: 992px) {
padding-left: 1.5em; padding-left: 1.5em;
@ -138,7 +251,7 @@ article blockquote {
/* Pull out to the right, modular scale based margins. */ /* Pull out to the right, modular scale based margins. */
float: right; float: right;
width: 45%; width: 45%;
margin: .5em 0 1em 1.5em; margin: 0.5em 0 1em 1.5em;
/* Baseline correction */ /* Baseline correction */
position: relative; position: relative;
@ -150,7 +263,7 @@ article blockquote {
.pullquote-left:before { .pullquote-left:before {
/* Make left pullquotes align properly. */ /* Make left pullquotes align properly. */
float: left; float: left;
margin: .5em 1.5em 1em 0; margin: 0.5em 1.5em 1em 0;
} }
/* @extend this to force long lines of continuous text to wrap */ /* @extend this to force long lines of continuous text to wrap */
@ -161,4 +274,3 @@ article blockquote {
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
} }

View File

@ -6,11 +6,10 @@
* If English quotes are set in `_vars.scss`, define them here. * If English quotes are set in `_vars.scss`, define them here.
*/ */
@if $english-quotes == true { @if $english-quotes == true {
$open-quote: \201C; $open-quote: '"';
$close-quote: \201D; $close-quote: '"';
} }
/** /**
* Big up @boblet: html5doctor.com/blockquote-q-cite * Big up @boblet: html5doctor.com/blockquote-q-cite
*/ */
@ -31,12 +30,10 @@ q{
} }
q:before { q:before {
content:"\201C"; content: '"';
content:open-quote;
} }
q:after { q:after {
content:"\201D"; content: '"';
content:close-quote;
} }
} }
@ -66,7 +63,6 @@ blockquote{
} }
} }
/** /**
* *
<blockquote> <blockquote>

View File

@ -1,7 +1,6 @@
$meta-color: lighten($text-color, 20%); $meta-color: lighten($text-color, 20%);
article { article {
blockquote { blockquote {
@extend .clearfix; @extend .clearfix;
border-left: 2px solid $primary-color; border-left: 2px solid $primary-color;
@ -24,7 +23,8 @@ article {
} }
} }
.pullquote-left::before, .pullquote-right::before { .pullquote-left::before,
.pullquote-right::before {
@media only screen and (max-width: $palm-end) { @media only screen and (max-width: $palm-end) {
border-top: 1px dotted $primary-color; border-top: 1px dotted $primary-color;
border-bottom: 1px dotted $primary-color; border-bottom: 1px dotted $primary-color;
@ -60,7 +60,9 @@ article {
a { a {
color: $meta-color; color: $meta-color;
text-decoration: none; text-decoration: none;
&:hover {text-decoration: underline;} &:hover {
text-decoration: underline;
}
} }
} }
} }

View File

@ -1,6 +1,7 @@
--- ---
title: "ATEN Rack PDU" title: "ATEN Rack PDU"
description: "Instructions on how to integrate ATEN Rack PDUs into Home Assistant." description: "Instructions on how to integrate ATEN Rack PDUs into Home Assistant."
logo: aten.png
ha_category: ha_category:
- Switch - Switch
ha_release: 0.103 ha_release: 0.103

View File

@ -1,6 +1,7 @@
--- ---
title: "flume" title: "flume"
description: "Documentation about the flume sensor." description: "Documentation about the flume sensor."
logo: flume.jpg
ha_category: ha_category:
- Sensor - Sensor
ha_iot_class: Cloud Polling ha_iot_class: Cloud Polling

View File

@ -324,7 +324,7 @@ The following conditions are available by device:
<div class='note warning'> <div class='note warning'>
This feature is not designed to transfer your Home Assistant to a security system, neither Home Assistant nor Nest be liable to You for damages, This feature is not designed to transform your Home Assistant into a security system, neither Home Assistant nor Nest be liable to You for damages,
or consequential damages of any character arising as a result of use this feature. or consequential damages of any character arising as a result of use this feature.
This feature does not depend on the [Nest Secure alarm system](https://nest.com/alarm-system/overview/) and is not a reflection of the status of that system, This feature does not depend on the [Nest Secure alarm system](https://nest.com/alarm-system/overview/) and is not a reflection of the status of that system,

View File

@ -76,5 +76,5 @@ monitored_conditions:
total_download: total_download:
description: Total bandwidth upload (Grace + Used) (gigabytes). description: Total bandwidth upload (Grace + Used) (gigabytes).
used_remaining: used_remaining:
description: Remaining bandwidth calucated from used and supplied total bandwidth (gigabytes). description: Remaining bandwidth calculated from used and supplied total bandwidth (gigabytes).
{% endconfiguration %} {% endconfiguration %}

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB