Commit Graph

77 Commits

Author SHA1 Message Date
Henry
2f9fbfef7f More refactoring 2016-07-13 20:33:47 -07:00
Henry
2baca659ca Refactoring 2016-07-13 19:50:58 -07:00
Charles Hacskaylo
e193e3dfba Merge open933 latest, resolve conflicts
Fixes #933
Fair amount of manual fixing in time-conductor.html
2016-07-13 19:16:27 -07:00
Charles Hacskaylo
8214c8e895 Merge open933 latest, resolve conflicts
Fixes #933
Fair amount of manual fixing in time-conductor.html
2016-07-13 19:16:00 -07:00
Charles Hacskaylo
33b2225d10 [Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
2016-07-13 18:48:17 -07:00
Henry
14463d39a8 Added end delta 2016-07-13 18:17:27 -07:00
Charles Hacskaylo
06af84c161 [Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
2016-07-13 13:14:32 -07:00
Henry
fd29473664 Support resize 2016-07-12 15:02:39 -07:00
Henry
97f3fd516b Changed default duration to fifteen minutes 2016-07-12 10:14:26 -07:00
Henry
088416905d Added duration 2016-07-12 10:08:08 -07:00
Henry
2056d87453 Merge branch 'open933-frontend' into open933 2016-07-11 14:27:30 -07:00
Henry
585da38a16 Fixed some merge issues 2016-07-11 13:46:46 -07:00
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2
Fixes #933
Renamed main class; removed unused <style>
defs
2016-07-11 11:35:26 -07:00
Charles Hacskaylo
84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
2016-07-11 11:29:35 -07:00
Henry
11caa8396a Updated modes 2016-07-11 11:18:23 -07:00
Henry
0017b77439 Merged markup changes 2016-07-11 11:06:22 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language; tweak to class name in markup
2016-07-11 11:05:47 -07:00
Charles Hacskaylo
788483ec13 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language
2016-07-11 10:37:08 -07:00
Charles Hacskaylo
7b19f91ce6 [Frontend] Merge latest from open933
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
2016-07-11 10:31:14 -07:00
Henry
5cc81ba12a [Time Conductor] Added mode class to time conductor 2016-07-11 10:26:34 -07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
2016-07-08 17:11:43 -07:00
Henry
4e7b69c4df Enabled fixed and real-time modes 2016-07-08 16:57:50 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
2016-07-08 16:54:49 -07:00
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
2016-07-08 16:54:13 -07:00
Henry
e230b92946 Fixed bug with date selector having to be clicked twice 2016-07-08 15:15:12 -07:00
Henry
58ed500ecf Time sync via conductor 2016-07-07 16:57:03 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -07:00