Isaac Connor
|
c46769495b
|
Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
|
2017-10-03 10:18:44 -04:00 |
digital-gnome
|
33a3e04f43
|
Fix class selector
|
2017-10-02 15:40:18 -04:00 |
|
Isaac Connor
|
15ba7d2a35
|
fixes
|
2017-10-02 11:25:51 -04:00 |
|
digital-gnome
|
5f42bf4fe5
|
Change CSS to class, add class to php
I needed the styling for the video.js buttons. The fallback mjpeg player used ids.
|
2017-09-29 21:47:52 -04:00 |
Isaac Connor
|
676c4b7ddc
|
Merge branch 'master' into storageareas
|
2017-08-22 09:52:14 -04:00 |
peruchi
|
d71b30aff3
|
Images Gif to PNG (#1969)
* Images Gif to PNG
Extension change to PNG
* Images Gif to PNG
Extension change to PNG
* Images Gif to PNG
Extension change to PNG
|
2017-08-16 14:51:20 -04:00 |
|
Isaac Connor
|
0e54d4e69a
|
imposing a height on the textpanel causes the text to overflow
|
2017-07-14 09:26:56 -04:00 |
|
Isaac Connor
|
148d7066f9
|
Merge branch 'master' into storageareas
|
2017-07-11 16:15:02 -04:00 |
|
Isaac Connor
|
90882edc31
|
make montage images be display: block; This makes the layout not jump around when a camera feed dies
|
2017-07-07 10:05:20 -04:00 |
|
Isaac Connor
|
75c11431e6
|
deprecate filtersavepopup
|
2017-06-16 11:10:25 -04:00 |
|
Isaac Connor
|
b4bdc1fd6b
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-06-06 20:39:58 -04:00 |
|
Isaac Connor
|
04aa01ba0c
|
add login css files
|
2017-06-05 21:41:39 -04:00 |
|
Isaac Connor
|
0e643f0f93
|
Merge branch 'master' into storageareas
|
2017-05-30 11:58:38 -04:00 |
|
Isaac Connor
|
a75488e0f3
|
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
|
2017-05-30 11:52:04 -04:00 |
|
Isaac Connor
|
7cfa0b12ec
|
Merge branch 'dragndrop_monitor_sorting' into storageareas
|
2017-05-25 15:26:04 -04:00 |
|
Isaac Connor
|
09c0b47568
|
remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows
|
2017-05-25 15:02:30 -04:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
dd4550406f
|
remove styles from montagereview and stick them in a view-specific css
|
2017-03-30 13:03:46 -04:00 |
Isaac Connor
|
7d451e1e41
|
float the scale control right, add css for other skins
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
f3378207c0
|
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
|
2017-01-30 21:16:21 -05:00 |
|
Isaac Connor
|
4fe6b6f8b7
|
set a min width so that small images or fps updates don't cause a reflow
|
2016-11-21 11:39:31 -05:00 |
|
Isaac Connor
|
340b172dc4
|
Merge branch 'add_scale_to_frame_view' into storageareas
|
2016-10-26 14:46:50 -04:00 |
|
Isaac Connor
|
42783b68f9
|
float the scale control right, add css for other skins
|
2016-10-26 14:43:23 -04:00 |
|
Isaac Connor
|
ba7d935a85
|
fix border size of text below the image in montage when alerted.
|
2016-10-12 12:19:04 -04:00 |
|
Isaac Connor
|
8093470a2e
|
make only the editing polygon have a border. Set default for Type when creating a new zone
|
2016-08-02 12:19:55 -04:00 |
|
Isaac Connor
|
2b05815bfa
|
remove set height on the menu bars, fixing flow issues
|
2016-04-15 15:44:35 -04:00 |
|
Isaac Connor
|
22f207602b
|
add css for the svg zones
|
2016-04-08 13:43:00 -04:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
|
Isaac Connor
|
cf5473836e
|
set default border on live streams so that when they alarm they don't jump around
|
2015-10-02 10:04:56 -04:00 |
Robin Daermann
|
e390200824
|
Small dark CSS fixes in frames and timeline view
|
2015-08-17 14:39:41 +02:00 |
|
Robin Daermann
|
5588406570
|
Add dark CSS for classic view
|
2015-07-27 09:53:59 +02:00 |