Skip to content

Commit

Permalink
Merge pull request #1148 from lokonli/v3.12-master
Browse files Browse the repository at this point in the history
V3.12 master
  • Loading branch information
lokonli authored Jan 26, 2024
2 parents df93e05 + e285ec3 commit bfedfa3
Show file tree
Hide file tree
Showing 76 changed files with 1,497 additions and 1,203 deletions.
6 changes: 3 additions & 3 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ sphinx:
# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt
python:
install:
- requirements: docs/requirements.txt
6 changes: 0 additions & 6 deletions css/bootstrap.min.css

This file was deleted.

164 changes: 102 additions & 62 deletions css/creative.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@
padding: 5px !important;
}

/* dirty fix for group component ... */

.mh.dt_block {
padding-top: 15px !important;
padding-bottom: 15px !important;
}

.mh.dt_block .col-icon {
margin-top: 0px;
}

.dt_column {
flex-direction: column;
}
Expand Down Expand Up @@ -316,9 +327,9 @@ next css sets the default height of the frame popup
}

.btn {
text-transform: none !important;
font-size: 16px !important;
font-weight: 400 !important;
/* text-transform: none !important;*/
font-size: 16px;
font-weight: 400;
}

.btn-secondary {
Expand Down Expand Up @@ -455,6 +466,21 @@ next css sets the default height of the frame popup
.log .items {
height: 100%;
overflow: auto;
width: 100%;
overflow-wrap: anywhere
}

.log table {
width: 100%;
min-height: 5px;
}

.log tbody {
width: 100%
}

.log tr {
width: 100%
}

.modal-popup > div > .log {
Expand Down Expand Up @@ -672,6 +698,42 @@ a.playlist {
margin: auto;
}

.col-dots {
display: flex;
justify-content: center;
align-items: center;
z-index: 10;
position: absolute;
width: 45px;
height: 100%;
right: 0px;
top: 0px;
border: 0px !important;
}

.col-icondata {
width: calc(100% - 45px);
margin: -5px;
padding: 5px;
background: rgba(0, 0, 0, 0.1);
}

.col-icondata.hover {
border: 0px !important;
}

.transbg.longpress::after {
content:"";
float: left;
bottom:0;
left:0;
top:0;
width:100%;
height:100%;
border-right: solid rgba(255,255,255,0.5) 5px;
position: absolute;
}

.btn.plus {}

.btn.min {}
Expand Down Expand Up @@ -773,18 +835,7 @@ a.playlist {
height: 100%;
}

.col-xs-1.block_trafficmap,
.col-xs-2.block_trafficmap,
.col-xs-3.block_trafficmap,
.col-xs-4.block_trafficmap,
.col-xs-5.block_trafficmap,
.col-xs-6.block_trafficmap,
.col-xs-7.block_trafficmap,
.col-xs-8.block_trafficmap,
.col-xs-9.block_trafficmap,
.col-xs-10.block_trafficmap,
.col-xs-11.block_trafficmap,
.col-xs-12.block_trafficmap {
.block_trafficmap {
padding-left: 13px !important;
padding-right: 13px !important;
height: 200px !important;
Expand Down Expand Up @@ -1148,40 +1199,16 @@ p {
clear: both;
}

.transbg.col-xs-1,
.transbg.col-xs-2,
.transbg.col-xs-3,
.transbg.col-xs-4,
.transbg.col-xs-5,
.transbg.col-xs-6,
.transbg.col-xs-7,
.transbg.col-xs-8,
.transbg.col-xs-9,
.transbg.col-xs-10,
.transbg.col-xs-11,
.transbg.col-xs-12 {
.transbg {
padding-top: 15px;
padding-bottom: 15px;
border: 7px solid rgba(255, 255, 255, 0);
background: rgba(0, 0, 0, 0.2);
background-clip: padding-box;
}

.transbg.dark.col-xs-1,
.transbg.dark.col-xs-2,
.transbg.dark.col-xs-3,
.transbg.dark.col-xs-4,
.transbg.dark.col-xs-5,
.transbg.dark.col-xs-6,
.transbg.dark.col-xs-7,
.transbg.dark.col-xs-8,
.transbg.dark.col-xs-9,
.transbg.dark.col-xs-10,
.transbg.dark.col-xs-11,
.transbg.dark.col-xs-12 {
border: 7px solid rgba(255, 255, 255, 0);
.transbg.dark {
background: rgba(0, 0, 0, 0.5);
background-clip: padding-box;
}

.dt_block.popup {
Expand All @@ -1208,19 +1235,7 @@ Only add this hover on NON touch devices
*/

@media (hover: hover) {
/*
.transbg.col-xs-1.hover:hover,
.transbg.col-xs-2.hover:hover,
.transbg.col-xs-3.hover:hover,
.transbg.col-xs-4.hover:hover,
.transbg.col-xs-5.hover:hover,
.transbg.col-xs-6.hover:hover,
.transbg.col-xs-7.hover:hover,
.transbg.col-xs-8.hover:hover,
.transbg.col-xs-9.hover:hover,
.transbg.col-xs-10.hover:hover,
.transbg.col-xs-11.hover:hover,
.transbg.col-xs-12.hover:hover */

html.non-touch .hover:hover{
background: rgba(255, 255, 255, 0.1);
background-clip: padding-box;
Expand Down Expand Up @@ -1263,6 +1278,7 @@ Only add this hover on NON touch devices
--connected-color: green;
}


.col-xs-1,
.col-xs-2,
.col-xs-3,
Expand Down Expand Up @@ -1485,6 +1501,10 @@ img.icon {
opacity: 1 !important;
}

.mixed.icon {
opacity: 1;
}

.blinds .fas.fa-arrow-up,
.blinds .fas.fa-arrow-down,
.blinds .fas.fa-stop-circle {
Expand Down Expand Up @@ -1514,6 +1534,14 @@ img.icon {
.dt_block {
padding: 2px !important;
}

/* dirty fix for group component ... */

.mh.dt_block {
padding-top: 5px !important;
padding-bottom: 5px !important;
}

.dt_title,
.dt_state {
margin: 2px 2px;
Expand Down Expand Up @@ -1707,9 +1735,8 @@ fieldset[disabled] .btn-primary.active {
.btn {
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
font-weight: 700;
text-transform: uppercase;
padding: 0px 5px 0px 5px;
font-size: 10px;
font-size: 120%;
margin-right: 5px;
}

Expand All @@ -1724,12 +1751,6 @@ fieldset[disabled] .btn-primary.active {
margin-right: 2px;
}

@media (max-width: 975px) {
.btn-group .btn {
font-size: 12px !important;
}
}

.btn-group .btn.active {
font-weight: 700;
}
Expand Down Expand Up @@ -3942,6 +3963,17 @@ canvas {
margin: 0;
}

.background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
border-radius: 50%
}
/*needed? Remove for now ...
.dial-switch .switch-face:after {
content: "";
Expand Down Expand Up @@ -4235,6 +4267,14 @@ canvas {
margin-bottom: 10px;
}

.cp-buttons .btn {
width: 4em
}

.colorpicker img {
width: 100%
}

.colorpicker .cp-buttonsOnOff {
background-color: rgba(0, 0, 0, 0.2);
}
Expand Down
59 changes: 0 additions & 59 deletions css/loader.css

This file was deleted.

2 changes: 1 addition & 1 deletion dist/bundle.js

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions dist/bundle.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@
* jquery.ui.mouse.js
*/

/*!
* long-press-event - v@version@
* Pure JavaScript long-press-event
* https://github.com/john-doherty/long-press-event
* @author John Doherty <www.johndoherty.info>
* @license MIT
*/

/*! Hammer.JS - v2.0.7 - 2016-04-22
* http://hammerjs.github.io/
*
Expand Down
Loading

0 comments on commit bfedfa3

Please sign in to comment.