Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix evcc name not displayed next to logo by closing fa tags (#502)

Browse source
This commit is contained in:
andig 2020-12-04 14:10:04 +01:00 • committed by GitHub
parent f50e764c18
commit 446936d44e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1310 additions and 1317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/js/app.js
View file

@ -32,7 +32,7 @@ library.add(
faExclamationTriangle
);
Vue.component("font-awesome-icon", FontAwesomeIcon);
Vue.component("fa-icon", FontAwesomeIcon);
const loc = window.location;
axios.defaults.baseURL =

6
assets/js/components/LoadpointDetails.vue
View file

@ -3,17 +3,17 @@
<div class="col-6 col-md-3 mt-3">
<div class="mb-2 value">
Leistung
<font-awesome-icon
<fa-icon
class="text-primary ml-1"
icon="temperature-low"
v-if="state.climater == 'heating'"
/>
<font-awesome-icon
<fa-icon
class="text-primary ml-1"
icon="temperature-high"
v-if="state.climater == 'cooling'"
/>
<font-awesome-icon
<fa-icon
class="text-primary ml-1"
icon="thermometer-half"
v-if="state.climater == 'on'"

4
assets/js/components/MessageToast.vue
View file

@ -2,10 +2,10 @@
<div class="toast" data-delay="10000" v-bind:data-autohide="true">
<div class="toast-header">
<strong class="mr-auto" v-if="item.type != 'warn'"
><font-awesome-icon class="text-danger" icon="exclamation-triangle" /> Error</strong
><fa-icon class="text-danger" icon="exclamation-triangle" /> Error</strong
>
<strong class="mr-auto" v-if="item.type == 'warn'"
><font-awesome-icon class="text-warning" icon="exclamation-triangle" />
><fa-icon class="text-warning" icon="exclamation-triangle" />
Warning</strong
>
<small v-if="item.status">HTTP {{ item.status }}</small>

12
assets/js/components/SiteDetails.vue
View file

@ -2,10 +2,10 @@
<div class="row">
<div class="col-6 col-md-3 mt-3" v-if="state.gridConfigured">
<div class="mb-2 value" v-if="state.gridPower > 0">
Bezug <font-awesome-icon icon="arrow-down" class="text-primary" />
Bezug <fa-icon icon="arrow-down" class="text-primary" />
</div>
<div class="mb-2 value" v-else>
Einspeisung <font-awesome-icon icon="arrow-up" class="text-primary" />
Einspeisung <fa-icon icon="arrow-up" class="text-primary" />
</div>
<h2 class="value">
{{ fmt(state.gridPower) }}
@ -15,7 +15,7 @@
<div class="col-6 col-md-3 mt-3" v-if="state.pvConfigured">
<div class="mb-2 value">
Erzeugung
<font-awesome-icon
<fa-icon
icon="sun"
v-bind:class="{
'text-primary': state.pvPower < 0,
@ -35,12 +35,12 @@
>
<div class="mb-2 value">
Batterie
<font-awesome-icon
<fa-icon
class="text-primary"
icon="arrow-down"
v-if="state.batteryPower < 0"
/>
<font-awesome-icon
<fa-icon
class="text-primary"
icon="arrow-up"
v-if="state.batteryPower > 0"
@ -54,7 +54,7 @@
<div class="col-6 col-md-3 mt-3" v-if="state.batterySoC">
<div class="mb-2 value">
SoC
<font-awesome-icon
<fa-icon
class="text-primary"
icon="battery-three-quarters"
v-bind:class="{

6
assets/js/components/Version.vue
View file

@ -12,8 +12,8 @@
>
<a href="#" class="text-body">
Release notes
<font-awesome-icon icon="chevron-up" v-if="notesShown" />
<font-awesome-icon icon="chevron-down" v-if="!notesShown" />
<fa-icon icon="chevron-up" v-if="notesShown" />
<fa-icon icon="chevron-down" v-if="!notesShown" />
</a>
</b>
<b class="px-3">
@ -23,7 +23,7 @@
"
class="text-body"
>
Download <font-awesome-icon icon="chevron-down" />
Download <fa-icon icon="chevron-down" />
</a>
</b>
<button

2
assets/js/views/App.vue
View file

@ -2,7 +2,7 @@
<div>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="https://github.com/andig/evcc"
><font-awesome-icon icon="leaf" class="text-primary mr-2" />evcc</a
><fa-icon icon="leaf" class="text-primary mr-2"></fa-icon>evcc</a
>
<button
class="navbar-toggler"

18
package-lock.json generated
View file

@ -1169,11 +1169,6 @@
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz",
"integrity": "sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w=="
},
"@fortawesome/fontawesome-free": {
"version": "5.15.1",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.1.tgz",
"integrity": "sha512-OEdH7SyC1suTdhBGW91/zBfR6qaIhThbcN8PUXtXilY4GYnSBbVqOntdHbC1vXwsDnX0Qix2m2+DSU1J51ybOQ=="
},
"@fortawesome/fontawesome-svg-core": {
"version": "1.2.32",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
@ -6294,10 +6289,6 @@
"integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
"dev": true
},
"node-forge": {
"dev": true,
"version": "0.10.0"
},
"node-libs-browser": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@ -6725,7 +6716,7 @@
"json5": "^1.0.1",
"micromatch": "^3.0.4",
"mkdirp": "^0.5.1",
"node-forge": "0.10.0",
"node-forge": "^0.7.1",
"node-libs-browser": "^2.0.0",
"opn": "^5.1.0",
"postcss": "^7.0.11",
@ -6856,7 +6847,10 @@
}
},
"node-forge": {
"version": "0.10.0"
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
"integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
"dev": true
},
"path-key": {
"version": "2.0.1",
@ -9754,4 +9748,4 @@
"dev": true
}
}
}
}

1
package.json
View file

@ -39,7 +39,6 @@
},
"repository": "github:andig/evcc",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/vue-fontawesome": "^2.0.0",

2576
server/assets.go
View file

File diff suppressed because it is too large Load diff