4906bb17a2
add space
2024-03-15 11:28:43 +03:00
2f7287e5ba
Changed "let" to "const", adding spaces & add "const"
2024-03-15 11:25:13 +03:00
f61ea18f77
Removed unused function
2024-03-15 01:13:27 +03:00
2e959124ee
Change ID button
2024-03-15 01:11:22 +03:00
ff0a630aea
Replacing icon "keyboard_arrow" with "filter_alt" in the hide filter button on the console
2024-03-15 01:07:19 +03:00
b70ff30b29
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 00:56:24 +03:00
305a1485cc
Merge pull request #3864 from IgorA100/patch-19
...
Fix page console
2024-03-14 16:44:21 -04:00
736ac7dd33
Merge pull request #3866 from IgorA100/patch-21
...
Eliminate possible duplication of horizontal scrollbar
2024-03-14 16:43:35 -04:00
e1baa78ac2
Merge pull request #3867 from IgorA100/patch-22
...
Fix live view style (watch page)
2024-03-14 16:42:47 -04:00
ae74a19168
remove class "h-100" because interfere with proper scaling
2024-03-14 22:48:58 +03:00
60811d43c5
Fix live view style (watch page)
...
A slight violation of style, incl. vertical scroll bar with sticky enabled
2024-03-14 22:30:47 +03:00
0c49884956
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-14 12:43:47 -04:00
56fcd8472e
Fix motion events having cause continuous. Fixes #3858
2024-03-14 11:54:15 -04:00
62ba0bf903
Add duration to hints for EVENT_CLOSE_MODE and use alternate regexp for pattern
2024-03-14 11:54:15 -04:00
0dc54b6adf
Eliminate possible duplication of horizontal scrollbar
...
All management occurs inside the #options & #sidebar containers
2024-03-14 16:01:15 +03:00
6cd5fac11b
For #contentButtons add margin-bottom: 8px;
...
Now the vertical margin will be symmetrical.
2024-03-14 11:58:30 +03:00
e10bb3610a
Fix previous commit
2024-03-14 11:54:50 +03:00
91955b491d
Remove class "pt-2"
...
The ".contentButtons" style will be changed in the CSS
2024-03-14 11:50:51 +03:00
dee7a27a97
Merge pull request #3865 from IgorA100/patch-20
...
Fis style in Options page
2024-03-13 17:53:41 -04:00
38ae631dbe
Fix space
2024-03-14 00:11:28 +03:00
37756fb5f9
Added DIV to offset vertical scrollbar to left
2024-03-13 20:59:31 +03:00
cf92914c60
Update options.css
2024-03-13 20:51:23 +03:00
b10511fb97
Adjusting the vertical scroll bar when using sticky
2024-03-13 20:50:25 +03:00
66364c7c32
Fis style in Options page
...
* Why extra padding at top?
padding-top: 2rem;
*/
I don't know the answer, because... I didn't add it :)
Before my edit, it was generally “4rem”; it seemed like a lot to me, so I halved it.
I didn’t clean it up completely because I was careful not to break something completely.
I understood why. If the <form> does not have buttons at the top, then there will be no padding between the form and the "id="optionsContainer" (for example the "Storage" section).
For now, so be it.
2024-03-13 19:13:52 +03:00
6b8fe26be6
empty line
2024-03-13 16:26:25 +03:00
510d60e931
Merge branch 'master' into patch-19
2024-03-13 16:24:45 +03:00
ef3245fe2b
Moved class "pt-2" in other DIV
...
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
1d81af50b9
Fixing table header when using sticky
2024-03-13 16:07:22 +03:00
452576ad5e
Fix: change class "table-responsive-sm-2" to "table-responsive"
...
And always specify the object ID before its class
2024-03-13 15:57:44 +03:00
649b459630
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:48:24 -04:00
4d8a357bba
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:47:31 -04:00
538db9946a
Merge pull request #3863 from IgorA100/patch-18
...
Code cleaned & added table header background in events
2024-03-13 08:44:22 -04:00
6a20a3a482
Fix scrool bar
...
You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do not need a scroll bar.
Also, the scroll bar must be used only in case of stickiness, otherwise there will be duplication of scroll bars in the absence of stickiness.
2024-03-13 15:38:47 +03:00
83d64e8442
Fix style for sticky navbar & sticky table header
2024-03-13 13:49:47 +03:00
fc23cef16a
Code cleaned & added table header background
2024-03-13 13:33:15 +03:00
6ccf0c66a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-12 21:45:07 -04:00
2ba7369ea8
hack to fix scroll bars in bootstrap table
2024-03-12 21:45:02 -04:00
07153f6773
Don't set snap score when skipping frames. Don't exit alarms when we havn't done motion detection. As a result, alarm_frame_count shouldn't cause immediate alarm anymore and because we aren't clearing prealarm frames, event recording should start
2024-03-12 21:22:58 -04:00
be202719c3
Appease eslint
2024-03-12 21:22:50 -04:00
bc044f38d9
Only put scrollbar on console contents if needed. Fixes double scroll bar when not sticky navbar
2024-03-12 17:57:50 -04:00
95d2e0a27c
Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row.
2024-03-12 17:53:27 -04:00
f926e98283
Temp fix to put scroll bars back
2024-03-12 09:12:53 -04:00
855da2cbc4
Put back scroll bars on console
2024-03-12 08:55:44 -04:00
657cda18ef
Put back style permitting scrolling to work
2024-03-12 08:44:12 -04:00
ae20617c53
Merge pull request #3862 from IgorA100/patch-17
...
Fix: video scaling on console
2024-03-12 08:18:07 -04:00
625e699e32
Fix: video scaling on console
...
Close #3861
2024-03-12 11:44:29 +03:00
65c2331394
Feat: added functions for controlling the visibility of blocks when clicking on the control button
2024-03-10 23:19:19 +03:00
20e1ae2090
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-10 11:04:10 -04:00
3f9bda4f80
FIx arrap_map => array_map. Fixes #3859
2024-03-10 11:03:03 -04:00
3939bcec22
Fix eslint
2024-03-10 11:02:28 -04:00
IgorA100
Isaac Connor
Isaac Connor