Commit Graph

120 Commits

Author SHA1 Message Date
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 6a0c6cd4f2 Merge branch 'show_other_zones' into storageareas 2016-08-02 13:54:01 -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
root 479ea17ed5 fix event menubars 2016-04-16 15:13:18 -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 498bceae0a remove styles for svg circles 2016-04-08 13:44:20 -04:00
Isaac Connor 22f207602b add css for the svg zones 2016-04-08 13:43:00 -04:00
Isaac Connor 34bfbb4708 blah 2016-04-08 13:18:13 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor f91ff4503a rework the ptz controls to take up less vertical space, also don't set width of buttons 2016-04-04 13:20:04 -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
Brandon Odegard 1ca9ace84d Fixed missing semicolons 2016-01-22 13:31:02 -06: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
Dmitry Smirnov 333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Robin Daermann e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Robin Daermann 651cffd3b5 Small color corrections in tabList 2015-07-27 10:07:01 +02:00
Robin Daermann 5588406570 Add dark CSS for classic view 2015-07-27 09:53:59 +02:00