Commit Graph

18 Commits

Author SHA1 Message Date
Jeffrey Morgan 4ddfc22245 Merge branch 'jmorgan-merge-restyle' of github.com:kitematic/kitematic into jmorgan-merge-restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-06 12:09:04 -05:00
Jeffrey Morgan cb9a1b4f7f Better spinners 2015-02-06 12:08:42 -05:00
Sean Li 37d8801f4f Added KI logo. 2015-02-05 22:07:26 -08:00
Sean Li e7f3a55933 Restyle. 2015-02-05 21:55:47 -08:00
Sean Li c5973426ec Minor UI tweaks on mini logs. 2015-02-05 21:44:17 -08:00
Sean Li 6e6594e045 Improved container home page. 2015-02-05 21:41:16 -08:00
Jeffrey Morgan 74d5598526 Removing some log statements 2015-02-05 23:14:16 -05:00
Sean Li dec735515a Folder widget and recommended images. 2015-02-05 11:47:27 -08:00
Sean Li 72c976d326 Homepage styling. 2015-02-04 17:45:26 -08:00
Sean Li f28e8c6df4 Home page skeleton. 2015-02-04 13:24:07 -08:00
Sean Li a3e09c305a Fixed animation not syncing bug and added container icon. 2015-02-04 12:54:43 -08:00
Sean Li d6d436939b Grid implementation. 2015-02-04 12:44:48 -08:00
Sean Li 88dca22e1e Merge branch 'master' into restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-03 17:32:11 -08:00
Sean Li d3627561a1 Made default page working. 2015-02-03 16:29:15 -08:00
Jeffrey Morgan 46ae968100 WIP beta 2015-02-03 17:45:16 -05:00
Sean Li e4c535f9fb Added stricter lint standard. 2015-02-03 14:11:27 -08:00
Sean Li 9e068acfea Merge branch 'master' into restyle
Conflicts:
	app/ContainerDetails.react.js
	app/ContainerModal.react.js
	app/styles/main.less
2015-02-03 12:58:34 -08:00
Jeffrey Morgan 5f164ccca9 Removing gulp dependency, making file hierarchy easier to understand. 2015-01-30 13:21:51 -05:00