Fix merge issues...again
This commit is contained in:
@@ -3698,94 +3698,6 @@ views:
|
||||
card_type: media-player
|
||||
entity: media_player.basement_tv
|
||||
name: TV
|
||||
- type: entities
|
||||
entities:
|
||||
- type: custom:paper-buttons-row
|
||||
buttons:
|
||||
- entity: input_boolean.recliner_mode
|
||||
layout: icon|name_state
|
||||
name: Recliner Mode
|
||||
state_icons:
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
- entity: input_boolean.basement_studio_entertainment_control
|
||||
layout: icon|name_state
|
||||
name: Entertainment
|
||||
state_icons:
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
state_color: true
|
||||
show_header_toggle: false
|
||||
- type: entities
|
||||
entities:
|
||||
- type: custom:paper-buttons-row
|
||||
buttons:
|
||||
- entity: fan.basement_fan
|
||||
name: Fan
|
||||
layout: icon|name_state
|
||||
state_icons:
|
||||
'on': mdi:fan
|
||||
'off': mdi:fan-off
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
- entity: input_boolean.do_not_enter_basement_studio
|
||||
name: Do Not Enter
|
||||
layout: icon|name_state
|
||||
state_icons:
|
||||
'on': mdi:minus-circle
|
||||
'off': mdi:minus-circle-off-outline
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
- entity: input_boolean.studio_quiet
|
||||
name: Quiet
|
||||
layout: icon|name_state
|
||||
state_icons:
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
- entity: input_boolean.gaming_mode
|
||||
name: Gaming
|
||||
layout: icon|name_state
|
||||
state_icons:
|
||||
unavailable: mdi:map-marker-question
|
||||
state:
|
||||
case: first
|
||||
state_color: true
|
||||
show_header_toggle: false
|
||||
- type: custom:versatile-thermostat-ui-card
|
||||
entity: climate.basement_studio_vtherm
|
||||
powerEntity: sensor.basement_studio_heater_power
|
||||
theme: classic
|
||||
disable_name: true
|
||||
allow_lock_toggle: true
|
||||
disable_auto_fan_infos: true
|
||||
- type: custom:mushroom-select-card
|
||||
entity: input_select.basement_studio_scenes
|
||||
layout: horizontal
|
||||
name: Scenes
|
||||
secondary_info: none
|
||||
- type: custom:mushroom-select-card
|
||||
entity: select.basement_led_strip_1_theme
|
||||
layout: horizontal
|
||||
name: LED Strip Theme
|
||||
secondary_info: none
|
||||
- type: glance
|
||||
show_name: true
|
||||
show_icon: true
|
||||
show_state: true
|
||||
show_last_changed: false
|
||||
show_attribute: true
|
||||
attribute: app_name
|
||||
force_icon: false
|
||||
hide:
|
||||
play_pause_button: false
|
||||
volume_button: false
|
||||
power_button: false
|
||||
card_layout: large
|
||||
- type: custom:bubble-card
|
||||
card_type: separator
|
||||
name: Environment
|
||||
@@ -3810,35 +3722,6 @@ views:
|
||||
- condition: state
|
||||
entity: input_boolean.basement_studio_heat_allowed
|
||||
state: 'on'
|
||||
- type: custom:bubble-card
|
||||
card_type: button
|
||||
button_type: state
|
||||
entity: switch.basement_studio_heater
|
||||
name: Heater Running
|
||||
show_attribute: false
|
||||
tap_action:
|
||||
action: none
|
||||
double_tap_action:
|
||||
action: none
|
||||
hold_action:
|
||||
action: none
|
||||
button_action:
|
||||
tap_action:
|
||||
action: none
|
||||
double_tap_action:
|
||||
action: none
|
||||
hold_action:
|
||||
action: none
|
||||
styles: |-
|
||||
.bubble-button-background {
|
||||
opacity: 1 !important;
|
||||
background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
|
||||
}
|
||||
visibility:
|
||||
- condition: state
|
||||
entity: input_boolean.basement_studio_heat_allowed
|
||||
state: 'on'
|
||||
card_layout: large
|
||||
- type: custom:bubble-card
|
||||
card_type: button
|
||||
button_type: switch
|
||||
@@ -4029,6 +3912,9 @@ views:
|
||||
name: Sync Issue
|
||||
- entity: input_button.basement_led_strip_reset
|
||||
name: LED Strip Reset
|
||||
column_span: 1
|
||||
background:
|
||||
opacity: 20
|
||||
- type: grid
|
||||
cards:
|
||||
- type: heading
|
||||
|
||||
Reference in New Issue
Block a user