Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Commit

Permalink
updated merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ljmerza committed Feb 6, 2019
2 parents 6578a8c + 3c8c827 commit 1cfd6ad
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This custom card can be tracked with the help of [custom-updater](https://github

In your configuration.yaml

```
```yaml
custom_updater:
card_urls:
- https://raw.githubusercontent.com/ljmerza/calendar-card/master/custom_updater.json
Expand All @@ -51,32 +51,32 @@ You should have setup Google calendar integration or Caldav integration in HomeA
<h2>Configuration</h2>
Go to your config directory and create a www folder. Inside the www run

```
```bash
git clone https://github.com/ljmerza/calendar-card.git
```

In your ui-lovelace.yaml

```
```yaml
resources:
- url: /local/calendar-card/calendar-card.js?v=2.0.0
type: js
```

Add the custom card to views:

```
```yaml
views:
- type: custom:calendar-card
title: "My Calendar"
numberOfDays: 14
entities:
- calendar.ljmerzagmailcom
title: "My Calendar"
numberOfDays: 14
entities:
- calendar.ljmerzagmailcom
```

<h2>You want more than 5 Google events?</h2>

```
```bash
mkdir /config/custom_components/calendar
cd /config/custom_components/calendar
wget https://raw.githubusercontent.com/home-assistant/home-assistant/dev/homeassistant/components/calendar/google.py
Expand Down
3 changes: 2 additions & 1 deletion calendar-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class CalendarCard extends LitElement {
.day-wrapper td {
padding-top: 10px;
cursor: pointer;
}
.day-wrapper.day-wrapper-last > td {
Expand Down Expand Up @@ -424,4 +425,4 @@ class CalendarEvent {
let diffInHours = end.diff(start, 'hours');
return diffInHours >= 24;
}
}
}

0 comments on commit 1cfd6ad

Please sign in to comment.