Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Bootstrap to 5.2.3 / improved 'video live preview' on smartphones #336

Merged
merged 3 commits into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions assets/webconfig/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/webconfig/css/dialog.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

191 changes: 3 additions & 188 deletions assets/webconfig/css/hyperhdr.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,11 @@ body {

/* drag and resizable modal http://gijgo.com/ */
body:not(.dark-mode) .modal-header.gj-draggable{
background-color:#1d9ef0 !important;
display: block;
background-color:#1d9ef0 !important;
}

.dark-mode .modal-header.gj-draggable{
background-color:#0c78bd !important;
display: block;
}

.modal-title > .fa.fa-fw.fa-television{
Expand All @@ -115,6 +113,7 @@ body:not(.dark-mode) #ledsim_dialog{
border-style: solid !important;
border-top-left-radius: 6px !important;
border-top-right-radius: 6px !important;
touch-action: none;
}

.dark-mode #ledsim_dialog{
Expand All @@ -123,191 +122,7 @@ body:not(.dark-mode) #ledsim_dialog{
border-style: solid !important;
border-top-left-radius: 6px !important;
border-top-right-radius: 6px !important;
}

.gj-button {
background-color: #f5f5f5;
border: 1px solid #ddd;
color: #000;
border-radius: 3px;
padding: 6px 10px;
cursor: pointer;
}

.gj-unselectable {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

.gj-margin-left-5 {
margin-left: 5px;
}

.gj-margin-left-10 {
margin-left: 10px;
}

.gj-width-full {
width: 100%;
}

.gj-cursor-pointer {
cursor: pointer;
}

.gj-text-align-center {
text-align: center;
}

.gj-font-size-16 {
font-size: 16px;
}

.gj-hidden {
display: none;
}

.gj-mdl-icon-plus::after {
content: "\E145";
}

.gj-mdl-icon-minus::after {
content: "\E15B";
}

.gj-draggable {
cursor: move;
}
.gj-resizable-handle {
position: absolute;
font-size: 0.1px;
display: block;
-ms-touch-action: none;
touch-action: none;
z-index: 90;
}

.gj-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.gj-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.gj-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.gj-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.gj-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.gj-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.gj-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.gj-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}

.gj-dialog-footer {
position: absolute;
bottom: 0px;
width: 100%;
margin-top: 0px;
}

.gj-modal {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1040;
display: none;
overflow: hidden;
-webkit-overflow-scrolling: touch;
outline: 0;
}

.gj-content {
border: 1px solid #999;
background-color: #fff;
border-radius: 6px;
outline: 0;
}

.gj-header {
min-height: 16.43px;
padding: 15px;
border-bottom: 1px solid #e5e5e5;
}

.gj-footer {
min-height: 16.43px;
padding: 15px;
border-top: 1px solid #e5e5e5;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

.gj-title {
margin: 2px;
}

.gj-close {
-webkit-appearance: none;
padding: 0;
cursor: pointer;
background: 0 0;
border: 0;
float: right;
font-size: 21px;
color: #000;
}

.gj-body {
position: relative;
padding: 15px;
touch-action: none;
}

/*////////////////////////////////////////////////////////////////////////*/
Expand Down
4 changes: 3 additions & 1 deletion assets/webconfig/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@

<!-- Custom Fonts -->
<link href="css/font-awesome.min.css" rel="stylesheet" type="text/css" />

<link href="css/dialog.min.css" rel="stylesheet" type="text/css" />

</head>

<body class="sidebar-mini layout-fixed layout-navbar-not-fixed">
Expand Down Expand Up @@ -343,6 +344,7 @@ <h4 data-i18n="dashboard_alert_message_disabled_t" class="bs-main-text"></h4>
<script src="js/wizard.js"></script>

<!--gijgo dialog-->
<script src="js/lib/core.min.js"></script>
<script src="js/lib/draggable.min.js"></script>
<script src="js/lib/dialog.min.js"></script>
<script src="js/ledsim.js"></script>
Expand Down
16 changes: 10 additions & 6 deletions assets/webconfig/js/ledsim.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions assets/webconfig/js/lib/bootstrap.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/webconfig/js/lib/core.min.js

Large diffs are not rendered by default.