Commit Graph

92 Commits

Author SHA1 Message Date
mustafahlvc
c4a08dc939 (Contacts App) ongoing 2017-08-02 19:51:02 +03:00
mustafahlvc
ccfd711c03 (Contacts App) layouts issues.. 2017-08-02 13:29:00 +03:00
Sercan Yemen
3dde222528 Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-08-02 13:02:02 +03:00
Sercan Yemen
31c35dd5fa simple layout 3 perfect scrollbar
+ simple layout 3 tweaks
+ added modules to all pages
+ moved some stuff to the SharedModule from AppModule
+ typography page structure
2017-08-02 13:01:55 +03:00
mustafahlvc
7fdd6469c8 fix paths for lazy loaded apps 2017-08-02 12:07:48 +03:00
Sercan Yemen
e5ce8a0e5f koyduk 2017-08-02 11:53:31 +03:00
mustafahlvc
7e33e36162 (Contacts App) start to build on filemanager app.. 2017-08-02 10:51:11 +03:00
mustafahlvc
d7d3a6833d (File Manager App) updated. 2017-08-02 10:18:39 +03:00
mustafahlvc
ba3c22d67d (File Manager App) finished for now. 2017-08-01 19:34:58 +03:00
Sercan Yemen
59e58ce4f8 search page 2017-08-01 17:12:26 +03:00
mustafahlvc
4d477561b7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/app/fuse-fake-db/fuse-fake-db.service.ts
2017-08-01 15:29:59 +03:00
mustafahlvc
9a2acb0e64 (File Manager App) first steps. 2017-08-01 15:27:32 +03:00
Sercan Yemen
e0253cd8d2 invoice pages 2017-08-01 14:56:39 +03:00
Sercan Yemen
1c66ccd9e2 added left sidenav 3 & right sidenav 3
+ page layouts header size modifications
+ page layouts header text alignment
2017-08-01 12:32:25 +03:00
Sercan Yemen
0a049ff9f4 Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-08-01 11:14:44 +03:00
Sercan Yemen
e8a6b0fb3b page layouts 2017-08-01 11:14:39 +03:00
mustafahlvc
84fadda738 layout elements z-index fix. 2017-07-31 19:01:11 +03:00
Sercan Yemen
156b859ecc theming stufz 2017-07-31 18:51:47 +03:00
Sercan Yemen
21cc769dd3 Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-31 17:35:43 +03:00
Sercan Yemen
0fc689daed srcn 2017-07-31 17:35:36 +03:00
mustafahlvc
f47c0a84fe Merge remote-tracking branch 'origin/master' 2017-07-31 16:59:34 +03:00
mustafahlvc
8ad97ed485 Sidenav missing styles added, unnecessary sidenav component removed. 2017-07-31 16:59:09 +03:00
Sercan Yemen
67380b0543 fix 2017-07-31 16:50:29 +03:00
Sercan Yemen
4ff42b9042 Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-31 16:49:37 +03:00
Sercan Yemen
d8e964d063 more datatable 2017-07-31 16:49:20 +03:00
Sercan Yemen
bc1421976e more datatableˆ 2017-07-31 16:49:13 +03:00
mustafahlvc
3c4cc44045 Some works on toolbar 2017-07-31 16:32:58 +03:00
mustafahlvc
fb2dcc0653 Width, height percentage class helpers added. 2017-07-31 16:32:29 +03:00
Sercan Yemen
5ca5400ba7 new helpers.scss + size helpers + ngx-datatable styles + show toolbar by default 2017-07-31 14:58:55 +03:00
Sercan Yemen
aa0c1d7a87 color.scss added white and black 2017-07-31 13:17:02 +03:00
Sercan Yemen
2225ace5be color.scss generator refactor 2017-07-31 12:24:41 +03:00
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
Sercan Yemen
b48110ee2c removed paddings from page-layouts + fixed apps paddings + page layouts coloring 2017-07-31 11:49:43 +03:00
mustafahlvc
d79068a734 Color helper updated. 2017-07-30 00:53:43 +03:00
Sercan Yemen
8fdca9f2ec Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-29 16:43:04 +03:00
Sercan Yemen
0123d62774 ngx-datatable 2017-07-29 16:42:53 +03:00
mustafahlvc
ef9a1bdc86 Colors updated. 2017-07-29 16:00:24 +03:00
Sercan Yemen
6f7809ac3e color tweaks 2017-07-29 15:26:46 +03:00
Sercan Yemen
da433711be Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-29 14:25:30 +03:00
Sercan Yemen
abf8c61d8c profile page + some more tweaks 2017-07-29 14:25:23 +03:00
mustafahlvc
33f80e659b MatColors cleanup. 2017-07-29 14:19:40 +03:00
mustafahlvc
01609920bb MatColors small fix. 2017-07-29 14:17:32 +03:00
mustafahlvc
196e1644ff camelCaseToDash pipe added,
material colors added class helpers and global  class added.
Material Colors Demo page added.
2017-07-29 14:12:19 +03:00
mustafahlvc
5f34825189 package.json updated. 2017-07-28 17:45:13 +03:00
mustafahlvc
3e096e7b7d Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-28 17:40:53 +03:00
mustafahlvc
0339874110 (Todo app) ongoing.. 2017-07-28 17:40:11 +03:00
Sercan Yemen
be8195663e Merge branch 'master' of https://github.com/withinpixels/fuse2 2017-07-28 16:03:41 +03:00
Sercan Yemen
cdbae74d6c pages + typography + some scss tweaks 2017-07-28 16:03:32 +03:00
mustafahlvc
1f8b1a3f27 Filtering updated for mail, todo app. 2017-07-28 12:26:56 +03:00
mustafahlvc
2d459864f1 Filter Pipe updated,
FuseUtils added,
Filtering applied for mail, todo, chat app.
2017-07-28 11:29:29 +03:00