Skip to content

Commit bf4390e

Browse files
balloobballoob
committed
Merge branch 'master' into next
2 parents 5ad7cdf + de8ce1c commit bf4390e

File tree

58 files changed

+215
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+215
-121
lines changed

‎sass/custom/_paulus.scss

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -299,21 +299,6 @@ p.note {
299299
transition-property: transform, opacity;
300300
}
301301

302-
.filter-button-group {
303-
margin-bottom: 16px;
304-
305-
.btn {
306-
margin-right: 8px;
307-
margin-bottom: 8px;
308-
text-decoration: none;
309-
310-
&.current {
311-
background-color: #3A5561;
312-
background-image: linear-gradient(to bottom, #3A5561,#3F6B7D);
313-
}
314-
}
315-
}
316-
317302
#componentContainer {
318303
a {
319304
display: inline-block;
@@ -365,6 +350,49 @@ p.note {
365350
}
366351
}
367352

353+
@media only screen and (max-width: $lap-end) {
354+
#components-page {
355+
.filter-button-group {
356+
margin-bottom: 16px;
357+
358+
.btn {
359+
display: inline-block;
360+
margin-right: 8px;
361+
margin-bottom: 8px;
362+
363+
&.current {
364+
background-color: #3A5561;
365+
background-image: linear-gradient(to bottom, #3A5561,#3F6B7D);
366+
}
367+
}
368+
}
369+
}
370+
}
371+
372+
@media only screen and (min-width: $desk-start) {
373+
#components-page {
374+
.filter-button-group {
375+
.featured {
376+
margin: 12px 0;
377+
}
378+
379+
.btn {
380+
display: block;
381+
background: 0;
382+
color: black;
383+
box-shadow: none;
384+
text-shadow: none;
385+
padding: 2px;
386+
387+
&.current {
388+
font-weight: bold;
389+
}
390+
}
391+
}
392+
}
393+
}
394+
395+
368396
.aside-module {
369397
.section {
370398
margin-bottom: 16px;

‎source/_components/binary_sensor.template.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
ha_category: Binary Sensor
11+
logo: home-assistant.png
1112
---
1213

1314
The `template` platform supports sensors which breaks out the state and `state_attributes` from other entities.

‎source/_components/downloader.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: home-assistant.png
11-
ha_category: Other
11+
ha_category: Downloading
1212
ha_release: pre 0.7
1313
---
1414

‎source/_components/foursquare.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sharing: true
99
footer: true
1010
logo: foursquare.png
1111
featured: true
12-
ha_category: Other
12+
ha_category: Social
1313
ha_release: 0.26
1414
ha_iot_class: "Cloud Polling and Cloud Push"
1515
---

‎source/_components/media_player.universal.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sidebar: true
77
comments: false
88
sharing: true
99
footer: true
10-
logo:
10+
logo: home-assistant.png
1111
ha_category: Media Player
1212
featured: false
1313
---

‎source/_components/panel_custom.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: home-assistant.png
11-
ha_category: Frontend
11+
ha_category: Front end
1212
ha_release: 0.26
1313
---
1414

‎source/_components/panel_iframe.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: home-assistant.png
11-
ha_category: Frontend
11+
ha_category: Front end
1212
ha_release: 0.25
1313
---
1414

‎source/_components/proximity.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: home-assistant.png
11-
ha_category: Organization
11+
ha_category: Automation
1212
ha_release: 0.13
1313
---
1414

‎source/_components/sensor.bitcoin.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: bitcoin.png
11-
ha_category: Sensor
11+
ha_category: Finance
1212
ha_release: pre 0.7
13+
ha_iot_class: "Cloud Polling"
1314
---
1415

1516

‎source/_components/sensor.cpuspeed.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ sidebar: true
77
comments: false
88
sharing: true
99
footer: true
10-
ha_category: Sensor
10+
ha_category: System Monitor
11+
ha_release: pre 0.7
1112
ha_iot_class: "Local Push"
1213
---
1314

0 commit comments

Comments
 (0)