Skip to content

Commit

Permalink
Merge pull request #1025 from lokonli/v3.10-master
Browse files Browse the repository at this point in the history
V3.10 master
  • Loading branch information
lokonli authored Dec 27, 2022
2 parents e5897d9 + 555a67b commit 4b66a10
Show file tree
Hide file tree
Showing 127 changed files with 11,157 additions and 9,133 deletions.
11 changes: 9 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"restructuredtext.updateDelay": 300,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"editor.formatOnSave": false,
"prettier.disableLanguages": ["html", "vue", "markdown"],
Expand All @@ -13,5 +13,12 @@
"css": [],
"html": ["htm", "html"]
},
"python.pythonPath": "/bin/python3"
"python.pythonPath": "/bin/python3",
"restructuredtext.languageServer.disabled": true,
"svg.preview.background": "white",
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"esbonio.server.enabled": false,
"esbonio.sphinx.confDir": "${workspaceFolder}/docs"
}
6 changes: 6 additions & 0 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

82 changes: 17 additions & 65 deletions css/creative.css
Original file line number Diff line number Diff line change
@@ -1,63 +1,11 @@
@import url('./plugins.css');
@import url('./helpers.css');
#loaderHolder {
position: absolute;
width: 100%;
height: 100%;
background-color: #000;
z-index: 99999;
text-align: center;
}

.loader {
margin: 0 auto;
border: 10px solid #f3f3f3;
border-top: 10px transparent;
border-bottom: 10px transparent;
border-radius: 50%;
width: 320px;
height: 320px;
animation: pulsate 2s ease-out;
animation-iteration-count: infinite;
}

@keyframes pulsate {
0% {
transform: scale(0.1);
opacity: 0;
}
50% {
opacity: 1;
}
100% {
transform: scale(0.8);
opacity: 0;
}
}

.loaderHeader {
color: #fff;
font-size: 1.5em;
margin-top: 50px;
}

#hide {
color: white;
font-size: 200%;
width: 100%;
margin: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
}

.dt-container {
width: 100%;
}

.swiper-container {
.swiper {
height: 100%;
}

Expand Down Expand Up @@ -912,10 +860,6 @@ body {
overflow: hidden;
}

body {
font-size: 11px;
}

hr {
border-color: #fff;
border-width: 2px;
Expand Down Expand Up @@ -2547,7 +2491,7 @@ canvas {
}

.cal_table td>div.historic>div {
color: rgba(255, 255, 255, 0.3) !important;
color: rgba(255, 255, 255, 0.3);
}

.cal_table td>div.header {
Expand All @@ -2561,17 +2505,17 @@ canvas {

.cal_table td>div.event:hover,
.cal_table td>div.event.historic:hover>div {
background-color: #f0ad4e !important;
color: #292b2c !important;
background-color: #f0ad4e;
color: #292b2c;
}

.cal_table td>div.allday {
background-color: #d9534f !important;
background-color: #d9534f;
border-radius: 2px;
}

.cal_table td>div.allday.hol {
background-color: #428442 !important;
background-color: #428442;
border-radius: 2px;
}

Expand Down Expand Up @@ -3644,9 +3588,9 @@ canvas {
}

.dial-center.on {
-webkit-box-shadow: 0 0 1vh 0 var(--dial-rgba);
-moz-box-shadow: 0 0 1vh 0 var(--dial-rgba);
box-shadow: 0 0 1vh 0 var(--dial-rgba);
-webkit-box-shadow: 0 0 0 0.7em var(--dial-rgba);
-moz-box-shadow: 0 0 0 0.7em var(--dial-rgba);
box-shadow: 0 0 0 0.7em var(--dial-rgba);
}

.dial-flash {
Expand Down Expand Up @@ -4176,10 +4120,18 @@ canvas {
color: yellow;
}

.middle .icon {
font-size: unset
}

.middle .text {
font-size: 90%
}

.dialupdown .up .text, .dialupdown .down .text {
font-size:250%
}


/* END: DIAL */

Expand Down
59 changes: 59 additions & 0 deletions css/loader.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
@import url('./bootstrap.min.css');
#loaderHolder {
position: absolute;
width: 100%;
height: 100%;
background-color: #000;
z-index: 99999;
text-align: center;
}

.loader {
margin: 0 auto;
border: 10px solid #f3f3f3;
border-top: 10px transparent;
border-bottom: 10px transparent;
border-radius: 50%;
width: 320px;
height: 320px;
animation: pulsate 2s ease-out;
animation-iteration-count: infinite;
}

@keyframes pulsate {
0% {
transform: scale(0.1);
opacity: 0;
}
50% {
opacity: 1;
}
100% {
transform: scale(0.8);
opacity: 0;
}
}

.loaderHeader {
color: #fff;
font-size: 1.5em;
margin-top: 50px;
}

#hide {
color: white;
font-size: 200%;
width: 100%;
margin: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
}

body {
font-size: 11px;
}


Binary file modified dist/assets/fonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified dist/assets/fonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified dist/assets/fonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified dist/assets/fonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified dist/assets/fonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified dist/assets/fonts/fa-solid-900.woff2
Binary file not shown.
Binary file added dist/assets/fonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file added dist/assets/fonts/fa-v4compatibility.woff2
Binary file not shown.
300 changes: 150 additions & 150 deletions dist/bundle.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/blocks/domoticzblocks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ Block parameters
- | If the battery level is below ``batteryThreshold`` then a battery icon will be displayed. See :ref:`batterylevel`
| Default value is defined by config['batteryThreshold] (=30)
| ``15``: Only show the battery icon when the battery level is below 15%.
* - hide_title
- | Hide title for selector switch in case parameter hide_title is ``true``, title is ``0`` or title is ``''``


There are several additional parameters for Graphs. See :ref:`dom_graphs`
Expand Down
Loading

0 comments on commit 4b66a10

Please sign in to comment.