OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix invert not applied on f7-icons in badges (#596) 

Reported in https://community.openhab.org/t/openhab-3-0-milestone-4-discussion/109174/125

Signed-off-by: Yannick Schaus <github@schaus.net>
pull/603/head
Yannick Schaus 2020-12-07 14:44:30 +01:00 committed by GitHub
parent 0ad5b1a843
commit e7908dc9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.ui/web/src/components/cards/glance/location/measurement-badge.vue
View File

@ -1,7 +1,7 @@
<template>
<span class="padding-right location-status-badge" v-show="reduce" :class="{ invert: invertColor }">
<oh-icon v-if="config.icon.indexOf('oh:') === 0" :icon="config.icon.replace('oh:', '')" :state="config.state" class="oh-icon-badge" width="20" height="20" />
<f7-icon v-else-if="config.icon.indexOf('f7:') === 0" :f7="config.icon.replace('f7:', '')" :color="config.invertText ? 'black' : 'white'" class="f7-icon-badge" size="20" />
<f7-icon v-else-if="config.icon.indexOf('f7:') === 0" :f7="config.icon.replace('f7:', '')" :color="invertColor ? 'black' : 'white'" class="f7-icon-badge" size="20" />
<!-- <oh-icon v-if="config.icon.indexOf('oh:') === 0 && config.stateOff" v-show="!reduce" icon="config.icon.replace('oh:', '')" :state="config.stateOff" class="oh-icon-badge" width="20" height="20" /> -->
<span class="glance-label" v-show="reduce">{{reduce}} {{config.unit}}</span>
<span class="glance-label" v-show="reduceAux"><small>({{reduceAux}} {{config.unit}})</small></span>

2
bundles/org.openhab.ui/web/src/components/cards/glance/location/status-badge.vue
View File

@ -1,7 +1,7 @@
<template>
<span class="padding-right location-status-badge" v-show="reduce" :class="{ invert: invertColor }">
<oh-icon v-if="config.icon.indexOf('oh:') === 0" :icon="config.icon.replace('oh:', '')" :state="config.state" class="oh-icon-badge" width="20" height="20" />
<f7-icon v-else-if="config.icon.indexOf('f7:') === 0" :f7="config.icon.replace('f7:', '')" :color="config.invertText ? 'black' : 'white'" class="f7-icon-badge" size="20" />
<f7-icon v-else-if="config.icon.indexOf('f7:') === 0" :f7="config.icon.replace('f7:', '')" :color="invertColor ? 'black' : 'white'" class="f7-icon-badge" size="20" />
<!-- <oh-icon v-if="config.icon.indexOf('oh:') === 0 && config.stateOff" v-show="!reduce" icon="config.icon.replace('oh:', '')" :state="config.stateOff" class="oh-icon-badge" width="20" height="20" /> -->
<span class="glance-label" v-show="reduce > 1">{{reduce}}</span>
</span>