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.

Sign up for GitHub

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

Jump to bottom

Chore (optimization): Moved styles for Control button block in the Stream image to global skin.css #4123

Merged
merged 5 commits into from
Aug 27, 2024
Merged

Chore (optimization): Moved styles for Control button block in the Stream image to global skin.css #4123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3ecec0
Moved here styles for Control button block in the Stream image (skin.…
IgorA100 Aug 23, 2024
0ade8d6
Moved styles for Control button block in the Stream image to global s…
IgorA100 Aug 23, 2024
4d50977
Moved styles for Control button block in the Stream image to global s…
IgorA100 Aug 23, 2024
7002f11
Moved styles for Control button block in the Stream image to global s…
IgorA100 Aug 23, 2024
713b8f8
Added style for buttons (skin.css)
IgorA100 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 67 additions & 1 deletion web/skins/classic/css/base/skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ ul.nav.nav-pills.flex-column {

#mfbpanel {
width: calc(100% - 25px);
float: left;
float: left;
}

.chosen {
Expand Down Expand Up @@ -1118,6 +1118,72 @@ html::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb, nav::-webkit-scroll
}
}

/* +++ Control button block in the Stream image*/
.block-button-center {
position: absolute;
left: 35%;
right: 35%;
top: 2px;
z-index: 10;
}

button.btn.btn-zoom-out {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
left: 3px;
top: 3px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-zoom-in {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
right: 3px;
top: 3px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-view-watch,
button.btn.btn-edit-monitor,
button.btn.btn-fullscreen {
padding: 0;
background-color: rgba(150,150,150,0.5);
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-zoom-out:focus,
button.btn.btn-zoom-in:focus,
button.btn.btn-view-watch:focus,
button.btn.btn-edit-monitor:focus {
outline: 0;
box-shadow: none;
}

button.btn.btn-zoom-out:hover,
button.btn.btn-zoom-in:hover,
button.btn.btn-edit-monitor:hover,
button.btn.btn-view-watch:hover {
background-color: darkgrey;
}
/* --- Control button block in the Stream image*/

/* +++ This block should always be located at the end! */
.hidden {
display: none;
Expand Down
62 changes: 0 additions & 62 deletions web/skins/classic/css/base/views/event.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,72 +355,10 @@ svg.zones {
z-index: 1000;
}

button.btn.btn-zoom-out {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
left: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-zoom-in {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
right: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-edit-monitor {
padding: 0;
background-color: rgba(150,150,150,0.5);
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-view-watch, button.btn.btn-fullscreen, .ratioControl {
display: none;
}

.block-button-center {
position: absolute;
left: 35%;
right: 35%;
top: 2px;
z-index: 10;
}

button.btn.btn-zoom-out:focus,
button.btn.btn-zoom-in:focus,
button.btn.btn-view-watch:focus,
button.btn.btn-edit-monitor:focus {
outline: 0;
box-shadow: none;
}

button.btn.btn-zoom-out:hover,
button.btn.btn-zoom-in:hover,
button.btn.btn-edit-monitor:hover,
button.btn.btn-view-watch:hover {
background-color: darkgrey;
}

/*Video.js override*/
.vjs-tech {
pointer-events: auto;
Expand Down
64 changes: 0 additions & 64 deletions web/skins/classic/css/base/views/montage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,34 +83,6 @@
fill: #0000FF;
}

button.btn.btn-zoom-out {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
left: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-zoom-in {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
right: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

.ratioControl{
padding: 0;
background-color: rgba(150,150,150,0.5);
Expand All @@ -124,42 +96,6 @@ button.btn.btn-zoom-in {
min-width: 130px;
}

button.btn.btn-view-watch, button.btn.btn-edit-monitor, button.btn.btn-fullscreen {
padding: 0;
background-color: rgba(150,150,150,0.5);
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

.block-button-center {
position: absolute;
left: 50px;
right: 50px;
top: 2px;
z-index: 10;
}

button.btn.btn-zoom-out:focus,
button.btn.btn-zoom-in:focus,
button.btn.btn-view-watch:focus,
button.btn.btn-fullscreen:focus,
button.btn.btn-edit-monitor:focus {
outline: 0;
box-shadow: none;
}

button.btn.btn-zoom-out:hover,
button.btn.btn-zoom-in:hover,
button.btn.btn-view-watch:hover,
button.btn.btn-fullscreen:hover,
button.btn.btn-edit-monitor:hover {
background-color: darkgrey;
}

.grid-stack-item-content.modeEditingMonitor {
cursor: crosshair;
}
Expand Down
62 changes: 0 additions & 62 deletions web/skins/classic/css/base/views/watch.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,72 +193,10 @@ body.sticky #content {
transform-origin: 100% 00%;
}

button.btn.btn-zoom-out {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
left: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-zoom-in {
padding: 0;
background-color: rgba(150,150,150,0.5);
position: absolute;
right: 2px;
top: 2px;
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-edit-monitor {
padding: 0;
background-color: rgba(150,150,150,0.5);
z-index: 10;
text-shadow:
-1px -1px 0 #575757,
1px -1px 0 #575757,
-1px 1px 0 #575757,
1px 1px 0 #575757;
}

button.btn.btn-view-watch, button.btn.btn-fullscreen, .ratioControl {
display: none;
}

.block-button-center {
position: absolute;
left: 35%;
right: 35%;
top: 2px;
z-index: 10;
}

button.btn.btn-zoom-out:focus,
button.btn.btn-zoom-in:focus,
button.btn.btn-view-watch:focus,
button.btn.btn-edit-monitor:focus {
outline: 0;
box-shadow: none;
}

button.btn.btn-zoom-out:hover,
button.btn.btn-zoom-in:hover,
button.btn.btn-edit-monitor:hover,
button.btn.btn-view-watch:hover {
background-color: darkgrey;
}

/* +++ Support for old ZoomPan algorithm */
.form-check.control-use-old-zoom-pan {
display: inline-block;
Expand Down