101 Commits

Author	SHA1	Message	Date
Isaac Connor	6f6eacaa72	fixup classic and dark skins	2017-01-30 21:45:48 -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	35148008b6	make img an inline-block so that it continues having space, even when is a broken link	2017-01-18 21:14:15 -05:00
Isaac Connor	5ae34a7561	Merge branch 'master' into storageareas	2017-01-02 09:39:10 -05:00
Andy Bauer	254fcbcef7	update gpl 2 mailing address in source files	2016-12-26 09:23:16 -06: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	4defad1352	Merge branch 'add_scale_to_frame_view' into storageareas	2016-10-26 14:04:43 -04:00
Isaac Connor	c74cc54ac0	add a scale element to the frame view. Include some bits from StorageAreas to make it work	2016-10-26 13:34:30 -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
Isaac Connor	060988c05c	set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding	2016-05-31 16:02:37 -04:00
Isaac Connor	1ce2e597cf	fix body top padding	2016-05-12 20:00:37 -04:00
Isaac Connor	e9d8b7925a	Merge branch 'db_reconnect' into storageareas	2016-05-10 11:13:09 -04:00
Isaac Connor	e4171855bb	add padding for nabar to body	2016-05-07 18:12:31 -04:00
Isaac Connor	dcdefac48a	fix styles in header, move footer back into header	2016-05-06 16:08:32 -04:00
Isaac Connor	2ccefdb23c	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 15:30:25 -04:00
Isaac Connor	f4df9e053d	port sidebar css over from classic to flat	2016-05-06 15:30:10 -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	238a25a302	Merge branch 'master' into iconnor_video	2016-04-05 09:38:59 -04:00
Isaac Connor	564f189416	Merge branch 'always_show_ptz' into storageareas	2016-04-04 16:45:54 -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
Isaac Connor	e5a36c02bd	Merge remote-tracking branch 'origin/master' into video_remote	2016-03-30 16:55:24 -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	d3755611c5	Merge pull request #1247 from bodegard/master ... Corrected DB update version comments, fixed typos, and skin font modification	2016-02-04 11:54:02 -05:00
SteveGilvarry	7301e803ed	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2016-01-30 15:45:08 +11:00
Brandon Odegard	54a11175ff	Reduce default size of body font in Flat skin	2016-01-22 13:56:41 -06:00
Brandon Odegard	1ca9ace84d	Fixed missing semicolons	2016-01-22 13:31:02 -06:00
Isaac Connor	53bd342f85	remove Google open Sans external import	2016-01-08 09:46:14 -05:00
SteveGilvarry	d8494aba2d	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h src/zm_remote_camera_rtsp.h web/skins/classic/views/monitor.php	2015-10-23 22:07:22 +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
Dmitry Smirnov	333e7ec67b	header typo corrections	2015-09-19 17:39:54 +10:00
Pliable Pixels	a6f296d84e	Grey color for disabled buttons	2015-08-25 12:29:40 -04:00
SteveGilvarry	b3313edde0	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ... Conflicts: web/skins/classic/views/event.php	2015-03-21 23:49:56 +11:00
ljack	e9384d445a	fix .upBtn and .downBtn also for "flat" css	2015-02-25 18:10:40 +02:00
ljack	8616fdb33d	fix import path	2015-02-25 18:09:23 +02:00
ljack	6233432559	fix import path	2015-02-25 18:08:41 +02:00
Isaac Connor	c3f96ad8ca	fix path to the zone point gif	2015-02-19 11:11:01 -05:00
SteveGilvarry	79c82ea880	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-02-17 23:16:42 +11:00
SteveGilvarry	ada53bbb28	Testing videojs for video playback	2015-02-16 19:43:13 +11:00
Isaac Connor	2328ae8792	remove 50% width so that header auto-fits	2015-01-28 14:05:29 -05:00
Isaac Connor	5abc58ea14	Merge pull request #620 from SteveGilvarry/11-php-short-tags ... Replace PHP Short Open Tags - Fixes #11 Works for me too.	2014-12-08 14:39:24 -05:00
Isaac Connor	2c1e4a9965	fix the paths so that the ptzControls are visible	2014-12-08 10:34:25 -05:00
SteveGilvarry	e87e69fa57	Ran script to replace all Short open tags	2014-12-05 10:44:23 +11:00
Isaac Connor	f57f903aa6	Add views subdir	2014-12-01 16:10:01 -05:00
Isaac Connor	82c01479c6	move flat css files into the classic skin. ... remove autotools references to the flat skin, add the classic/flat css dirs remove the flat skin	2014-12-01 15:44:01 -05:00