Skip to content

Commit

Permalink
Merge branch 'release/v2018.12.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
renemarc committed Dec 19, 2018
2 parents 9a6af52 + da13252 commit c22c044
Show file tree
Hide file tree
Showing 138 changed files with 5,816 additions and 2,149 deletions.
2 changes: 1 addition & 1 deletion .HA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.72.1
0.84.3
43 changes: 43 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#
# Code Climate Quality configuration file
#
# Helps keep code and documentation clean.
#
# @link https://docs.codeclimate.com/
#

version: 2

# Configure built-in checks
checks:
argument-count:
enabled: false
file-lines:
enabled: false
identical-code:
enabled: false
method-lines:
enabled: false
similar-code:
enabled: false

# Enable community plugins
plugins:
eslint:
enabled: true
fixme:
enabled: true
git-legal:
enabled: true
markdownlint:
enabled: true
shellcheck:
enabled: true

# Exclude non-original content
exclude_patterns:
- "**/*.dash"
- "appdaemon/custom_widgets/"
- "custom_components/"
- "custom_ui_update.sh"
- "www/custom_ui"
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
As a **actor**, I want **something** so that I can **goal**.

### Acceptance criteria
1. It's done when .
1. It's done when .

1. It's done when **criteria**.
2. It's done when **criteria**.

### Additional details
-

- **detail**
- **detail**
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/BUG_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
### Description


### Scenario
1.
1.

### Expected result
1. When **situation**
2. When **situation**

### Expected result

### Actual result
2 changes: 0 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
### Short description of what this resolves


### Changes proposed in this pull request


### Fixes issue number
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ secrets.yaml
!.github
!.gitignore
!.gitkeep
!/.codeclimate.yml
!/.HA_VERSION
!/.mdlrc
!/.travis.yml
5 changes: 5 additions & 0 deletions .mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Markdownlint configuration
#

style "./markdownlint.rb"
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
#
# Travis CI configuration
#
# Simply tests that Home Assistant configuration is valid.
#
# @link https://home-assistant.io/docs/ecosystem/backup/backup_github/#step-7-configuration-file-testing
#

language: python

python:
- "3.6"

before_install:
- cp secrets-dummy.yaml secrets.yaml
- touch home-assistant_v2.db
- touch home-assistant.log
- HA_VERSION=$(<.HA_VERSION)

install:
- pip3 install homeassistant
- pip3 install homeassistant==${HA_VERSION}

script:
- hass --script check_config -c . -f
288 changes: 171 additions & 117 deletions README.md

Large diffs are not rendered by default.

29 changes: 25 additions & 4 deletions appdaemon/README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
# AppDaemon 3.0 configuration
<!-- Header -->
[link-profile]:https://github.com/renemarc
[link-repo]:https://github.com/renemarc/home-assistant-config

<a name="top"></a>
<code>[renemarc][link-profile] / **[home-assistant-config][link-repo]** / **appdaemon** /</code>

<p align="right"><sub><strong><a href="https://github.com/renemarc/home-assistant-config">🏠 Home Assistant configuration for a smart-looking place! 😎</a><br>Be sure to <a href="#" title="star">⭐️</a> this repo!</strong></sub></p>

<!-- Hero -->
<figure>
<div align="center">
<a href="#-dashboards" title="Dashboards"><img src="../www/screenshots/dashboard-all.gif" alt="Dashboards in rotation"></a>
</div>
</figure>

<h1 align="center">AppDaemon configuration</h1>

## Folders

### [`📂 ./apps/`](apps)

Empty, to be used for eventual AppDaemon apps.


### [`🌈 ./custom_css/`](custom_css/modern)

For the **Modern** theme.


### [`🔘 ./custom_widgets/`](custom_widgets)

For third-party, custom and modified dashboard widgets.


### [`🖼 ./dashboards/`](dashboards)

For the dashboards used in HADashboard.

<p align="right"><a href="#top" title="Back to top">🔝</a></p>

## Files

Expand All @@ -31,3 +45,10 @@ AppDaemon configuration file.
### [`🔑 ./secrets-dummy.yaml`](secrets-dummy.yaml)

Placeholder file for sensitive information, to be copied to `secrets.yaml` and modified according to the target environment.

<!-- Footer -->
<p align="right"><a href="#top" title="Back to top">🔝</a></p>

<p align="center"><strong>Don't forget to <a href="#" title="star">⭐️</a> this repo! 😃</strong></p>

[🏠 Home][link-repo]
37 changes: 36 additions & 1 deletion appdaemon/custom_css/modern/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
# AppDaemon _Modern_ custom theme
<!-- Header -->
[link-profile]:https://github.com/renemarc
[link-repo]:https://github.com/renemarc/home-assistant-config

<a name="top"></a>
<code>[renemarc][link-profile] / **[home-assistant-config][link-repo]** / [appdaemon](../..) / [custom_css](..) / **modern** /</code>

<p align="right"><sub><strong><a href="https://github.com/renemarc/home-assistant-config">🏠 Home Assistant configuration for a smart-looking place! 😎</a><br>Be sure to <a href="#" title="star">⭐️</a> this repo!</strong></sub></p>

<!-- Hero -->
<figure>
<div align="center">
<a href="#files" title="Switchboard using the Modern theme"><img src="../../../www/screenshots/dashboard-switchboard.gif" alt="Switchboard"></a>
</div>
</figure>

<h1 align="center">AppDaemon <em>modern</em> custom theme</h1>

This theme is based very closely on the [default](https://github.com/home-assistant/appdaemon/tree/master/appdaemon/assets/css/default) one, except with some minor tweaks to the CSS and extra classes and variables to support [`/appdaemon/custom_widgets/`](../../custom_widgets).

## Files

### [`🌈️ ./dashboard.css`](dashboard.css)

Cascading Style Sheets that define the overall look.

### [`❓ ./variables.yaml`](variables.yaml)

Main theme file containing variables for [`/appdaemon/custom_widgets/`](../../custom_widgets), as well as motion monitor JavaScript code for [Fully Kiosk Browser](http://www.ozerov.de/fully-kiosk-browser/) that issues a POST API query that creates and updates an ad hoc binary sensor.

<!-- Footer -->
<p align="right"><a href="#top" title="Back to top">🔝</a></p>

<p align="center"><strong>Don't forget to <a href="#" title="star">⭐️</a> this repo! 😃</strong></p>

[🔙 Back to `/appdaemon/`](../../)

[🏠 Home][link-repo]
99 changes: 60 additions & 39 deletions appdaemon/custom_css/modern/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ img, object {
iframe {
max-width: 100%;
}

table {
border-collapse: collapse;
border-spacing: 0;
Expand Down Expand Up @@ -83,7 +83,7 @@ input {
}

.dashboard_main {
margin: 0px auto;
margin: 0px auto;
}

.gridster {
Expand Down Expand Up @@ -120,7 +120,7 @@ input {

.iframe {
position: relative;
overflow: hidden;
overflow: hidden;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;}
Expand All @@ -147,57 +147,78 @@ input {
.icon-active {
color: #aaff00;
}



#container {
padding-top: 0px;
}

.modalDialog {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0,0,0,0.8);
z-index: 9999;
opacity:0;
-webkit-transition: opacity 400ms ease-in;
-moz-transition: opacity 400ms ease-in;
transition: opacity 400ms ease-in;
pointer-events: none;
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0,0,0,0.8);
z-index: 9999;
opacity:0;
-webkit-transition: opacity 400ms ease-in;
-moz-transition: opacity 400ms ease-in;
transition: opacity 400ms ease-in;
pointer-events: none;
}

.modalDialogOpen {
opacity:0.95;
pointer-events: auto;
opacity:0.95;
pointer-events: auto;
}

.modalDialogClose {
opacity:0;
pointer-events: none;
opacity:0;
pointer-events: none;
}

.modalDialog > div {
width: 275px;
position: relative;
margin: 3% auto;
padding: 5px 20px 13px 20px;
border-radius: 10px;
width: 275px;
position: relative;
margin: 3% auto;
padding: 5px 20px 13px 20px;
border-radius: 10px;
}

.modalDialogCloseButton {
line-height: 50px;
position: absolute;
right: -25px;
text-align: center;
top: -20px;
width: 50px;
text-decoration: none;
font-weight: bold;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
border-radius: 25px;
}

.modalDialogCloseButton:hover { background: #444; }
line-height: 50px;
position: absolute;
right: -25px;
text-align: center;
top: -20px;
width: 50px;
text-decoration: none;
font-weight: bold;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
border-radius: 25px;
}

.modalDialogCloseButton:hover { background: #444; }

.loader {
display: none;
border: 3px solid #f3f3f3;
border-radius: 50%;
border-top: 3px solid #00aaff;
width: 10px;
height: 10px;
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}

@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}

@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
Loading

0 comments on commit c22c044

Please sign in to comment.