Skip to content

Commit

Permalink
Merge pull request #153 from marksie1988/dev
Browse files Browse the repository at this point in the history
⭐ 🐛 📝 v1.8.5
  • Loading branch information
marksie1988 authored May 29, 2020
2 parents 8fe821d + 40cab1b commit dfcce3f
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 83 deletions.
4 changes: 2 additions & 2 deletions dist/atomic-calendar-revive.js

Large diffs are not rendered by default.

26 changes: 22 additions & 4 deletions docs/options/calendar-mode-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,40 @@ parent: Configuration Options
nav_order: 4
---

## Config Options

| Name | Type | Since | Description |
| ---------------------- | :-----: | :----: | ----------------------------------------------------------------------------------------------------- |
| enableModeChange | boolean | v0.7.0 | `false` Set true to enable mode change (Calendar/Events) must have "name" set to toggle |
| defaultMode | integer | v0.7.0 | `1` Set `1` to make Events default mode, set `2` to make Calendar mode default |
| firstDayOfWeek | integer | v0.7.0 | `1` First day of week, default 1 for Monday |
| calEventHolidayColor | string | v0.7.0 | `red` Color of day for `type: holiday` calendar |
| calEventIcon1 | string | v0.7.0 | `mdi:gift` Icon for `type: icon1` calendar |
| calEventIcon1Color | string | v0.7.0 | `primary color` Color of icon for `type: icon1` calendar |
| calEventIcon1Filter | string | v0.7.0 | `null` List of comma separated keywords |
| calEventIcon2 | string | v0.7.0 | `mdi:home` Icon for `type: icon2` calendar |
| calEventIcon2Color | string | v0.7.0 | `primary color` Color of icon for `type: icon2` calendar |
| calEventIcon2Filter | string | v0.7.0 | `null` List of comma separated keywords |
| calEventIcon3 | string | v0.7.0 | `mdi:star` Icon for `type: icon3` calendar |
| calEventIcon3Color | string | v0.7.0 | `primary color` Color of icon for `type: icon3` calendar |
| calEventIcon3Filter | string | v0.7.0 | `null` List of comma separated keywords |
| showLastCalendarWeek | boolean | v0.7.5 | `false` If true it will always show 6 lines. If false, the 6th line won't be displayed if not needed. |
| calEventTime | bool | v1.5.0 | `false` If true the time will be shown on the event summary for the selected day |
| disableCalEventLink | bool | v1.5.0 | `false` If true the link will be disabled on the event summary for the selected day |
| disableCalLocationLink | bool | v1.5.0 | `false` If true the link will be disabled on the event location icon for the selected day |

## Color Options

If you don't set colors, default theme colors will be used. If you use automatic night/day modes, don't use manual color settings.

| Name | Type | Since | Description |
| ----------------------------- | :----: | :----: | -------------------------------------------------------------------------------- |
| calEventHolidayColor | string | v0.7.0 | `red` Color of day for `type: holiday` calendar |
| calEventIcon1Color | string | v0.7.0 | `primary color` Color of icon for `type: icon1` calendar |
| calEventIcon2Color | string | v0.7.0 | `primary color` Color of icon for `type: icon2` calendar |
| calEventIcon3Color | string | v0.7.0 | `primary color` Color of icon for `type: icon3` calendar |
| calGridColor | string | v1.3.0 | `rgba(86, 86, 86, .35)` color of calendar grid border |
| calEventBackgroundColor | string | v1.3.0 | `rgba(86, 100, 86, .35)` background color of todays calendar date |
| calEventSatColor | string | v1.3.0 | `rgba(86, 86, 86, .05)` Sets Saturday to a different color |
| calEventSunColor | string | v1.3.0 | `rgba(255, 255, 255, .15)` Sets Sunday to a different color |
| calActiveEventBackgroundColor | string | v1.4.0 | `rgba(86, 128, 86, .35)` Sets selected day to different color |
| defaultCalColor | string | v1.5.0 | `primary text color` Sets the default calendar color if not set under the entity |
| calDayColor | string | v1.6.0 | `primary text color` Sets the calendar day number color |
| calWeekDayColor | string | v1.6.0 | `primary text color` Sets the weekday title color in calendar mode |
| calDateColor | string | v1.6.0 | `primary text color` Sets the date selector color in calendar mode |
6 changes: 6 additions & 0 deletions docs/options/entity-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ nav_order: 2
| blacklist | string | v0.7.9 | `null` List of comma separated blacklisted keywords. Events containing any of them will not be shown. |
| whitelist | string | v1.1.0 | `null` List of comma separated whitelisted keywords. Only events containing any of them will be shown. |
| eventCalName | string | v1.2.0 | `null` Add a calendar name to be shown with event. |

## Color Options

| Name | Type | Since | Description |
| ----- | :----: | :----: | ----------------------------------- |
| color | string | v1.5.0 | `defaultCalColor` Color of calendar |
33 changes: 33 additions & 0 deletions docs/options/event-mode-options.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
layout: default
title: Event Mode Options
parent: Configuration Options
nav_order: 3
---

## Config Options

| Name | Type | Since | Description |
| -------------------- | :-----: | :----: | --------------------------------------------------------------------------------------------------- |
| showCurrentEventLine | boolean | v0.3.0 | `false` Show line before next event. Don't enable when showProgressBar is true - will look bad |
| showProgressBar | boolean | v0.5.5 | `true` Show event progress with moving icon. Don't enable when showCurrentEventLine - will look bad |

## Color Options

If you don't set colors, default theme colors will be used. If you use automatic night/day modes, don't use manual color settings.

| Name | Type | Since | Description |
| ------------------- | :-----: | :----: | ----------------------------------------------------------------- |
| eventBarColor | string | v0.3.0 | `default color` Color of line showing next event |
| dateColor | string | v0.3.0 | `primary text color` Color of date (left side) |
| dateSize | integer | v0.3.0 | `90` Date text size (percent of default font) |
| timeColor | string | v0.3.0 | `primary color` Color of time (under the event title) |
| timeSize | integer | v0.3.0 | `90` Time text size (percent of default font) |
| eventTitleColor | string | v0.3.0 | `primary text color` Color of event title |
| eventTitleSize | integer | v0.3.0 | `100` Event title text size (percent of default font) |
| dayWrapperLineColor | string | v0.3.0 | `primary text color` Color of line - days separate |
| progressBarColor | string | v0.5.5 | `default color` Color of progress bar |
| descColor | string | v0.8.4 | `primary text color` Description of date (left side) |
| descSize | integer | v0.8.4 | `80` Description text size (percent of default font) |
| eventCalNameColor | string | v1.2.0 | `primary text color` color of `eventCalName` if set |
| eventCalNameSize | integer | v1.2.0 | `90` text size of `eventCalName` if set (percent of default font) |
13 changes: 0 additions & 13 deletions docs/options/event-options.md

This file was deleted.

13 changes: 13 additions & 0 deletions docs/options/main-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,17 @@ nav_order: 1
| showCalNameInEvent | string | optional | ? | `false` Shows the event calendar name |
| showFullDayProgress | string | optional | v1.7.0 | `false` Enables the progress bar for full day events |

# Color Options

| Name | Type | Since | Description |
| -------------------- | :-----: | :----: | :---------------------------------------------------------------------------------: |
| locationLinkColor | string | v0.3.0 | `primary text color` Color of location link (right side) |
| locationTextSize | integer | v0.3.0 | `90` Location text size (percent of default font) |
| locationIconColor | string | v0.3.0 | `primary text color` Color of location icon |
| hideFinishedEvents | boolean | v0.9.0 | `false` Don't display finished events |
| dimFinishedEvents | boolean | v0.3.0 | `true` Apply filters to finished events (configured below) |
| finishedEventOpacity | float | v0.3.0 | `0.6` Opacity level of finished events |
| finishedEventFilter | string | v0.3.0 | `grayscale(100%)` additional css filter to of finished events (default - greyscale) |
| nameColor | string | v1.6.0 | `primary text color` Sets the card name color |

[googlecalcomp]: https://www.home-assistant.io/components/calendar.google/
47 changes: 0 additions & 47 deletions docs/options/theme-options.md

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "atomic-calendar-revive",
"version": "1.8.1",
"version": "1.8.5",
"description": "Calendar Card for Home Assistant",
"main": "atomic-calendar-revive.js",
"scripts": {
Expand Down
Loading

0 comments on commit dfcce3f

Please sign in to comment.