From c3ecec057acb78d6d185af2eec007879291aa85d Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Fri, 23 Aug 2024 17:12:56 +0300 Subject: [PATCH 1/5] Moved here styles for Control button block in the Stream image (skin.css) --- web/skins/classic/css/base/skin.css | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index dff9f6f51d..6c412e20d8 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -1118,6 +1118,70 @@ 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-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-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; From 0ade8d634ad3899537c3d9dda718e8dd76c90ac9 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Fri, 23 Aug 2024 17:16:54 +0300 Subject: [PATCH 2/5] Moved styles for Control button block in the Stream image to global skin.css from event.css --- web/skins/classic/css/base/views/event.css | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/web/skins/classic/css/base/views/event.css b/web/skins/classic/css/base/views/event.css index a104e308f6..85d5570f10 100644 --- a/web/skins/classic/css/base/views/event.css +++ b/web/skins/classic/css/base/views/event.css @@ -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; From 4d509772748342592ee040c4f7570e1b12606ec4 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Fri, 23 Aug 2024 17:23:04 +0300 Subject: [PATCH 3/5] Moved styles for Control button block in the Stream image to global skin.css from watch.css --- web/skins/classic/css/base/views/watch.css | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/web/skins/classic/css/base/views/watch.css b/web/skins/classic/css/base/views/watch.css index ddf39d6f5e..8793d87709 100644 --- a/web/skins/classic/css/base/views/watch.css +++ b/web/skins/classic/css/base/views/watch.css @@ -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; From 7002f11b7242d3fd02aa1e682080521ddf843d24 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Fri, 23 Aug 2024 17:30:57 +0300 Subject: [PATCH 4/5] Moved styles for Control button block in the Stream image to global skin.css from montage.css --- web/skins/classic/css/base/views/montage.css | 64 -------------------- 1 file changed, 64 deletions(-) diff --git a/web/skins/classic/css/base/views/montage.css b/web/skins/classic/css/base/views/montage.css index 2ffe3c5e98..83094b23d9 100644 --- a/web/skins/classic/css/base/views/montage.css +++ b/web/skins/classic/css/base/views/montage.css @@ -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); @@ -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; } From 713b8f8bce2728dfefb92f7ca92191b0c22c774e Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Fri, 23 Aug 2024 17:34:26 +0300 Subject: [PATCH 5/5] Added style for buttons (skin.css) For montage page: button.btn.btn-view-watch button.btn.btn-fullscreen --- web/skins/classic/css/base/skin.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 6c412e20d8..7230656c16 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -776,7 +776,7 @@ ul.nav.nav-pills.flex-column { #mfbpanel { width: calc(100% - 25px); - float: left; + float: left; } .chosen { @@ -1155,7 +1155,9 @@ button.btn.btn-zoom-in { 1px 1px 0 #575757; } -button.btn.btn-edit-monitor { +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;