2 Commits

Author	SHA1	Message	Date
Charles Hacskaylo	6868bfd4e1	[Merge] Resolve conflicts in open155 ... open #155 Conflicts: platform/commonUI/general/res/sass/user-environ/_layout.scss platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css platform/commonUI/themes/snow/res/sass/_constants.scss	2015-10-26 13:20:26 -07:00
Charles Hacskaylo	f23f127207	[Frontend] Markup and CSS for Time Controller ... WTD-1219 Markup, CSS, etc. for time controller; New template .html file; Rebuilt from open-master and ue-frontend branches;	2015-06-02 19:29:57 -07:00