Sercan Yemen a55a4d8eb0 Merge branch 'master' of https://github.com/withinpixels/fuse2 ... # Conflicts: # src/app/main/ui/colors/colors.component.html + Simplified color.scss by re-defining the hue variable depending on its value + Page layouts & apps colors		2017-07-31 12:15:56 +03:00
..
colors	Merge branch 'master' of https://github.com/withinpixels/fuse2	2017-07-31 12:15:56 +03:00
page-layouts	removed paddings from page-layouts + fixed apps paddings + page layouts coloring	2017-07-31 11:49:43 +03:00
ui.module.ts	camelCaseToDash pipe added,	2017-07-29 14:12:19 +03:00