From e09ef05e0276887c0452261384e5a25bff51b05d Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Fri, 15 Sep 2017 17:40:38 +0300
Subject: [PATCH 01/27] (ngx-perfect-scroolbar) updated to v.4.6.2

---
 package-lock.json           | 952 ++----------------------------------
 package.json                |   2 +-
 src/app/core/scss/core.scss |   2 +-
 3 files changed, 36 insertions(+), 920 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50ec6c94..3cf31a58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -817,6 +817,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
@@ -1241,7 +1246,6 @@
       "requires": {
         "anymatch": "1.3.0",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -2484,6 +2488,14 @@
       "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.12.tgz",
+      "integrity": "sha1-iz/W7t2hf5wAs2Cg6i35knroC6I=",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "elliptic": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@@ -3232,905 +3244,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.6.2",
-        "node-pre-gyp": "0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -6184,11 +5297,19 @@
       "integrity": "sha1-NdQzt3WloqgIxUl19Pr1AKzFL2g="
     },
     "ngx-perfect-scrollbar": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.5.6.tgz",
-      "integrity": "sha512-vpFA6AzYhcjCKFLwXGg58OmLCjhHwi+YrozPK2NYllWNXz2dVhhnWuAubtChAVkb5d3brz2joVu8Di8vLuU6vw==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.6.2.tgz",
+      "integrity": "sha512-cFF4+y9HtcKOdzP+jUB3pg5ljuLl0/NsesWb+yw+eQIX7r0JhNXlUm49xj1QhnYoQDYz5e7OQTukbHn4RRijiw==",
       "requires": {
-        "perfect-scrollbar": "0.7.1"
+        "element-resize-detector": "1.1.12",
+        "perfect-scrollbar": "0.8.1"
+      },
+      "dependencies": {
+        "perfect-scrollbar": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-0.8.1.tgz",
+          "integrity": "sha512-RNC5tX/JMRYR+qVdJTEAWnRxw0Yf9lvbO8lTuAOvgDODkiA8lveTSkvrNMhmaGKEyimJpJl+myb/syVS9YyPuw=="
+        }
       }
     },
     "no-case": {
@@ -6771,11 +5892,6 @@
         "sha.js": "2.4.8"
       }
     },
-    "perfect-scrollbar": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-0.7.1.tgz",
-      "integrity": "sha1-DCVvucXO5AHWCimWh6P5phSH4NU="
-    },
     "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
@@ -8685,6 +7801,15 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -8712,15 +7837,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index e26b2eff..f7865a3b 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "moment": "2.18.1",
     "ngx-color-picker": "4.3.1",
     "ngx-cookie-service": "1.0.7",
-    "ngx-perfect-scrollbar": "4.5.6",
+    "ngx-perfect-scrollbar": "4.6.2",
     "rxjs": "5.4.3",
     "web-animations-js": "2.3.1",
     "zone.js": "0.8.17"
diff --git a/src/app/core/scss/core.scss b/src/app/core/scss/core.scss
index 728a51b7..6e7a37f2 100644
--- a/src/app/core/scss/core.scss
+++ b/src/app/core/scss/core.scss
@@ -3,7 +3,7 @@
 @import '~@swimlane/ngx-datatable/release/themes/material.css';
 @import '~@swimlane/ngx-datatable/release/assets/icons.css';
 // Perfect Scrollbar
-@import "~perfect-scrollbar/src/css/main";
+@import "~ngx-perfect-scrollbar/dist/lib/perfect-scrollbar.component.css";
 // Fuse
 @import "fuse";
 

From d4374e6df05b3c2e501ba5db24a55774c137e508 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 10:46:09 +0300
Subject: [PATCH 02/27] changed 'perfect-scrollbar' to 'perfectScrollbar'

---
 .../material-color-picker.component.html             |  4 ++--
 .../components/shortcuts/shortcuts.component.html    |  4 ++--
 .../content/apps/calendar/calendar.component.html    |  4 ++--
 .../calendar/event-form/event-form.component.html    |  2 +-
 .../apps/chat/chat-view/chat-view.component.html     |  2 +-
 .../chat/sidenavs/left/chats/chats.component.html    |  2 +-
 .../apps/chat/sidenavs/left/user/user.component.html |  2 +-
 .../sidenavs/right/contact/contact.component.html    |  2 +-
 .../contact-form/contact-form.component.html         |  2 +-
 .../content/apps/contacts/contacts.component.html    |  4 ++--
 .../apps/contacts/sidenavs/main/main.component.html  |  2 +-
 .../apps/dashboards/project/project.component.html   |  6 +++---
 .../apps/file-manager/file-manager.component.html    |  4 ++--
 .../sidenavs/details/details.component.html          |  2 +-
 .../file-manager/sidenavs/main/main.component.html   |  2 +-
 .../apps/mail/dialogs/compose/compose.component.html |  2 +-
 src/app/main/content/apps/mail/mail.component.html   |  6 +++---
 .../mail/sidenavs/main/main-sidenav.component.html   |  2 +-
 .../board/dialogs/card/card.component.html           |  2 +-
 .../label-selector/label-selector.component.html     |  2 +-
 .../apps/scrumboard/board/list/list.component.html   |  2 +-
 .../board/sidenavs/settings/settings.component.html  |  4 ++--
 .../apps/scrumboard/scrumboard.component.html        |  2 +-
 .../todo/sidenavs/main/main-sidenav.component.html   |  2 +-
 src/app/main/content/apps/todo/todo.component.html   |  6 +++---
 .../datatable/ngx-datatable.component.html           |  2 +-
 .../components/countdown/countdown.component.html    |  2 +-
 .../main/content/components/hljs/hljs.component.html |  2 +-
 .../material-color-picker.component.html             |  2 +-
 .../components/navigation/navigation.component.html  |  2 +-
 .../price-tables/price-tables.component.html         |  2 +-
 .../components/search-bar/search-bar.component.html  |  2 +-
 .../components/shortcuts/shortcuts.component.html    |  2 +-
 .../content/components/widget/widget.component.html  |  2 +-
 .../forgot-password/forgot-password.component.html   |  2 +-
 .../pages/authentication/lock/lock.component.html    |  2 +-
 .../authentication/login-2/login-2.component.html    |  2 +-
 .../pages/authentication/login/login.component.html  |  2 +-
 .../register-2/register-2.component.html             |  2 +-
 .../authentication/register/register.component.html  |  2 +-
 .../reset-password/reset-password.component.html     |  2 +-
 .../pages/coming-soon/coming-soon.component.html     |  2 +-
 .../pages/invoices/compact/compact.component.html    |  2 +-
 .../pages/invoices/modern/modern.component.html      |  2 +-
 .../pages/maintenance/maintenance.component.html     |  2 +-
 .../content/pages/profile/profile.component.html     |  2 +-
 .../main/content/pages/search/search.component.html  |  2 +-
 .../content/services/config/config.component.html    |  2 +-
 .../splash-screen/splash-screen.component.html       |  2 +-
 src/app/main/content/ui/colors/colors.component.html |  2 +-
 src/app/main/content/ui/forms/forms.component.html   |  2 +-
 .../ui/helper-classes/helper-classes.component.html  |  2 +-
 src/app/main/content/ui/icons/icons.component.html   |  2 +-
 .../ui/page-layouts/blank/blank.component.html       |  2 +-
 .../carded/fullwidth-2/fullwidth-2.component.html    |  2 +-
 .../carded/fullwidth/fullwidth.component.html        |  4 ++--
 .../left-sidenav-2/left-sidenav-2.component.html     |  6 +++---
 .../carded/left-sidenav/left-sidenav.component.html  |  6 +++---
 .../right-sidenav-2/right-sidenav-2.component.html   |  6 +++---
 .../right-sidenav/right-sidenav.component.html       |  6 +++---
 .../simple/fullwidth/fullwidth.component.html        |  2 +-
 .../left-sidenav-2/left-sidenav-2.component.html     |  4 ++--
 .../left-sidenav-3/left-sidenav-3.component.html     |  6 +++---
 .../simple/left-sidenav/left-sidenav.component.html  |  6 +++---
 .../right-sidenav-2/right-sidenav-2.component.html   |  4 ++--
 .../right-sidenav-3/right-sidenav-3.component.html   |  6 +++---
 .../right-sidenav/right-sidenav.component.html       |  6 +++---
 .../page-layouts/simple/tabbed/tabbed.component.html |  2 +-
 .../content/ui/typography/typography.component.html  |  2 +-
 src/app/main/footer/footer.component.html            | 12 +++++++++---
 src/app/main/toolbar/toolbar.component.html          |  2 +-
 71 files changed, 110 insertions(+), 104 deletions(-)

diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.html b/src/app/core/components/material-color-picker/material-color-picker.component.html
index 982968b4..0e22118b 100644
--- a/src/app/core/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.html
@@ -45,7 +45,7 @@
 
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfect-scrollbar>
+                 class="colors" perfectScrollbar>
                 <div class="color"
                      [ngClass]="'md-'+color.key+'-bg'"
                      *ngFor="let color of (colors | keys)"
@@ -63,7 +63,7 @@
              [@slideInRight]>
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfect-scrollbar>
+                 class="colors" perfectScrollbar>
                 <div class="color"
                      *ngFor="let hue of hues"
                      [fxHide]="selectedPalette === 'white' && hue !== '500'|| selectedPalette === 'black' && hue !== '500'"
diff --git a/src/app/core/components/shortcuts/shortcuts.component.html b/src/app/core/components/shortcuts/shortcuts.component.html
index ca3f7e0f..0bf67594 100644
--- a/src/app/core/components/shortcuts/shortcuts.component.html
+++ b/src/app/core/components/shortcuts/shortcuts.component.html
@@ -47,7 +47,7 @@
             </md-input-container>
 
             <md-divider></md-divider>
-            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" perfect-scrollbar>
+            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
 
                 <md-list-item *ngFor="let shortcutItem of shortcutItems"
                               (click)="toggleShortcut($event, shortcutItem)">
@@ -68,7 +68,7 @@
                 </md-list-item>
             </md-nav-list>
 
-            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" perfect-scrollbar>
+            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
                 <md-list-item *ngFor="let navigationItem of filteredNavigationItems"
                               (click)="toggleShortcut($event, navigationItem)">
                     <div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index fc913755..783c76ab 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,4 +1,4 @@
-<div id="calendar" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="calendar" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header" [ngClass]="viewDate | date:'MMM'">
@@ -86,7 +86,7 @@
     <!-- / HEADER -->
 
     <!-- CONTENT -->
-    <div class="content" perfect-scrollbar>
+    <div class="content" perfectScrollbar>
         <div [ngSwitch]="view">
             <mwl-calendar-month-view
                 *ngSwitchCase="'month'"
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
index e7e219a6..16733e02 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form name="eventForm" [formGroup]="eventForm" class="event-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.html b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
index 7168346f..bc8352f6 100644
--- a/src/app/main/content/apps/chat/chat-view/chat-view.component.html
+++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
@@ -57,7 +57,7 @@
     <!-- / CHAT TOOLBAR -->
 
     <!-- CHAT CONTENT -->
-    <div id="chat-content" fxFlex perfect-scrollbar>
+    <div id="chat-content" fxFlex perfectScrollbar>
 
         <!-- CHAT MESSAGES -->
         <div class="chat-messages">
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
index be018d5c..a613b33b 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
@@ -98,7 +98,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content" perfect-scrollbar fxFlex>
+<div class="sidenav-content" perfectScrollbar fxFlex>
 
     <!-- CHATS CONTENT -->
     <div>
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
index 4b40de6d..42422e48 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
@@ -29,7 +29,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfect-scrollbar fxFlex>
+<div class="sidenav-content p-16" perfectScrollbar fxFlex>
 
     <!-- USER MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
index 2677e347..5034e3e6 100644
--- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
@@ -31,7 +31,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfect-scrollbar fxFlex *ngIf="contact">
+<div class="sidenav-content p-16" perfectScrollbar fxFlex *ngIf="contact">
 
     <!-- CONTACT MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
index 498e54d1..3852138f 100644
--- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
+++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
@@ -15,7 +15,7 @@
     </md-toolbar-row>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form [formGroup]="contactForm">
 
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 3fcf40e5..88748549 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -1,4 +1,4 @@
-<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" perfect-scrollbar>
+<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="start start"
@@ -51,7 +51,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24 pr-sm-92" perfect-scrollbar>
+        <div class="center p-24 pr-sm-92" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content md-white-bg mat-elevation-z4">
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
index b0d07b8b..4f400d0a 100644
--- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
@@ -13,7 +13,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfect-scrollbar>
+        <div class="content py-16" perfectScrollbar>
 
             <div class="nav">
 
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index a08ead08..ef6f8b7b 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -1,9 +1,9 @@
-<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfect-scrollbar>
+<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" fxFlex perfect-scrollbar>
+        <div class="center" fxFlex perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24 pb-0" fxLayout="column" fxLayoutAlign="space-between">
@@ -690,7 +690,7 @@
         <!-- SIDENAV -->
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
                 <!-- WIDGET GROUP -->
                 <div class="widget-group" fxLayout="column" fxFlex="100">
 
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index 40926094..ab7dcdfd 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -1,4 +1,4 @@
-<div id="file-manager" class="page-layout simple right-sidenav" perfect-scrollbar>
+<div id="file-manager" class="page-layout simple right-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -58,7 +58,7 @@
             <!-- / HEADER -->
 
             <!-- CONTENT -->
-            <div class="content md-white-bg" perfect-scrollbar>
+            <div class="content md-white-bg" perfectScrollbar>
                 <fuse-file-list></fuse-file-list>
             </div>
             <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
index 77979f25..ee9ab507 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
@@ -27,7 +27,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content p-24 md-white-bg" perfect-scrollbar>
+<div class="content p-24 md-white-bg" perfectScrollbar>
 
     <div class="file-details">
 
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
index d640990a..4387a1cc 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
@@ -10,7 +10,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content py-16" perfect-scrollbar>
+<div class="content py-16" perfectScrollbar>
 
     <div class="nav">
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index 26bcf994..703ae091 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form name="composeForm" [formGroup]="composeForm" class="compose-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index b4bbc8ee..0ab84d6e 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -1,4 +1,4 @@
-<div id="mail" class="page-layout carded left-sidenav" perfect-scrollbar>
+<div id="mail" class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -96,9 +96,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxLayoutAlign="row">
 
-                    <fuse-mail-list perfect-scrollbar fxFlex></fuse-mail-list>
+                    <fuse-mail-list perfectScrollbar fxFlex></fuse-mail-list>
 
-                    <fuse-mail-details perfect-scrollbar fxFlex></fuse-mail-details>
+                    <fuse-mail-details perfectScrollbar fxFlex></fuse-mail-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index ade0e181..eb9bbfa2 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfect-scrollbar>
+<div class="content" perfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index d713ac37..9acf27b3 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -123,7 +123,7 @@
     </div>
 </md-toolbar>
 
-<div *ngIf="card" md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div *ngIf="card" md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <div fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"
          fxLayout.xs="column" fxLayoutAlign="center center">
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
index 8011f485..cdce00c1 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
@@ -10,7 +10,7 @@
             </button>
         </div>
 
-        <div fxFlex fxLayout="column" perfect-scrollbar>
+        <div fxFlex fxLayout="column" perfectScrollbar>
 
             <div class="label pl-12 mx-8 mb-8" *ngFor="let label of board.labels" fxFlex="0 0 auto" fxLayout="row" fxFlexAlign="space-between center"
                  [class]="label.color">
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.html b/src/app/main/content/apps/scrumboard/board/list/list.component.html
index 62b1b29a..11b00722 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.html
@@ -26,7 +26,7 @@
 
         <div class="list-cards ngx-dnd-container"
              [model]="list.idCards" ngxDroppable="card" (out)="onDrop($event)"
-             perfect-scrollbar #listScroll>
+             perfectScrollbar #listScroll>
             <fuse-scrumboard-board-card ngxDraggable
                                         (click)="openCardDialog(cardId)"
                                         class="scrumboard-board-card mat-elevation-z2 ngx-dnd-item"
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
index 43dd7966..cbd13873 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
@@ -9,7 +9,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfect-scrollbar>
+        <div class="content py-16" perfectScrollbar>
 
             <div class="nav">
                 <div class="nav-item">
@@ -67,7 +67,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content p-8" perfect-scrollbar>
+        <div class="content p-8" perfectScrollbar>
             <fuse-scrumboard-board-color-selector></fuse-scrumboard-board-color-selector>
         </div>
         <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/content/apps/scrumboard/scrumboard.component.html
index 8c5a97a2..5c155f91 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.html
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.html
@@ -1,5 +1,5 @@
 <!-- BOARDS -->
-<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex perfect-scrollbar>
+<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex perfectScrollbar>
 
     <div class="header pt-44 pt-md-88" fxFlex="0 0 auto">
         <h1>Scrumboard App</h1>
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index 849f77f0..06204091 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfect-scrollbar>
+<div class="content" perfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
index e53cb3a5..e270c87d 100644
--- a/src/app/main/content/apps/todo/todo.component.html
+++ b/src/app/main/content/apps/todo/todo.component.html
@@ -1,4 +1,4 @@
-<div id="todo" class="page-layout carded left-sidenav" perfect-scrollbar>
+<div id="todo" class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -82,9 +82,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxFlexAlign="row">
 
-                    <fuse-todo-list perfect-scrollbar fxFlex></fuse-todo-list>
+                    <fuse-todo-list perfectScrollbar fxFlex></fuse-todo-list>
 
-                    <fuse-todo-details perfect-scrollbar fxFlex></fuse-todo-details>
+                    <fuse-todo-details perfectScrollbar fxFlex></fuse-todo-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
index ccc416a1..4208b7ee 100644
--- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
+++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
@@ -1,4 +1,4 @@
-<div id="ngx-datatable" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="ngx-datatable" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between">
diff --git a/src/app/main/content/components/countdown/countdown.component.html b/src/app/main/content/components/countdown/countdown.component.html
index e5bbe156..595f16d6 100644
--- a/src/app/main/content/components/countdown/countdown.component.html
+++ b/src/app/main/content/components/countdown/countdown.component.html
@@ -1,4 +1,4 @@
-<div id="countdown" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="countdown" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/hljs/hljs.component.html b/src/app/main/content/components/hljs/hljs.component.html
index 86c42a92..7031b830 100644
--- a/src/app/main/content/components/hljs/hljs.component.html
+++ b/src/app/main/content/components/hljs/hljs.component.html
@@ -1,4 +1,4 @@
-<div id="hljs" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="hljs" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.html b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
index e88a8fa4..421afdd8 100644
--- a/src/app/main/content/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
@@ -1,4 +1,4 @@
-<div id="material-color-picker" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="material-color-picker" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/content/components/navigation/navigation.component.html
index 5db515ee..42f5dd18 100644
--- a/src/app/main/content/components/navigation/navigation.component.html
+++ b/src/app/main/content/components/navigation/navigation.component.html
@@ -1,4 +1,4 @@
-<div id="navigation" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="navigation" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/price-tables/price-tables.component.html b/src/app/main/content/components/price-tables/price-tables.component.html
index 81d2b20a..360ad49f 100644
--- a/src/app/main/content/components/price-tables/price-tables.component.html
+++ b/src/app/main/content/components/price-tables/price-tables.component.html
@@ -1,4 +1,4 @@
-<div id="price-tables" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="price-tables" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/search-bar/search-bar.component.html b/src/app/main/content/components/search-bar/search-bar.component.html
index ac112ac1..cce891da 100644
--- a/src/app/main/content/components/search-bar/search-bar.component.html
+++ b/src/app/main/content/components/search-bar/search-bar.component.html
@@ -1,4 +1,4 @@
-<div id="search-bar" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="search-bar" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.html b/src/app/main/content/components/shortcuts/shortcuts.component.html
index 4726c795..20c80877 100644
--- a/src/app/main/content/components/shortcuts/shortcuts.component.html
+++ b/src/app/main/content/components/shortcuts/shortcuts.component.html
@@ -1,4 +1,4 @@
-<div id="shortcuts" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="shortcuts" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/widget/widget.component.html b/src/app/main/content/components/widget/widget.component.html
index d00b16a6..852d1994 100644
--- a/src/app/main/content/components/widget/widget.component.html
+++ b/src/app/main/content/components/widget/widget.component.html
@@ -1,4 +1,4 @@
-<div id="widget" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="widget" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
index f95e311b..82f826bc 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
@@ -1,4 +1,4 @@
-<div id="forgot-password" fxLayout="column" perfect-scrollbar>
+<div id="forgot-password" fxLayout="column" perfectScrollbar>
 
     <div id="forgot-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.html b/src/app/main/content/pages/authentication/lock/lock.component.html
index dcdd83fa..05b03cfa 100644
--- a/src/app/main/content/pages/authentication/lock/lock.component.html
+++ b/src/app/main/content/pages/authentication/lock/lock.component.html
@@ -1,4 +1,4 @@
-<div id="lock" fxLayout="column" perfect-scrollbar>
+<div id="lock" fxLayout="column" perfectScrollbar>
 
     <div id="lock-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
index 2a39a8d7..1c5a6a87 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.html
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="login-form-wrapper" perfect-scrollbar>
+    <div id="login-form-wrapper" perfectScrollbar>
 
         <div id="login-form">
 
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
index 4f030829..31dc57fc 100644
--- a/src/app/main/content/pages/authentication/login/login.component.html
+++ b/src/app/main/content/pages/authentication/login/login.component.html
@@ -1,4 +1,4 @@
-<div id="login" fxLayout="column" perfect-scrollbar>
+<div id="login" fxLayout="column" perfectScrollbar>
 
     <div id="login-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
index 98bb9e64..bead6516 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.html
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="register-form-wrapper" perfect-scrollbar>
+    <div id="register-form-wrapper" perfectScrollbar>
 
         <div id="register-form">
 
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
index 7fe77d7c..aba4ffad 100644
--- a/src/app/main/content/pages/authentication/register/register.component.html
+++ b/src/app/main/content/pages/authentication/register/register.component.html
@@ -1,4 +1,4 @@
-<div id="register" fxLayout="column" perfect-scrollbar>
+<div id="register" fxLayout="column" perfectScrollbar>
 
     <div id="register-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
index 095e9d28..7c466e7b 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
@@ -1,4 +1,4 @@
-<div id="reset-password" fxLayout="column" perfect-scrollbar>
+<div id="reset-password" fxLayout="column" perfectScrollbar>
 
     <div id="reset-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
index dcf0fa23..39de6389 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.html
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.html
@@ -1,4 +1,4 @@
-<div id="coming-soon" fxLayout="column" perfect-scrollbar>
+<div id="coming-soon" fxLayout="column" perfectScrollbar>
 
     <div id="coming-soon-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.html b/src/app/main/content/pages/invoices/compact/compact.component.html
index c4279c8b..ec3da93d 100644
--- a/src/app/main/content/pages/invoices/compact/compact.component.html
+++ b/src/app/main/content/pages/invoices/compact/compact.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="compact page-layout blank" fxLayout="row" perfect-scrollbar>
+<div id="invoice" class="compact page-layout blank" fxLayout="row" perfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.html b/src/app/main/content/pages/invoices/modern/modern.component.html
index 1ed1c845..0021b3bd 100644
--- a/src/app/main/content/pages/invoices/modern/modern.component.html
+++ b/src/app/main/content/pages/invoices/modern/modern.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="modern page-layout blank" fxLayout="row" perfect-scrollbar>
+<div id="invoice" class="modern page-layout blank" fxLayout="row" perfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
index 848319da..d4721910 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.html
+++ b/src/app/main/content/pages/maintenance/maintenance.component.html
@@ -1,4 +1,4 @@
-<div id="maintenance" fxLayout="column" perfect-scrollbar>
+<div id="maintenance" fxLayout="column" perfectScrollbar>
 
     <div id="maintenance-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html
index 01edc781..e33e5e60 100644
--- a/src/app/main/content/pages/profile/profile.component.html
+++ b/src/app/main/content/pages/profile/profile.component.html
@@ -1,4 +1,4 @@
-<div id="profile" class="page-layout simple tabbed" perfect-scrollbar>
+<div id="profile" class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/pages/search/search.component.html b/src/app/main/content/pages/search/search.component.html
index 119be965..3f789344 100644
--- a/src/app/main/content/pages/search/search.component.html
+++ b/src/app/main/content/pages/search/search.component.html
@@ -1,4 +1,4 @@
-<div id="search" class="page-layout simple tabbed" perfect-scrollbar>
+<div id="search" class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/content/services/config/config.component.html
index 958f8310..d4db2c5e 100644
--- a/src/app/main/content/services/config/config.component.html
+++ b/src/app/main/content/services/config/config.component.html
@@ -1,4 +1,4 @@
-<div id="config" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="config" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.html b/src/app/main/content/services/splash-screen/splash-screen.component.html
index 2004cc1f..39e3c392 100644
--- a/src/app/main/content/services/splash-screen/splash-screen.component.html
+++ b/src/app/main/content/services/splash-screen/splash-screen.component.html
@@ -1,4 +1,4 @@
-<div id="splash-screen" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="splash-screen" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/colors/colors.component.html b/src/app/main/content/ui/colors/colors.component.html
index b2dc5486..67da3633 100644
--- a/src/app/main/content/ui/colors/colors.component.html
+++ b/src/app/main/content/ui/colors/colors.component.html
@@ -1,4 +1,4 @@
-<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/content/ui/forms/forms.component.html
index b5c32111..2a64ee2f 100644
--- a/src/app/main/content/ui/forms/forms.component.html
+++ b/src/app/main/content/ui/forms/forms.component.html
@@ -1,4 +1,4 @@
-<div id="forms" class="page-layout simple fullwidth" fxLayout="column" perfect-scrollbar>
+<div id="forms" class="page-layout simple fullwidth" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.html b/src/app/main/content/ui/helper-classes/helper-classes.component.html
index e8d21168..375dde1f 100644
--- a/src/app/main/content/ui/helper-classes/helper-classes.component.html
+++ b/src/app/main/content/ui/helper-classes/helper-classes.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/icons/icons.component.html b/src/app/main/content/ui/icons/icons.component.html
index 422f430b..535acd27 100644
--- a/src/app/main/content/ui/icons/icons.component.html
+++ b/src/app/main/content/ui/icons/icons.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.html b/src/app/main/content/ui/page-layouts/blank/blank.component.html
index 53b0ba78..e8b26ddb 100644
--- a/src/app/main/content/ui/page-layouts/blank/blank.component.html
+++ b/src/app/main/content/ui/page-layouts/blank/blank.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout blank p-24" perfect-scrollbar>
+<div class="page-layout blank p-24" perfectScrollbar>
 
     <h2>Blank Page</h2>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
index 9034087b..a907e53a 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth single-scroll" perfect-scrollbar>
+<div class="page-layout carded fullwidth single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
index 4dc282f2..b773dc15 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth" perfect-scrollbar>
+<div class="page-layout carded fullwidth" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -23,7 +23,7 @@
             <!-- / CONTENT TOOLBAR -->
 
             <!-- CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
 
                 <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
index 894a42dd..a3142a62 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout carded left-sidenav single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
@@ -50,7 +50,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
index df2365d5..291bf374 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav" perfect-scrollbar>
+<div class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -52,7 +52,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
index 351dcbc7..3609d0e2 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout carded right-sidenav single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
index ff20f210..58fa1092 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav" perfect-scrollbar>
+<div class="page-layout carded right-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
index cb512f52..dce9c771 100644
--- a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple fullwidth" perfect-scrollbar>
+<div class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
index 1c2b9ad7..32f5ca49 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout simple left-sidenav single-scroll" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -12,7 +12,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
index 7740289f..2209e661 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav inner-sidenav" perfect-scrollbar>
+<div class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -22,7 +22,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -32,7 +32,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24" perfect-scrollbar>
+        <div class="center p-24" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
index 4df8ed46..cce37f1d 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav" perfect-scrollbar>
+<div class="page-layout simple left-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -6,7 +6,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfect-scrollbar>
+            <div class="sidenav-content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -16,7 +16,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
index 01ae0e65..f43fec7f 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout simple right-sidenav single-scroll" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
index 7329505e..aa320940 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple right-sidenav inner-sidenav" perfect-scrollbar>
+<div class="page-layout simple right-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -19,7 +19,7 @@
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center p-24" perfect-scrollbar>
+        <div class="center p-24" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
index b8988210..f530784d 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav" perfect-scrollbar>
+<div class="page-layout simple right-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfect-scrollbar>
+            <div class="sidenav-content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
index 4dd2b6d2..299b3c9f 100644
--- a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple tabbed" perfect-scrollbar>
+<div class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24">
diff --git a/src/app/main/content/ui/typography/typography.component.html b/src/app/main/content/ui/typography/typography.component.html
index bbfa8e2d..53e180f3 100644
--- a/src/app/main/content/ui/typography/typography.component.html
+++ b/src/app/main/content/ui/typography/typography.component.html
@@ -1,4 +1,4 @@
-<div id="typography" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="typography" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/footer/footer.component.html b/src/app/main/footer/footer.component.html
index 0153af89..e41f96d1 100644
--- a/src/app/main/footer/footer.component.html
+++ b/src/app/main/footer/footer.component.html
@@ -1,14 +1,20 @@
 <md-toolbar>
 
-    <div fxLayout="row" fxLayoutAlign="center center" fxFlex>
+    <div fxLayout="row" fxLayoutAlign="center center" fxLayoutAlign.gt-xs="space-between center" fxFlex>
 
         <a href="http://themeforest.net/item/fuse-angularjs-material-design-admin-template/12931855?ref=srcn"
-           target="_blank" md-button class="ml-8 ml-sm-24 md-accent-800-bg" fxFlex="0 0 auto" fxLayout="row"
+           target="_blank" md-button class="md-pink-bg" fxFlex="0 0 auto" fxLayout="row"
            fxLayoutAlign="start center">
             <md-icon class="s-16 mr-sm-4">shopping_cart</md-icon>
-            <span>Purchase Fuse template (Angular4+)</span>
+            <span>Purchase FUSE (Angular4+)</span>
         </a>
 
+        <div fxLayout="row" fxLayoutAlign="start center" fxHide fxShow.gt-xs>
+            <a md-button href="http://fuse-angular-material-docs.withinpixels.com/" target="_blank">Documentation</a>
+            <span>&bull;</span>
+            <a md-button href="http://withinpixels.com/themes/fuse/changelog" target="_blank">Changelog</a>
+        </div>
+
     </div>
 
 </md-toolbar>
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index 4f6ab0ef..ad5da2d1 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -13,7 +13,7 @@
 
             <div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
                 <div class="logo ml-16">
-                    <span class="logo-icon">F</span>
+                    <img class="logo-icon" src="assets/images/logos/fuse.svg">
                 </div>
             </div>
 

From b377d99c66c31459f8bb663705f6681c25bb2cb9 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 10:47:08 +0300
Subject: [PATCH 03/27] new fuse logo

---
 .../vertical/navbar-vertical.component.html   |    4 +-
 .../vertical/navbar-vertical.component.scss   |   33 +-
 src/app/main/toolbar/toolbar.component.scss   |   17 +-
 src/assets/images/logos/fuse.svg              | 1127 +++++++++++++++++
 src/favicon.ico                               |  Bin 1150 -> 1150 bytes
 src/index.html                                |   17 +-
 6 files changed, 1151 insertions(+), 47 deletions(-)
 create mode 100644 src/assets/images/logos/fuse.svg

diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.html b/src/app/main/navbar/vertical/navbar-vertical.component.html
index 6979c893..96743792 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.html
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.html
@@ -1,7 +1,7 @@
 <div class="navbar-header">
 
     <div class="logo">
-        <span class="logo-icon">F</span>
+        <img class="logo-icon" src="assets/images/logos/fuse.svg">
         <span class="logo-text">FUSE</span>
     </div>
 
@@ -15,6 +15,6 @@
 
 </div>
 
-<div class="navbar-content" perfect-scrollbar>
+<div class="navbar-content" perfectScrollbar>
     <fuse-navigation layout="vertical"></fuse-navigation>
 </div>
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.scss b/src/app/main/navbar/vertical/navbar-vertical.component.scss
index 28cea62d..7e9fd2bf 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.scss
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.scss
@@ -45,6 +45,7 @@ fuse-navbar-vertical {
         &.left-navbar {
             left: 0;
         }
+
         &.right-navbar {
             right: 0;
         }
@@ -55,13 +56,17 @@ fuse-navbar-vertical {
             max-width: 64px;
 
             .navbar-header {
-                padding: 0 16px 0 16px;
+                padding: 0 13px;
+
+                .logo {
+
+                    .logo-text {
+                        opacity: 0;
+                        transition: opacity 200ms ease;
+                    }
+                }
             }
         }
-
-        &.folded-open {
-
-        }
     }
 
     &.close {
@@ -111,22 +116,14 @@ fuse-navbar-vertical {
             align-items: center;
 
             .logo-icon {
-                display: block;
-                background: #039BE5;
-                width: 32px;
-                min-width: 32px;
-                height: 32px;
-                line-height: 32px;
-                text-align: center;
-                font-size: 16px;
-                font-weight: 500;
-                color: #FFF;
-                border-radius: 2px;
+                width: 38px;
             }
 
             .logo-text {
-                margin-left: 16px;
-                font-size: 16px;
+                margin-left: 8px;
+                font-size: 20px;
+                font-weight: 300;
+                letter-spacing: 0.4px;
             }
         }
     }
diff --git a/src/app/main/toolbar/toolbar.component.scss b/src/app/main/toolbar/toolbar.component.scss
index a72695b5..2ec738a4 100644
--- a/src/app/main/toolbar/toolbar.component.scss
+++ b/src/app/main/toolbar/toolbar.component.scss
@@ -20,22 +20,7 @@
         align-items: center;
 
         .logo-icon {
-            display: block;
-            background: #039BE5;
-            width: 32px;
-            min-width: 32px;
-            height: 32px;
-            line-height: 32px;
-            text-align: center;
-            font-size: 16px;
-            font-weight: 500;
-            color: #FFF;
-            border-radius: 2px;
-        }
-
-        .logo-text {
-            margin-left: 16px;
-            font-size: 16px;
+            width: 38px;
         }
     }
 
diff --git a/src/assets/images/logos/fuse.svg b/src/assets/images/logos/fuse.svg
new file mode 100644
index 00000000..bc463a74
--- /dev/null
+++ b/src/assets/images/logos/fuse.svg
@@ -0,0 +1,1127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 212 217"
+   xml:space="preserve"
+   sodipodi:docname="fuse.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   width="212"
+   height="217"><metadata
+     id="metadata228"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs226" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1575"
+     inkscape:window-height="1148"
+     id="namedview224"
+     showgrid="false"
+     inkscape:zoom="1.1894531"
+     inkscape:cx="1.0509031"
+     inkscape:cy="-59.251231"
+     inkscape:window-x="640"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g219"
+     inkscape:lockguides="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style139">
+	.st0{fill:#37474F;}
+	.st1{font-family:'ProductSans-Regular';}
+	.st2{font-size:177.8187px;}
+	.st3{fill:#1565C0;}
+	.st4{opacity:0.2;}
+	.st5{fill:#231F20;}
+	.st6{fill:#2196F3;}
+</style><switch
+     id="switch221"
+     transform="translate(0,-0.34647)"><foreignObject
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       x="0"
+       y="0"
+       width="1"
+       height="1"><i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" /></foreignObject><g
+       i:extraneous="self"
+       id="g219"><g
+         id="g326"
+         transform="translate(-47,-434.65353)"><g
+           id="g149"><image
+             id="image143"
+             transform="translate(65,513)"
+             xlink:href="data:image/png;base64,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"
+             height="64"
+             width="176"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g147"><polyline
+               id="polyline145"
+               points="77.1,560.9 116.1,521.7 189.4,521.7 228.4,560.9     "
+               class="st3"
+               style="fill:#1565c0" /></g></g><g
+           id="g157"><image
+             id="image151"
+             transform="translate(104,572)"
+             xlink:href="data:image/png;base64,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"
+             height="44"
+             width="61"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g155"><polyline
+               id="polyline153"
+               points="152.8,599.7 116.1,599.6 134.1,580.9 152.8,599.7     "
+               class="st3"
+               style="fill:#1565c0" /></g></g><g
+           id="g167"><g
+             id="g161"
+             class="st4"
+             style="opacity:0.2"><path
+               id="path159"
+               d="M 153.2,591.3"
+               class="st5"
+               inkscape:connector-curvature="0"
+               style="fill:#231f20" /></g><g
+             id="g165"><path
+               id="path163"
+               d="M 153.2,587.3"
+               class="st3"
+               inkscape:connector-curvature="0"
+               style="fill:#1565c0" /></g></g><g
+           id="g175"><image
+             id="image169"
+             transform="translate(104,591)"
+             xlink:href="data:image/png;base64,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 Fx4uaTyqha0AAAAASUVORK5CYII="
+             height="61"
+             width="98"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g173"><polyline
+               id="polyline171"
+               points="152.8,636 152.8,636 189.4,599.6 152.8,599.7 152.8,599.7 152.8,599.7 152.8,599.7 116.1,599.6       152.8,636     "
+               class="st6"
+               style="fill:#2196f3" /></g></g><g
+           id="g183"><image
+             id="image177"
+             transform="translate(140,572)"
+             xlink:href="data:image/png;base64,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"
+             height="44"
+             width="62"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g181"><polyline
+               id="polyline179"
+               points="152.8,599.7 189.4,599.6 171.5,580.9 152.8,599.7     "
+               class="st3"
+               style="fill:#1565c0" /></g></g><g
+           id="g191"><image
+             id="image185"
+             transform="translate(47,435)"
+             xlink:href="data:image/png;base64,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"
+             height="142"
+             width="212"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g189"><path
+               id="path187"
+               d="m 152.8,485 36.6,36.6 v 0 l 39,39.2 16.1,-16.1 c 2.6,-2.6 2.6,-6.7 0,-9.2 l -45.1,-45.1 c -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 l -46.4,-46.4 v 0 0 0 0 l -46.4,46.4 c -0.1,0.1 -0.2,0.2 -0.3,0.3 l -45,45.1 c -2.6,2.6 -2.6,6.7 0,9.2 l 16.1,16.1"
+               class="st6"
+               inkscape:connector-curvature="0"
+               style="fill:#2196f3" /></g></g><g
+           id="g201"><g
+             id="g195"
+             class="st4"
+             style="opacity:0.2"><path
+               id="path193"
+               d="M 152.4,591.4"
+               class="st5"
+               inkscape:connector-curvature="0"
+               style="fill:#231f20" /></g><g
+             id="g199"><path
+               id="path197"
+               d="M 152.4,587.4"
+               class="st3"
+               inkscape:connector-curvature="0"
+               style="fill:#1565c0" /></g></g><g
+           id="g209"><image
+             id="image203"
+             transform="translate(86,513)"
+             xlink:href="data:image/png;base64,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"
+             height="103"
+             width="134"
+             style="overflow:visible;opacity:0.2" /><g
+             id="g207"><path
+               id="path205"
+               d="m 100.1,574.3 c -2.6,2.6 -2.6,6.7 0,9.2 l 16,16 36.6,-36.6 36.6,36.6 16,-16 c 2.6,-2.6 2.6,-6.7 0,-9.2 l -52.7,-52.7 v 0 0 0"
+               class="st6"
+               inkscape:connector-curvature="0"
+               style="fill:#2196f3" /></g></g><g
+           id="g217"
+           class="st4"
+           style="opacity:0.2"><path
+             id="path211"
+             d="m 244.6,535.5 -45.1,-45.1 c -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 L 152.8,443.7 V 485 l 36.6,36.6 H 152.8 V 563 l 18.3,18.3 -18.3,18.5 V 636 l 36.6,-36.4 16,-16 c 2.6,-2.6 2.6,-6.7 0,-9.2 l -13.5,-13.5 h 36.5 v 0 l 16.1,-16.1 c 2.6,-2.6 2.6,-6.7 0.1,-9.3 z"
+             inkscape:connector-curvature="0" /><polygon
+             id="polygon213"
+             points="" /><path
+             id="path215"
+             d="M 152.8,521.7 Z"
+             inkscape:connector-curvature="0" /></g></g></g></switch><i:pgf
+     id="adobe_illustrator_pgf"><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	qxu1IxEMBKjtI68MP6d8kUVN4HBaaExoEHA2oKOCOBg4U3HOcFgQQV34LIt6U8GgPvRYgoM2gor+
+lJEGu+xoEYo+ysK3aCIXKjbFxnB0IiIXX9k7BQkdhFIFzBk+G3UFc5br63gxdCsBwOgWQ/wI4kvt
+HE0EoUqLkXM0L/VP1JUCuqYOAoDRLmjOiPAsl0UcNPpNmZcIVf1TojRD8nBAG7BxQ5mXSi96ypVm
+Y4qvc3GuiINkjJyrs4aNb43wqmNZAEZB47lupgpaMto+LrTDKanforc6qPLaqAyI0Y1maXMq8aLG
+EBkFA5bJKkNsKWJEJFVpNlWES9SvU3Rjg7AkGoR1SAIQl0rnOSNpiCan8OhmxIjWRELamQIBjbKd
+SJH+W/SbuATKXJOJh/AIiPPvqKQI04VFoT36ugYG5/VSpz8K3YfrRTVPklMApnZc6wG0xH0JzGJZ
+3R2fVXtC9zSfJVruQOXh6VLWbaEjzMbALAW9G4W3gwQN/QbRqAFaOYA5b2QaODTXxYQX2IT+V1N3
+K5l9aVQL0enRFfIStFMKIPcBgEmxV0SyEgqOYuXri58YDqbYYwrtRee+0BHq80qgEfFp386q+fTx
+UvY52n7VPRMh1F+7P4XbUrGFLBvJ6pprcAPcVGidaeeKWSDJ7OC+XUi+XbXLV9zpp1EHhfjle71w
+/XgHbWhpbPfH0xp/y3CSTdhIFIEqfwsrrkXY2rWw9iuQySG7FrC3ZPL+nbkuj+74TmTSegUmdeWn
+JBrjUerw1dpbMnWVABjcW1IJFU5OdMSfCrfV8vdjrzT5TkSyo/nxFzB9T0mAltxnMtkesnB0IdVs
+kizczuxd7QoStNTb/y7HI3GqBA5y5a+Q/0KEcBfNfQID7tZbGgeeS5FJ7jwjrZcWVRpXZQqoP1xV
+vWUo0/B1aF2iJQBQox4YZWiItC/RKDYSM5/jJCeSu8oHrcsZdDxU90DrG2BDTU+Z6xKY0jBQ/ezl
+0uXac3IEvPYKRVC1WFPf753b/6bzYSRKq8iAP+/Ko/tADUjtapnyDysiKyJ3FqqEtCjEPs5Opmb8
+lax+vJ96qpXF6pM6Ts9TMgmcBY8ir6nkoHFVvGvlwWye5zdSIGD1fFy4u+k8VMv+ofxCpXn2hEhO
+V/0W0bjuL1VPWh+coF6mcG1K4zd3JpCr9Xoyfb2HwTKGr4vTZgAY/q2RyrwZGJX5KE6pc7f6QgkY
+EJnhfEZAnXIDEf6ixkWgU2gAfd+gJQPqBmfiZfgucPFA/8gQusl89vr5ELiYY7e289tCpzb8Bmtz
+zlH5e3carQNahHPfimIg4Y3QCyjTLsb8Cq10+g6IWADmgwZ9dPlKb0n289l7bxgLqlHx2WF2tGp9
+F7r39DOAkJkR1bd8FAznMqTIan2oA8bTZlV2ZEY3pNK0K7Mx3ptDNo5qgpDWnExQicJJuR9jOrZs
+jI0EsvEXJOiqvzXLVsvxFyqQe34/Xe/SQTQA67eBsXGx0RsjlMK1ySWuVuVwexjKZ26+p4rO6iYO
+q4uSFE0EJBha/rCTcuQpm5dR6mUiY+bjE6KUl0ZXK59L4vTxPA41P1Wc3+agWtOYIzex4u0q+gLQ
+3eYrgdPECFNhKvVBgkoceX5S+czjzyQ7uux/5TNPVbwrUX6LLn66D+PQUIufBZ8Tl6hzTJ9LTQkf
+cOeFAVjDl2yZWd42kI2R8DRiHviMKl93m4cq/OTDrNEFmu/iqNIjFu/lUbcMA8SVINtcFeL5wmtl
+0Jr5dVaUFM38Op4C6Zo+TPKRm4dCt5GH/JgOrQ//zJfnQulVodWOvGcmH6kRWPXHU7g2mNUj6qfz
+CKCbxikwW97uq73sOKKHSuV+5mClv9z5n4sBo76A67UqpPrLrzB5+RCUnoFlhnZa9+gnVPWxab/u
+Hdlv1Cm1D0XlwkHfhIqzOTECRDN9SeQyt8/57DJNrk9OaofWBjRNpu7YU9NWqElmOOz/rDd5CZWJ
+9Iu3WmIS00K3TJPFWcqTIqjgzySfub2boUXDhc0aLaHdjfPB0ytgnnKz0O7mf9YJxMOXJudNPp+p
+HtOJi8RTrXRTerhQzMaErG+SZ5PBa7k+aLeKsUdKWFv9D48bKBPiruq7umikL9+qgmQgSwsZBuR2
+ncheHxVG5S/PeyyZWYZLwEianKpdieYg7G3EsJD2Xs/8R8c9SORnlX7kZak1y8WxpbonR51qz3PS
+ATMMvFU+voUBCluuo7QmVPrFUx8Ak2kGoq+FbvfErSGZi7rSb0MKakm00RBFsvznmwmVXHqqpcI7
+sB3zdRgdrJaD3bgSZhTHm54WKt1CMt3+Ssc+i3MwzSJh2gTqBRr6Uv7QIthVzDbgp3UfLqb5s9wS
+bhMVZwvixKAPpjj1ClfF2PPh/eX5W8zraK6S/afpxRd+Q2Cm9RvgnlRYnAETeRbqxysYIAUTjkc9
+wIN4Sat9ZMiU+6bqf24JhetncohBPb++GZaH83RQs+MBxuYDQv92+qVKY1Eks5/jOMayyt6HKH4D
+N+x3eZS+mpX7p5PjdOOTO6sWZotDFEPVEQ0kAbghmLkpRd7K19dnEdGGo+46oWqFHPmqmUL7UF7V
+Rx9QBN1I4rxayBUTx8t4uU7PjtdE0azlB9h5b0PBGi5f1w9hoEvHSWfBVeu5mieEHlj4Rb/qPg2S
+wM+9hx+lKcBB0U/AjxcprN/oqc8vOqDJbvJD3v7KH+u28CQ8ZKu++ryQHr/deKrlVrNTPV7GgJx5
+ZL7y0eJLTGVKyToCv6l2F9oILCQ7nlIB/P8yfxYK+43BwFYnNRhkfgOtKtF1ZvNMCzFf8b7i4/vv
+UKaQenwRfPAFLQLg4NCzOZhOo0j5R13DPkjv1RA61tcFdnx7irtWViyLqF9xCi0ZQInbv6IdBLhe
+VJnu1N5qx7X3FCCa6QprLDSq74AE8kfIPkFbnciGTuSb5fDt+Awj3lwiyFZP/cEEsI5ix8DTyM/Q
+nmWWSQ8epH28xNU9Plc8VnFBVbPBQ9XPX6c0XJUvh6Oq77qWxlcakezdmwe+mBU6/eVIdCipxOFX
+cX6Y+sYMqPzl8kdhT1XfIDCP0TM6mb27bRU6q3tqXcHEuXJ9PuGBHivOwRBniepn8zhtbhXcZs5g
+oKvUHDY8xmsuGxqpNBsZVPrsZcimXffk8b1Cf9YPi/PACaazFUrDbJKLmyew3BMsD0DXG8aAa3OF
+CmbUAwt5efoDzPH6jaKkkTD95rxP1ZPVkinGVkXgCgGHHHPdUZO5LwXEabgyK35/t/Ll+vBOKF/5
+fFW4n1oXd54KM3qOLKaKcFJ3y6Cv4PaqgV3bMDJuJQuX8wwh9QULd6c9oDMHcxIXzlcrgai/1s50
+bCHPBpgtg27m5qO/qn5+UHNIaVFlb/4FJ6hzpohpA8jxIiaOiekr0BVPvvLoZOlJCNfCebU3C0e0
+YCYfwS+wIvxpMvMR6MAdpYB+baL+RRQYCTG6EPN62TT5eB0ppGq8APMQgKFXp5/yvP/psHx99f5T
+Zs4+DtVFEz2CzxhQ26MlkCRvkUSmf3vi9HP4bRp4X5eX1Z7wHqrmvUxXu6OXQPwiCRvZb2gBbZ0P
+jVMAYLBWe0l13yr9buGx/BU/megkmSLEZPmlKG5RZEnLUkHLAbMf4FZmafx69lMttPLLTJNfsdpo
+YiLxQ6bb5UGJnpZPJ5FB8ixaYSovo3pFCWmiJh3A+50q1FV0IRUKH8KoSQ1JMBFprZdk9/MyUi2v
+Cmh78w6YId5QubooNIFG7fqL0+xZSDJbdF1+AWHXWXWHajKIKBmlTu8Oi3F/FebZVIaZ8hcmOqUG
+XY+EaQl994U22/hM5H78U9yxhmgues8aleB70Q2+peZqSBfhC2jjtwlEWu7n9Krcf2LagO1yl7Xn
+3vITCUyFjUywryyQFFk8B+I8VPUkuLvLC2AQXQCBff1TRGNSQqrUnU+AVHWWuG8NI4Bl74PVY9IH
+vOu7drB85R4R+BzExksy8fAzKiANUT1uJDO6zpXGkNKqJy9fi/KIfQ+gQJNh4FuS/MUUjCp3a6vw
+8qNw/eJPqSQAUwq8lcHq8CN1exntpqPBq2y1F3zI6GejdNStsDpVru3os/Q1rnrhHnpKM2ilg2Wi
+VmB/+AhMGbktv0+ePZqtb1UUZK7oh6aKAo2zfQds42bVWzuuXs4Vvwl4UI9H4fJVwBPHQc+Eo8qg
+HxyitIRH6kJ6PD88gavfg4bcmSZG/p7MZz9Cq0K3lOwBz3QIHPFIiC6wBaaqjk7sJeorZPPZ9/ti
+clHvkuX3r3cKxgU6s3xE7g2IjtYQMOLkDMxZY6VWqie1xlJNdQq7T9IPicTV5CvRDT2/UBV3qBgZ
+L4b0UfrrkQODvYSFakWyNHG/eiHfBE4HP2XiKLRAKj/uLp2SwGWYHwJn4L5fg+HWYzL6/+UOlEJN
+CpZoum5R2QjvKqObyMR6rWQaO+xP2wxLcPSp9TZi3h4874oV2+mP5cO72OA4PqN0xMliOuOFMPiH
+DBvcoW3clAhPeOw4AyKcjKfRf4hYIkrFk0ZZkzigIbPg1TRLIpwg0bXMZCxKxEnSMK0dB6773Lo5
+FaZnwmDGyWcJx2y7p7ELE2w6j+o6t2lOSs1jzpoT680tF0WwLrvAh40Xoll3S8nl9DKdtjh2AK8m
+atJf8PApv3FFMz5p7dkKThbLIYLk5pTDtY1q1tYaR5QeR07ogNIjqfSbXthiiAjbnISDN3W+cqSO
+S53RpkNSjm5Em1EdEZHhpHgTeyyZSEWTlB2sNY63XLhNpi3zGKkII1KSZYkYBUZmeEwHDmwjYUTq
+oNkRLLmJMCJ1ROhw5hs2d0gflH6m5ms2wK4KMzroBe90AxWlozgbVtmC2Z0uIqVfREtG0RCvIkee
+mdmM/dNWklB259jgU9YiyKhUEx8XhnllVEXxYD+bQUU1x/TZInfEMT8rrCTSDmECRy8Nb2c1+wCe
+MYgdQWSPU90HFqSsDAg/GsRuysTalO10gB6CrWGwGYoI/YztKGnD/kl9/9ZcT26MUXJDIqL0M7Bm
+BmrjAVFrA5JPd6kvpq7GhBdMDnbp0L+Y5momTJYzprB+Qs6/V0biDPn3Xhlp4FD9e4PkvzdImjHJ
+vzdI/nuD5H/FDZIYK1OEehVFa/IXMwMDGTEDwZb5/r1r8t+7Jv+9a/Lfuyb/39w1Kdu1nYdai2MG
+E8OD5B5q8JjC2wV2iRSheQmmpnZJqV1WFgMWO0cR77H1NdINHTwsd8vr44LnD+muqcQ7glfVXDOc
+/twACH3eZ4biMQM63wS8RJdNGhy2IwHsaoIlCrAn2uBOIXS0p3guYWdOc4Lrtv+tSn5dx+KZSoLm
+sCN1LnAfAxm08EJIxZ41OKQP/AAme6+yGCqH9dECjZ6SZK8IiGwB10x+efAHOv8Af2R8hkEgF/9M
+Bi4e+hEiEmiGAhdjIQp/o2Jnd5mo8uJO+Q29yEYvukKxPErXppee9jldHhHPOeUtFQ==
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	IAXIYhBJhwBfhPAPsoMGQA8XJiR8wADNJiinmK84jJoBHRlAgWpaD2c0NPQccMCADrWorTCkzweJ
+A5bXaoF/kAJkQRKpaZAOZARJSdNXjJtB0MMFCAlBWBhkkz4C1X0YHhQXsxoNaEmPtYc+cF5DQy1i
+tTQcM/ABVKS6pkf0IQwD50gWLZZFg2ThBIT2ED4gNchexArasF4wkAgIBlSJUAvBkE6BtAOgPfQh
+ykQnER5Yosa0+hARgH89PmAxvBE2cLtBuhIkvIoh3eKFAwkfMMAAG7pO3KYiPUBloXFrQJPWQFCm
+lsODp1rp6PT5cA2dIAWBNINP0rjFQJ2IVkvqBRDoBDQz4CEREAwUJtSTahhkfQ2oSIsbBJooEGFA
+i7GhRQd6rgWm0+dD+gWRFHxzh2REkID+Ap/RoFETUciAh0RoMMD4ioy49BpSj2hsdwIA9MEIwR8t
+KpBen8BS6Ehbh2Gv4UbLoIcLARKhwYB6T2gToNkU+lzUqHKtAV+VKL6/II0wlT4fzDDXX3C9hr+M
+NGn3sDYGNiTCggEaTBoPq7j6QtpYTlEU19gS3XJ4SLmJI4eEqGUQy0X6PtIesmjghFQxgCEhEQxo
+gunTtAp603LaY1Jv1pg+fAchkkjAuSA71sZAhYQUMLA8GFhOIRwkxIMHUGC6g8EDCQ4MwhDCIzWv
+AaSTgQeJiMGAV2y4KqMlPazOS5Pp//GSQiQjw4s/UCERMRg8M3SKdA1MQB3iAQabbh9+FcJXIkbU
+iQirKwMPElGDgeHBEKgqpb52x+fj1+gJUg9ISMQNDB69peOEIvSHl0irG9iQiA0MVCAwDPSPFySo
+gQQJBQwKJARSwKBAQiAFDAokFDAokFDAoEBCAYMCCQUMCiQUMMjrkz6QUMCgQEIBgwIJBQyy+MgV
+EgoYFEgoYJDLR06QUMAgi488IKGAQUafVENCAYPsPqmDhOhSBIYCKd7R3p5OjDcY2AHo6ZS8D+vt
+VSX4XnogEc5DuwBDYlBUkBBfxbKsEIVNHoFzGvjFTWg93tEihoWPAobYPx4d+lQ3LxPwcRwMthTL
+RwoDJFD6ncjzSwQEg16vR4k4cNgpCa9jhWA6UdyEOGgimCzKJ3Y8eGlY0LynVvKpJ3CgtAFnWRGS
+CUQKCaGk0WgkGUvYIlavQngQMnUwfOi9qBHQcXD18OkLiZS7vqfvJzgYdPyggjvDH+sYPh6W0WgA
+CYyKATuSLDTiXFXSGwe4SX5+fjFOiaZXqw043Q1K1YJyWXADSMYTd0b7jxm8uwzlE5+PR6teXTMC
+DKPl82ZwfQfNamgDWA3MpFaXqNVgzdL8fOkDCZ/GQRg26DUalmRjoChR4+DBA4aBmFtlTpHoj86j
+bWFOx8UI6zwGovg8KhqNDuei8R9ISMEDXFiKGwcAFcqSh9NhETCwIjAIGPAeQOr0AYaUyic+H8av
+0on1z3jCxr16DT0ZXqJknqrS/FJo88NOP4VfoSRJfwc9jjBGZbnOgmL4qQ2rEwVi+4RWec4rn0R8
+dOLWWDR+ICmJuOknwoYG5RuBuswKCwW4wZcyivB0FoMGCZ2FDjc1wjCSwWGn6AMI1Or4ebGn1+AR
+Qqdh7o50+XiSUzGinoJAgrcLZybG063j9gH3GhK7DP/BA+luGDUj5MXCsKRFC2L8sEFI1sHPepRP
+oj+eaT5ORcUrX+dZLsbtA5enEafuhHmBRqOBxr8AZ4SOAg+kfSC5NLnxCUqXJzQCXC4X1EZ5jTNT
+nsjrQvjohHqK+m5PXh1cYTVcChqSvVOPVyGgfRDwEHaW4dNfwDCSLEPp8ByWxYmehEyAeu9kgKwn
+GWDapQRM348oy6UopaGgf5L6EuGBgAFn0haWr8MuTInxgMaTY8bAWBRGpNDIoLuRRHkYbzReotST
+bIpaiuHnHemYLzTdP6yQ8pS8xUCVl6L5rKcoxSVeRaRI1lNcx/0XKkP3F4O884WS+5A1T4OGprm8
+u562KB0zCQ+kj09WZJpvxlmc+hs+Br7rJ7mySQJ5KauUPl0GNBFwOQctnGacxem49f5pxnGi2ZTn
+D78wPzitrV/idLJKoEPDP5ILGkYOZFcR8k4qdGfh30SQl1kES2QpAy1Uku08+NzsVJpvQzDwPmSV
+gFReVJHVTClAAs8OSvA3jBxQ4zBoUKR4IL2GCi1noRXvMhhI6PXcHiV88m0ymU35hiPKh3y0/N4r
+pEkHS5Xi3UPYoiK0twiu4D49RQgwBIQEaR/gPoAKBjVI2oGxh9FAJbKqjLdnUkFfT7yY4FyBsD3T
+IF8KjQd/SFgxKii8mxXck2xwZiwwpv0eZwOV8kvBOkZ++zYCA7K7nx8WpHpJ+V84aCBugDiwidve
+ESigOSP0ogxyD4UGAkWEBAUYA5hiQYICjwFAcQeAQhcUpRq/yaHBsVNyOb0oVkoK1xynQ4CGxkbo
+FhzXiWQXeB06dFhGRmbslJExDNhGLCeO2yHAa+bwrBEjcnJjpZwRI7KGZwLPQxLEMWJ3WMbw7Jy8
+UWPG5hcUjIuFCgryx44ZlZeTPTxjWGIYRsrNGD4ib3R+4Xi1Vse/l4uSaFqnVY8vzB+dN2J4BlJx
+ItjNzModXTBey5SUV1abzGZL9GQ2m6ory0sY7fiC0blZmfFnGGEhM3vk2PE6g9HkqJ04uaGpqTl6
+ampqmDyx1mEyGnTjx47MzhwWZ4YRu8NHjCpQ643W2oaps+a1Llq8ZGn0tGTxotZ5s6Y21FqNenXB
+qBHD48swx26htsTkbpzZuqxjzbqeTb2bo6feTT3r1nQsa53Z6DaVaAvjzDBmN2d0oa7MOnF664q1
+m39w/U1bbt32k5/8NDr6yU+23brlput/sHntitbpE61lusLROXFkmGO3iKqw18++rLv/+m2/uOu+
+3/5++wMPPBgdPfDA9t//9r67frHt+v7uy2bX2yuoojgy7GHX0Th3Rc+Ptt3524cff+qZ53bs3Pl8
+dLRz547nnnnq8Yd/e+e2H/WsmNvoiCfDArtGZ9P8js03/OL+x55+4aXXdr+xZ8/foqU9e97Y/dpL
+Lzz92P2/uGFzx/wmpzFuDIvYbV7Q2X/zrx588sXX/vbOP/75/gcffrgvOvrwww/e/+c/3vnbay8+
++eCvbu7vXNAcN4a92O26YsvdDz/78p6/f/Dx/oOHPv/8i2jp888PHdz/8Qd/3/Pysw/fveWKrrgx
+7MPu1nse3fHqW+9/cvDLI18d+/rr49HS118f++rIlwc/ef+tV3c8es/WuDHsx+5jO3e9++Fn//7q
++ImTp4BOR0fo0pMnjn/1788+fHfXzsfixrAvu/c+9vyu9z46ePjrb0+dOXsuNjp75tS3Xx8++NF7
+u55/7N74MByA3dff++jQkeMnz5w7f/672Oj8+XNnTh4/cuij916PE8NB2D36zakz57777j+x0nff
+nTtz6pujcWM4OLtnzwO3Ma8jAMfnz8aP4USzG2eGE89uXBlOBrtxZDg57MaN4WSxGyeGk8duXBhO
+JrtxYDi57MbMcLLZjZHh5LMbE8OpYDcGhlPDbtQMp4rdKBlOHbtRMZxKdqNgOLXsRsyw/9RSYPcc
+mkwkgd//fHfOw3CYSShe3x0xqpCqcDQJM+GPDpK5WuyTH4lTJDKnO/iRMGtuclRQhaNH+K0PDx58
+0VBgd5yu3N44v7N/y92P7njtnX0HYCZ8+uy5WKeWEUxCz509DbPmA/veeW3Ho3dv6e+c32gv1xWO
+GpE51PsdB7CbkZ1XoCm11s9t33zznQ8/+8pbH+z/91ffnDwd88w9sln+6ZPffPXv/R+89cqzD995
+8+aVcxtsZdqCkdkZQ8UKxuDNHVvMmiZesrznx7c/8NRf9uz9+ODhY8dPfHsy+nWRKNZRTn574vix
+wwc/3rvnL089cPuPe5bPmmg2FI/N9YYwVi+At9I9dVH3NT/9zR+f3/X2+x8f/Pfho8eOfR3DulPk
+61RfHzt29PC/D378/tu7nv/jb356zdrFU2sr6aLRGBEifrF6SyyT57T33njHA0/++fW3/2/fJ58d
+OBTLql6UK4GHDnz2yb7/e/v1Pz/14B03ASLqraXq/NysYUMEBA8ePGRYVl6BrsLZcunqq7be9Yen
+Xnz1r2//fS9eM4120TTapVa01rr372//9dUXn/rD3VuvWrNwistIFY7KzvAAAuCL4EBX1k5b3H31
+1l9t/+MzL7706uu7/7onhjXp6Ney9/x19+uvvvTiM3/cfufWq9cumT6hWj/eCxAEvkVMVe20Rav7
+b7ztnt8/8vhTTz+7Y8fOqJf8oyd45o4dzz791OOPbL/nthuvWLN4xoQaVjUmx59futLVMr99/dU3
+/uT2u359/++2b38g6jcqsRA8dfv2391/3923//TGH2xY2Tq1tloP/A4fJjTBGA8jobOwTZ65cOW6
+vh9cf9MtW7dt+0nUL6xiI3jutm1bt9x0/TV96zoWX9LgMEIDkSPqMhC/WXn5arba1TBjwWUrV1++
+YeOm3ljeB8ZKvb2bNm64fE3HZa2XNNaaSrTjRnnhdzB5H6gtqXZMbJ4xe/6lsb1tjQctWbzo0gVz
+ZrRMcpnK6PFj87JE7QPXHY8t0hqMZkdt3eSGxlheZseHmhobJk+82GmpLKFUvm+Yyegsb0yhmmLL
+jFU1sTkLxIfMZlNNlbHMQGuK8kflZGWIRzxoeDZseHbuqLHjkC8GFZsvRryIpimtWlVYMDpvRJaP
+TwdmODNrRO7I0bH7usSLCpDTzGjiNOPr5UN8iTKHZ2WPyIndlyhelJMzYkR2YKekuLpqxY8yMoYB
+s4G8vogrXBw84eJJQ4hbXRCnujh5GsaTwnstxsGTM64UgtW0IIOheUNnU3tfe272oqm52Yb6afY2
+ODOvfXNfV29u9iw41VZT39vX1N3R192zob33aqoWnTNTNfO62tdRZaQkBUWo2b3dq7s3wMn5He3r
+usqpSlTwYvSVm22i6rtys/vRwWz4qnY53FaL2Wmyus0ml8VFmaodFovTZLe6gUxwijKhf9VwZLVb
+3Dar0+yyWa1wxup2mJxw7LQ7HE67E844UQGz2Q0fh81mocoa1vV3US6TqRxuYaYWXY6eaiY3pBZd
+nZvtdFZDl+iyuVwOJ7BgoarsDmDJbrLY0NPMdmp9brbZ7Kg2Wx1Oq9VkMtusNihkMVc7XDYHMOm0
+WmxWah2UcrmrbRab3WF3u+0WkytwKYvFVW2zuRwOmwVOus3+D4RCLbnZrbnZbqqsnFq0EB9jfjtz
+sx38OUObJNbBPJKYh3KS2De0SRLA0BYULnCut507LqufRtX39/VQBDrdPwCo1Mzv6+3esJqDDFVW
+39mzsqutfpq7bfbKzV29V3R1ts3ourqNlNrsDS0zFN/Qs4GyOYiSBKiByasJjszY7BjcLd3rumq5
+44YuwCsPdVAxFJuSm13T1HVFd0fXvCkN1CIQaCkHHTNlNiE9Oi3UMsphpmw2ZJ01QQ==
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	PQx0+MlO4SnVtuy0kWqFJI5kp2oZ6Fl2OpGHWuJLslOybDQsO83ISTmxk+zUKzPdyk4/8lPRAFGs
+LLUqOy3JVVFprFIZ61N2upK3utJMmbLXpOw0lg5KSwM1pokOZae39FGdTBWoaO/CUKDsVJcmepO1
+DtNBjbJTmuw1ljaalLcyZacuGesqLfUpV5XKTlGy1FLaa1V+ipWdimSmnwGlWzmpV3bKkY1m4kWy
+07A8lCw7tchAJ4kg2ek51aqWnUIGKPAIyU7bqVO47FQxoIFHSHY6j0HthYWFcDAocrWLL4E7wH0U
+4CWH0hR+tLfySW5MlKGLZSOCn7gwXEsAzGXa5MWnFeAljNIXfgx80zSLv6ODnxh4KpWKAI+7p5pm
+FOAlntIJfhRFDMFy2fW1KBM1HDCMXq+Hb4CQOGeXFKmhvFqthmvZIpZRMRTOaI3uTLaTICLjRyvA
+SwSlF/zQgY5muf2VdAzOQY1SARcVcfkJB4WBn7hthGtL8/OLi4vZ4mKEYZAR35bm9zHRa8XA0ynA
+izvJHn46j1FIcmCCPQrttYRwqGZK1IgKsEUkYg8aPTK/0Al51DU4xTrO8I82MdEKj1OAl0CSP/z0
+xDQcGGgG45CGEZ+GhhGawC3qeUM2feJGjx3DQm9LhnmkLcWDSYI0vCG7ArykkNzhJ7otGu8h7NGk
+9QMy4CT8JSoV9KEhmj5PozfIqMJJ1HW42dST+YsWQxq3eIywTac2AaIpwPMjOcOPb4X4kR55OoGf
+TmegKNJvwrANOt+w2EMprAsKAKswxWDxMA+wR6yPunId18B6enwFeIknecPPg0OykRza31CLNrvh
+OCwuBuDBKC7YhNerw2VZmCCX4mv1pLflBKEJyPXchp7xE0QBXjiSI/xEhmNE43/cP+INmDQ0dJ2I
+w6Ii6HbFa33+ooFcZGmFdLgwWabJLnW8FHyj6ss/SwaBCvASSXKCn5e58T39sIcejSYL0O2iiQPL
+Bhvy8UJZyWCvFJdHPTW3UbvWb3dsnUgKBXhJItnBT6sTWxAfY8Ph7hJtbK3RMHjjmxBDPk4iK4e9
+ElyeJSvVlKdFFdo9RsRGTI2eArwISTbwozl7iVHHTUVp9KG5fQ+Z4mJhPyarfLCnAC8qkgf84o29
+ZPa5CvBiIBnAL959btLmGgrwYqaUwi/+c41ByVljUYAXJ5JB6xe3NZZBSVhbVoAXV0oZ/BKwtpzY
+d2oK8BJAKYBfXN+pfZ8EXwIFeAmjpMIv3r4E38fZh4r2PVCAl2BKAPzEE4qAdoy/D9WguPuOKsBL
+CsUfflod9wkEPI8dY/Yd/d676YvQZ94LXT6fwAwrwEsAxQa/UEYMasd4+Mz7MB95rFCQaa+WP68A
+LykUO/zwh/SnxGQ6bjgXCHjxihX63rvnjShGkmuihZVnreiAP6kALzkUNfz0/Cgu+JwisB3jEiP5
+vd/AL3xsuKfhFSbd3Ns90YzYt6YowEsoRQw/sRG1pOkQjwC5MwHtGK/Y8Cg5F5DG1RpP++w5SRpn
+BXjJoiiNqOXng0Jz5xk1ecokKCdGFJwzHp51QisntIQMjz1GAV5yKeo2hOHfXjH8uoSoSUxGAyKF
+cxovPpN1P4Y70PHeL5TXGbRGxHk4KMBLGkk0Il5Go3m80cL6recbv9Dn/Ulo/6427nYMy7ln4UX8
+VoXMevxOCrMhBXjJpAjbEGIp3wUWlhs76ZLZgITmHDkHEu8+il9gJB4vZOyKqxJ3kiLvmrnZkAK8
+ZJLENkRsRz3pvIRvsRGT2ICE5pzRMKgu4OqjJ+x5c4vfsyBPQrzwyCjASwmFaUPw4i1+SUGT1we8
+EWnhTRY+zznmQfmk2TEg52Q2beCXsonLARKEMAm/oyUgvPiDPWqgmAEfwIUK8JJPIeBHjMhiXOk1
+qMVgKc/0EJ2HPzXYHVRkx6Q1ID6cF/DwI2SgPCM9VsO1zORAz3vUCIXhwgIFeKmgYG0I9/oAd6YG
+LXIdYbHPMIt7YeTOpKHhPHFFpnhTpnBrIbKMowdSqfRqNXG4YonfC6443AFu/aAAKqbXCxcqwEsJ
+BTeinlGr0UejYbD3CEKghkIuTNz7Mg0poEdmTIEdRc/hOGcYpkSl0mC3fGDMgH0YSL2AA/ynGo6h
+AHKHZpgYFx4Vip384Yf9RopK1GodCS6DlgT3wsiHBPpi3ojwK5SBkoIdk9yAiGFDXA6IuwLUBQAY
+VApgSYeJwv4M6KQemj21UFgBXsopmBHRKkRxMYVdjhnkQMfAN3HjhPPwa8rtKH4ocbiC8Rswg2J7
+gasiFG0EBAcl2AMffoICyJ1G5NWgAC+15AM/YkSEteJi0qVCo1GqQUQ65WLszEnsmNoGRPxoK888
+CgkpKCjNL2UxwQH8CScJt+L2WQGeHMirDcH9LzRopBkhc1hCFI5ehPPErc4oAzt6s4AQCM0aYVsg
+FPhmNPqgTgGefMjHLoIFoblQ8aQmeSqwKeVjRz9MSaIUMqyQPwW0EWlJCPk3HfKxo4K6AUBp3Xqk
+F7cKBaS0Q51CA5IUvCmkkEIKxZciGmEqpFC60WCBUs1JvAhEuYijASIVEmjIkKFDhw0bOnTIECRW
+qjmKmUCkIUOHZWQOB8rMGDZ0SPoLBUYaOiwza0RObl5ebs6IrMxhQ8FUqeYqJkJGysjKyRudXzBu
+XEH+6LycrAxkqlTzFQOBSMMys/PGjFNpKJqmNKpxY/KyM4els1BIpOEjRuardIbyqpqaqnKDTpU/
+csTwNBaKiDRqnIY1Wlx1kybVuSxGVjNuVBoLhUXKGV2oKzXVNkyfPW/e7OkNtaZSXeHonHQViheJ
+KrdNmr5gWceqVR3LFkyfZCun0lYoTqQiqsLeMPuy1Zuu+uEPr9q0+rLZDfYKqig9hfKI5Gia195z
+zS0/+8UvfnbLNT3t85ocaSqUIJLR2TS/Y/MNt927/aGHtt972w2bO+Y3OY3pKJRIpOYFnf03/2r7
+n57esePpP23/1c39nQua01EoL5G6rthy98NP//nV3btf/fPTD9+95YqudBTKR6St9zz63Ct/e2/v
+3vf+9spzj96zNR2F8hPpsZ2vvf3+x59++vH7b7+287F0FMpXpHsfe37Xu/s+++LLL7/4bN+7u55/
+7N60EyqASK+/99HBw8eOHz92+OBH772efkIFFunQkePfnjr17fEjh9JQqCAiHf3m5JmzZ8+c/OZo
++gkVVKRTZ86dP3/uzKn0Eyq4SGfPfwd0/mzaCRVSpP8ApZ9QYUT6/vv0EyqsSOknlASR0k0oSSKl
+l1ASRUonoSSLlD5CRSBSuggVkUjpIVSEIqWDUBGLJH+hohBJ7kJFJZK8hYpSJDkLFbVI8hUqBpHk
+KlRMIslTqBhFkqNQMYskP6EiHONxJGuhIhqJo6UIRP5iyUmoyCYX350/f/7cuXPw/Z2vCeUjlHSR
+8GrRubNnzpw+ffrMmbPn8AKSHIWKRCQk0elTJ0+c+ObEiZOnThOp5CdUhCKdOXXi+LGjRw4fOXrs
++Am0ICtDoSIT6ezpb48f/fLzA/v37z/w+ZdHj397WobT+QhFOnXi2OFDn+57f+/eve/v+/TQ4WMn
+5LdGEalI33z1xf59/3hrz+5du/e89Y99+7/4SnYLLxGLdPTzT/751usvvfDcs8+98NLrb/3zk8/l
+tpoUuUiHPv7Hnpd3PPHIg9sffOSJHS/v+cfHMlsii0Kkf/39jT8/9dB9d9z2s9vuuO+hp/78xt//
+JSuhohHpvd0vPv67X2697uorr75u6y9/9/iLu9+Tk1BRiIT4++Nvfn5939rOlZ1r+67/+W/+KKsV
+2ihF+u9fb7tm3YqFc2fPXbhi3TXbfv3fMhIqSpEeu/fWq9YsmdU8qW5S86wla666VUZr6VGLtPXK
+VQun1dlN1SZ73bSFq66UzwuCWERqbamtKdPT+rKa2pZW+QgVg0hdrc2uSr1mfOF4jb7S1dzaJROh
+YhPJaaRV+aNHjc5X0XC9TISKXiTCEV00Jm9E9oi8MUW0XF66xSoS4icrMyMzSz5vEuMh0vCMoUOH
+Zsjm9WhcRAJeLpLPO994iYSC1WQiVPxEGiQXoeImUoR3S6BQ8RVJFkLFWyQZCBV/kVIuVCJESrFQ
+iREppUIlSqQUCpU4kVImVCJFSpFQiRUpJUIlWqQUCJV4kZIuVDJESrJQyREpqUIlS6QkCpU8kZIm
+VDJFSpJQyRUpKUIlW6QkCJV8kRIuVCpESrBQqREpoUKlSqQECpU6keIjVIAcLyQdTGpEil2oCqpw
+1AjfFEODBw8ZmjliVCFVkQqRYhWqyVGhQ0IN9UrbNfiioZnZowp1FY6mVIgUg1D3bL2ic36TvVw7
+bmR2xlDvlcSMrJEF2jJ74/xOlBwh2SLFItSW/s55DbYyTUFeVoZoxXcw3C93rLrEWj+3o39LKkSK
+Wqidj959S9/KOZMthuIxOcM9hgLkZYwYPV5vmjhrxeab7350567kixStULt2PnLXTZvaLqmrZopG
+ZXsMNfiiYcPzCnRG9/TLem741cM7UiJSlEK9+9pzD93x4/VLpjrLNfm5gqEAehnZo8cbrI2t3T/6
+xYPPvPpOSkSKSqiD+9555entt12zan69SV80MmvYEP6t0NDMnHxtRe3MFX233v/ky299ePBIKkSK
+RqgjBz548y9P3Leld9k0V5l6zAgefCDT8LxxtKl+Qfd1dzz6wp5/fnb4+MlUiBSxUGdOHj+8///e
+eP7h23+4au7EKqogN3MoL9OwrJHjDbaWJRu3/OapV979+ItjJ8+cS4VIkQp17sy3x7741zsvP3Hv
+TesXNpr1hXnDPTJlj1aVOqe3XfGzB57b/X+fHfnm9LnzKREpQqHOnzv9zeH9e3c987ttvZdNsRlQ
+heJkGgIyFZe5Z7Zf9V8PPb/ng4NffYvMlBKRIhMKDHXi6IF/vrHjgZ/2L5/mKBk/SrJMsvVACyFT
+GOzJ1VMwJPZCtxFy9egM00aEasvl6nkbri0P0efK1UM6XJ8bYmwkU0/2/4QbG4UYw6Yuz1I4ocKM
+YYPONVKaDyuEUOfOo+C3MHONIHPC1OYtC5V77Jyg6mBzwiBz91Tnlwua9u7k6dOnT/J8BZm7B1lj
+SXkewCDpCY98feLbE18fORh6jSXQWpgc8jUGTiN54MujXx398oCHr8BrYX5rljLJq+krFLC1650P
+Pj146OCnH7yzS+Ar4JplgKvlkf/Un60dr76598N9H+5989UdYr4C5g/3uVoueWr92HrkmZd2v/nW
+m7tfeuaR8Hx5XS2ffMLeQvXfcueD/7Pzf1/6353/8+Cdt/RH8gJKTnmfvXXdd+Pt9z/8pyf+9PD9
+t9/YJ0HVwtXyys/tpeuVG6/d9st7fn3PL7ddu3GlFFV7hJJVHnWRrhvnLF97xbU33XzTtVesXT6n
+UYqquavllu9eEKrcNnnmwvbuDRs3dLcvnDkZ+JLuICG3fQkEtsosE5pntS5eurh1Vg==
+	]]><![CDATA[
+	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
+	]]><![CDATA[
+	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
+	]]></i:pgf></svg>
\ No newline at end of file
diff --git a/src/favicon.ico b/src/favicon.ico
index 159603ed009a4b24d3c54a6940d03df1c423ca18..6297f691952b183126f9bf6bedf074a2a080a864 100644
GIT binary patch
literal 1150
zcma))ZAep57{?z;S}MLxckjG+cf03`5Pb>iTOaC!UkZsJ5=_)d2I(@J3NvxCB}Qtw
z`LYxh(;^i~D$9wLsikHHLPZf3g_voWHhVE+ZufL<+rl-Z?&ZAP=lp;F=i#{rAc(wC
zQ9x!MvV#FA0N6?f36Y2=P8I-iCJ*zB-`^Wf@i1dmgEftpR~^<wKQ^g|a_5F>|APd0
zZ$;3d6R0;8e9K6Ys;NAgQ}pT?BHQgR4fs;QkCu42oFmZlHA34`9q)cv!n*8wrnU4S
zM~xYkgxDTHNrA{n0dThfS9AhBRl>EuGO_O0r&ZH8vgzrLOojWRmTE6cR?{CWH0jkg
zKab79(J)$qpeGN7&s$OJf>k3<<SXZ{rYaIE_R166Qe)=t7Q~4Ig>38D6fV3aO9e97
z7O#iYn_M!~LD%!*W0vYs|My0O9X9moNg2xM%we^|24-=zn8Ei9jJ+yF69cd#$OG>J
zJS4!aLLqL#z?rXQP>sVmO8ac3+9`P~)bft8V%G8C6odOuD4k7*V(jOW<c)1w+FYHc
zj>BCFxO5DKeyl;wj(T2vN_2x+3Ouf(@N9(|f3D~8BO{CLxioG~mg9y4(YPx!7L$6!
z+l6cs>1pV=5y?ocmTwKn^~Hv;*TYRb#CPSKIH*^OgcS+v?j-Dpfx)C67xAz(A5qCj
zZkRrYB9?8)Mm*M*Z9INns+#J{q;#XXbb4o6Y`S&7T-SY+n)0%1gtgr~$wmwmN_Qd_
z=KVcf#AjuuS};{>6GC+RP)J`sYbH5Yym{BLcRXz*Gx=}p>u`O&fL7mDqKaF3w(@=v
zvl_@I{b7BZzdaV~c;`e3>-4hqy;98uQq3Db>-$0OuZ#5GHDqA^i}krm9&=V9V$Q<X
zP8!*op5x3v^ZHod`tpn#UX-iDCQG@nXJwo(9I%Qe0M{OXpBjMWNPuY>z{n;5v-gHd
RfV7ul(wU@@v=Sq+zW~@2PSpSa

literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYJy!T041K0tg1i2sv_L3+s5
z3$u$HdtrKU(*L1=ME}6e8!q}`{s7UWgaxub7@HjZr079bOOBn`^ux@7(a37>v0>`b
aX?%JpkfS6IP?871dK(zgO9bNiAiV&jnaQ01

diff --git a/src/index.html b/src/index.html
index af761476..3ad6af95 100644
--- a/src/index.html
+++ b/src/index.html
@@ -40,17 +40,12 @@
             }
 
             #fuse-splash-screen .logo {
-                width: 96px;
-                height: 96px;
-                line-height: 96px;
+                width: 128px;
                 margin: 0 auto;
-                font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
-                font-size: 56px;
-                text-align: center;
-                border-radius: 2px;
-                background-color: #039BE5;
-                color: #FFFFFF;
-                box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.22);
+            }
+
+            #fuse-splash-screen .logo img {
+                filter: drop-shadow(0px 10px 6px rgba(0, 0, 0, 0.2))
             }
 
             #fuse-splash-screen .spinner-wrapper {
@@ -194,7 +189,7 @@
             <div class="center">
 
                 <div class="logo">
-                    <span>F</span>
+                    <img width="128" src="assets/images/logos/fuse.svg">
                 </div>
 
                 <!-- Material Design Spinner -->

From fe7e6d173b5d2c85ec3fef2f8bd44c1f54c3785d Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 10:47:35 +0300
Subject: [PATCH 04/27] small tweaks and clean-ups

---
 .../nav-vertical-collapse.component.ts        | 127 +++++++++-------
 src/app/core/fuseUtils.ts                     |   9 +-
 src/app/core/services/config.service.ts       |   2 +-
 .../navbar-horizontal.component.scss          | 136 ------------------
 4 files changed, 76 insertions(+), 198 deletions(-)

diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
index d7676cc3..dc2d2535 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -17,19 +17,15 @@ export class FuseNavVerticalCollapseComponent implements OnInit
 
     constructor(private navigationService: FuseNavigationService, private router: Router)
     {
-        /**
-         * When navigation changed
-         */
+        // Listen for route changes
         router.events.subscribe(
             (event) => {
                 if ( event instanceof NavigationEnd )
                 {
-                    /**
-                     * Check if the url is child of the collapse
-                     */
+                    // Check if the url can be found in
+                    // one of the children of this item
                     if ( this.isUrlInChildren(this.item, event.urlAfterRedirects) )
                     {
-                        // console.log(this.item);
                         this.expand();
                     }
                     else
@@ -40,47 +36,46 @@ export class FuseNavVerticalCollapseComponent implements OnInit
             }
         );
 
-        /**
-         * Whenever a navigation collapse item toggled
-         */
-        this.navigationService.onNavCollapseToggled.subscribe(
-            (clickedItem) => {
-                if ( clickedItem.children )
-                {
-                    /**
-                     * if clicked collapse is child of this collapse
-                     * return
-                     */
-                    if ( this.item.children.indexOf(clickedItem) !== -1 )
+        // Listen for collapsing of any navigation item
+        this.navigationService.onNavCollapseToggled
+            .subscribe(
+                (clickedItem) => {
+                    if ( clickedItem.children )
                     {
-                        return;
-                    }
-                    /**
-                     * If collapsed item is not related with this collapse
-                     * collapse
-                     */
-                    if ( this.item !== clickedItem )
-                    {
-                        this.collapse();
+                        // Check if the clicked item is one
+                        // of the children of this item
+                        if ( this.isChildrenOf(this.item, clickedItem) )
+                        {
+                            return;
+                        }
+
+                        // If the clicked item is not this item, collapse...
+                        if ( this.item !== clickedItem )
+                        {
+                            this.collapse();
+                        }
                     }
                 }
-            }
-        );
+            );
     }
 
     /**
-     * Toggle Collapse
+     * Toggle collapse
+     *
      * @param ev
      */
     toggleOpen(ev)
     {
         ev.preventDefault();
+
         this.isOpen = !this.isOpen;
+
+        // Navigation collapse toggled...
         this.navigationService.onNavCollapseToggled.emit(this.item);
     }
 
     /**
-     * Expand
+     * Expand the collapsable navigation
      */
     expand()
     {
@@ -88,11 +83,12 @@ export class FuseNavVerticalCollapseComponent implements OnInit
         {
             return;
         }
+
         this.isOpen = true;
     }
 
     /**
-     * Collapse
+     * Collapse the collapsable navigation
      */
     collapse()
     {
@@ -104,40 +100,61 @@ export class FuseNavVerticalCollapseComponent implements OnInit
     }
 
     /**
-     * Checking the url is in children
-     * @param arr
-     * @param url
-     * @returns {any}
+     * Check if the given parent has the
+     * given item in one of its children
+     *
+     * @param parent
+     * @param item
+     * @return {any}
      */
-    isUrlInChildren(arr, url)
+    isChildrenOf(parent, item)
     {
-        if ( !arr.children )
+        if ( !parent.children )
         {
             return false;
         }
 
-        for ( let i = 0; i < arr.children.length; i++ )
+        if ( parent.children.indexOf(item) !== -1 )
         {
-            if ( arr.children[i].children )
-            {
-                if ( this.isUrlInChildren(arr.children[i], url) )
-                {
-                    return true;
-                }
-            }
+            return true;
+        }
 
-            if ( arr.children[i].url === url )
+        for ( const children of parent.children )
+        {
+            if ( children.children )
+            {
+                return this.isChildrenOf(children, item);
+            }
+        }
+    }
+
+    /**
+     * Check if the given url can be found
+     * in one of the given parent's children
+     *
+     * @param parent
+     * @param url
+     * @returns {any}
+     */
+    isUrlInChildren(parent, url)
+    {
+        if ( !parent.children )
+        {
+            return false;
+        }
+
+        for ( const children of parent.children )
+        {
+            if ( children.url === url )
             {
                 return true;
             }
+
+            if ( children.children )
+            {
+                return this.isUrlInChildren(children, url);
+            }
         }
-
-        return false;
-    }
-
-    public isCollapsed(): boolean
-    {
-        return this.isOpen;
     }
 
     ngOnInit()
diff --git a/src/app/core/fuseUtils.ts b/src/app/core/fuseUtils.ts
index 3278c1a6..1d1763f3 100644
--- a/src/app/core/fuseUtils.ts
+++ b/src/app/core/fuseUtils.ts
@@ -1,6 +1,5 @@
 export class FuseUtils
 {
-
     public static filterArrayByString(mainArr, searchText)
     {
         if ( searchText === '' )
@@ -17,7 +16,6 @@ export class FuseUtils
 
     public static searchInObj(itemObj, searchText)
     {
-
         for ( const prop in itemObj )
         {
             if ( !itemObj.hasOwnProperty(prop) )
@@ -29,7 +27,7 @@ export class FuseUtils
 
             if ( typeof value === 'string' )
             {
-                if ( this.searchInSting(value, searchText) )
+                if ( this.searchInString(value, searchText) )
                 {
                     return true;
                 }
@@ -41,7 +39,6 @@ export class FuseUtils
                 {
                     return true;
                 }
-
             }
 
             if ( typeof value === 'object' )
@@ -60,7 +57,7 @@ export class FuseUtils
         {
             if ( typeof value === 'string' )
             {
-                if ( this.searchInSting(value, searchText) )
+                if ( this.searchInString(value, searchText) )
                 {
                     return true;
                 }
@@ -76,7 +73,7 @@ export class FuseUtils
         }
     }
 
-    public static searchInSting(value, searchText)
+    public static searchInString(value, searchText)
     {
         return value.toLowerCase().includes(searchText);
     }
diff --git a/src/app/core/services/config.service.ts b/src/app/core/services/config.service.ts
index dbb4720f..6cdc2383 100644
--- a/src/app/core/services/config.service.ts
+++ b/src/app/core/services/config.service.ts
@@ -30,7 +30,7 @@ export class FuseConfigService
             colorClasses    : {
                 toolbar: 'md-white-500-bg',
                 navbar : 'md-fuse-dark-500-bg',
-                footer : 'md-fuse-dark-800-bg'
+                footer : 'md-fuse-dark-700-bg'
             },
             customScrollbars: true,
             routerAnimation : 'fadeIn'
diff --git a/src/app/main/navbar/horizontal/navbar-horizontal.component.scss b/src/app/main/navbar/horizontal/navbar-horizontal.component.scss
index 28cea62d..8b137891 100644
--- a/src/app/main/navbar/horizontal/navbar-horizontal.component.scss
+++ b/src/app/main/navbar/horizontal/navbar-horizontal.component.scss
@@ -1,137 +1 @@
-@import "../../../core/scss/fuse";
 
-fuse-main {
-
-    &.fuse-nav-bar-folded {
-
-        .content-wrapper {
-
-            &:last-child {
-                padding-left: 64px !important;
-            }
-
-            &:first-child {
-                padding-right: 64px !important;
-            }
-
-            &:first-child:last-child {
-                padding-left: 0 !important;
-                padding-right: 0 !important;
-            }
-
-        }
-    }
-}
-
-fuse-navbar-vertical {
-    display: flex;
-    flex-direction: column;
-    width: 256px;
-    min-width: 256px;
-    max-width: 256px;
-    background-color: #FFFFFF;
-    overflow-y: auto;
-    overflow-x: hidden;
-    z-index: 3;
-    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2), 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12);
-    transition: all .3s cubic-bezier(.55, 0, .55, .2), width .1s linear, min-width .1s linear, max-width .1s linear;
-    transform: translateX(0);
-
-    &.folded {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-
-        &.left-navbar {
-            left: 0;
-        }
-        &.right-navbar {
-            right: 0;
-        }
-
-        &:not(.folded-open) {
-            width: 64px;
-            min-width: 64px;
-            max-width: 64px;
-
-            .navbar-header {
-                padding: 0 16px 0 16px;
-            }
-        }
-
-        &.folded-open {
-
-        }
-    }
-
-    &.close {
-        &.left-navbar {
-            transform: translateX(-100%) !important;
-        }
-        &.right-navbar {
-            transform: translateX(100%) !important;
-        }
-        box-shadow: none;
-    }
-
-    @include media-breakpoint('lt-lg') {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        &.left-navbar {
-            left: 0;
-        }
-        &.right-navbar {
-            right: 0;
-        }
-
-        &:not(.initialized) {
-            &.left-navbar {
-                transform: translateX(-100%);
-            }
-            &.right-navbar {
-                transform: translateX(100%);
-            }
-        }
-    }
-
-    .navbar-header {
-        padding: 0 16px 0 24px;
-        display: flex;
-        align-items: center;
-        height: 64px;
-        min-height: 64px;
-        justify-content: space-between;
-        transition: padding 200ms ease;
-        background-color: rgba(255, 255, 255, .05);
-        @include mat-elevation(1);
-
-        .logo {
-            display: flex;
-            align-items: center;
-
-            .logo-icon {
-                display: block;
-                background: #039BE5;
-                width: 32px;
-                min-width: 32px;
-                height: 32px;
-                line-height: 32px;
-                text-align: center;
-                font-size: 16px;
-                font-weight: 500;
-                color: #FFF;
-                border-radius: 2px;
-            }
-
-            .logo-text {
-                margin-left: 16px;
-                font-size: 16px;
-            }
-        }
-    }
-
-    .nav-bar-content {
-        flex: 1;
-    }
-}

From 6f4dc36a3dabf87177b0e4af948654f005f48f36 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 10:48:02 +0300
Subject: [PATCH 05/27] locked dev dependency versions to prevent "npm update"
 errors!

---
 package-lock.json | 1845 ++++++++++++++++++++++++++++++++++-----------
 package.json      |   36 +-
 2 files changed, 1404 insertions(+), 477 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3cf31a58..2cd49d08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,14 +5,41 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/build-optimizer": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz",
-      "integrity": "sha512-yEMkYU4YU8XlA5OauPhg22ZEWJ4X2VhiFKUwfeo4UWJ7lz4XWiuBJocrT5NHWqI1S0rOLpSixLXG9byvFMbavA==",
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.20.tgz",
+      "integrity": "sha512-Y8JkT0C6ZbN1yJgnlOLfZru/VnJk8ojnsWTmTyq5C0NISqOzca64Q/NNgCOTupOc8FIoq66Bsyb3IfAdnFPe6g==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
         "source-map": "0.5.6",
-        "typescript": "2.3.4"
+        "typescript": "2.3.4",
+        "webpack-sources": "1.0.1"
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.13.tgz",
+      "integrity": "sha512-v61gnvEWh5/lYUvq5qaZ6dRIdJ7XHWcKLxDziZsrCcD4tn5BpEyQ0WX1pUeG4E4Othiz92Qcz6WNQT8SbD8V6g==",
+      "dev": true
+    },
+    "@angular-devkit/schematics": {
+      "version": "0.0.23",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.23.tgz",
+      "integrity": "sha512-7GxsbPEFT6GepBUh0WkYyp1mgIVeiaPEqGyNCpngQ/kP9DXZDc3ObPQS4B6VEqHmfy+AlhoRnEc+OFJLIe5o5A==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "0.0.13",
+        "@ngtools/json-schema": "1.1.0",
+        "minimist": "1.2.0",
+        "rxjs": "5.4.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
       }
     },
     "@angular/animations": {
@@ -32,45 +59,42 @@
       }
     },
     "@angular/cli": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.3.2.tgz",
-      "integrity": "sha512-VAZXI19PbhhUE/dJH5r6HT7502y0OXYzxhbGIagh/e7SNKnVV8KglVL4zfTfnsI8kmLrFFbAmPy7xomKO8Btkg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.4.2.tgz",
+      "integrity": "sha512-vtKs76cJQR3Dtf76i2N2xMgx02lYZXK/l+WTHG7qPUj7bCBRHp2ltahZVano5N9IyaZgB5RK4bPnFXOlnaYDlQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/build-optimizer": "0.0.13",
+        "@angular-devkit/build-optimizer": "0.0.20",
+        "@angular-devkit/schematics": "0.0.23",
         "@ngtools/json-schema": "1.1.0",
-        "@ngtools/webpack": "1.6.2",
+        "@ngtools/webpack": "1.7.1",
+        "@schematics/angular": "0.0.35",
         "autoprefixer": "6.7.7",
         "chalk": "2.1.0",
         "circular-dependency-plugin": "3.0.0",
         "common-tags": "1.4.0",
-        "core-object": "3.1.4",
-        "css-loader": "0.28.5",
+        "copy-webpack-plugin": "4.0.1",
+        "core-object": "3.1.5",
+        "css-loader": "0.28.7",
         "cssnano": "3.10.0",
         "denodeify": "1.2.1",
-        "diff": "3.3.0",
-        "ember-cli-normalize-entity-name": "1.0.0",
         "ember-cli-string-utils": "1.1.0",
         "exports-loader": "0.6.4",
         "extract-text-webpack-plugin": "3.0.0",
         "file-loader": "0.10.1",
-        "fs-extra": "4.0.1",
+        "fs-extra": "4.0.2",
         "get-caller-file": "1.0.2",
         "glob": "7.1.2",
         "heimdalljs": "0.2.5",
         "heimdalljs-logger": "0.1.9",
         "html-webpack-plugin": "2.30.1",
-        "inflection": "1.12.0",
-        "inquirer": "3.2.2",
-        "isbinaryfile": "3.0.2",
         "istanbul-instrumenter-loader": "2.0.0",
         "karma-source-map-support": "1.2.0",
         "less": "2.7.2",
         "less-loader": "4.0.5",
-        "license-webpack-plugin": "0.5.1",
+        "license-webpack-plugin": "1.0.1",
         "lodash": "4.17.4",
         "memory-fs": "0.4.1",
-        "minimatch": "3.0.4",
         "node-modules-path": "1.0.1",
         "node-sass": "4.5.3",
         "nopt": "4.0.1",
@@ -80,10 +104,8 @@
         "postcss-url": "5.1.2",
         "raw-loader": "0.5.1",
         "resolve": "1.3.3",
-        "rsvp": "3.6.2",
         "rxjs": "5.4.3",
         "sass-loader": "6.0.6",
-        "script-loader": "0.7.0",
         "semver": "5.4.1",
         "silent-error": "1.1.0",
         "source-map-loader": "0.2.1",
@@ -91,13 +113,12 @@
         "style-loader": "0.13.2",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.1",
-        "temp": "0.8.3",
         "typescript": "2.3.4",
         "url-loader": "0.5.9",
-        "walk-sync": "0.3.2",
-        "webpack": "3.4.1",
+        "webpack": "3.5.6",
+        "webpack-concat-plugin": "1.4.0",
         "webpack-dev-middleware": "1.12.0",
-        "webpack-dev-server": "2.5.1",
+        "webpack-dev-server": "2.7.1",
         "webpack-merge": "4.1.0",
         "zone.js": "0.8.17"
       }
@@ -223,16 +244,23 @@
       "dev": true
     },
     "@ngtools/webpack": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.6.2.tgz",
-      "integrity": "sha512-2s2kCCV3FQUC+MG69e+H5k7zELuVcQ0Gkl1ioqR25HOclxv0UGVY7jsmz9LRm/DanS5ORXQt4S82EFV1dY4w+A==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.7.1.tgz",
+      "integrity": "sha512-XZqdPTLy/NAS9HaaC5G1KWPo2cgxv4Il9YJAHNf81GsFNZFRY0Z+BiwLnqg0ut34cUOTEX+V/ozCf2VbdccM5g==",
       "dev": true,
       "requires": {
+        "enhanced-resolve": "3.4.1",
         "loader-utils": "1.1.0",
         "magic-string": "0.22.4",
         "source-map": "0.5.6"
       }
     },
+    "@schematics/angular": {
+      "version": "0.0.35",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.0.35.tgz",
+      "integrity": "sha512-Da/JvgO5Jc0Kugg0n1o6a7dcBWA5GW7hU91tpslRY0KznDsS/HhTNFg7gPQoaOec1eshbJ17/IBq9BwOOxZNeA==",
+      "dev": true
+    },
     "@swimlane/ngx-charts": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-6.0.2.tgz",
@@ -252,9 +280,9 @@
       }
     },
     "@types/jasmine": {
-      "version": "2.5.54",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.54.tgz",
-      "integrity": "sha512-B9YofFbUljs19g5gBKUYeLIulsh31U5AK70F41BImQRHEZQGm4GcN922UvnYwkduMqbC/NH+9fruWa/zrqvHIg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz",
+      "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==",
       "dev": true
     },
     "@types/jasminewd2": {
@@ -263,7 +291,7 @@
       "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
       "dev": true,
       "requires": {
-        "@types/jasmine": "2.5.54"
+        "@types/jasmine": "2.6.0"
       }
     },
     "@types/node": {
@@ -301,9 +329,9 @@
       }
     },
     "acorn": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
-      "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
+      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -421,12 +449,6 @@
       "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-1.2.0.tgz",
       "integrity": "sha512-i5xCl4n2VMgGK4gY6Jtho0K5aazbsqNw1bmPYpI9RwlKK+dIOcsMRuMl1JPWzrznHsm4qEsfYg+9KLkYsYy+/g=="
     },
-    "ansi-escapes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz",
-      "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=",
-      "dev": true
-    },
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -639,7 +661,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000717",
+        "caniuse-db": "1.0.30000733",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.17",
@@ -842,9 +864,9 @@
       }
     },
     "big.js": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
-      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
       "dev": true
     },
     "binary-extensions": {
@@ -1003,16 +1025,17 @@
       "dev": true
     },
     "browserify-aes": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
-      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz",
+      "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",
       "dev": true,
       "requires": {
         "buffer-xor": "1.0.3",
         "cipher-base": "1.0.4",
         "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.2",
-        "inherits": "2.0.3"
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "browserify-cipher": {
@@ -1021,9 +1044,9 @@
       "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.0.6",
+        "browserify-aes": "1.0.8",
         "browserify-des": "1.0.0",
-        "evp_bytestokey": "1.0.2"
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -1077,8 +1100,8 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000717",
-        "electron-to-chromium": "1.3.18"
+        "caniuse-db": "1.0.30000733",
+        "electron-to-chromium": "1.3.21"
       }
     },
     "buffer": {
@@ -1139,7 +1162,7 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case": "1.1.3"
       }
     },
@@ -1166,15 +1189,15 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000717",
+        "caniuse-db": "1.0.30000733",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000717",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000717.tgz",
-      "integrity": "sha1-J931/szdM4yZpiyXiMJpT5n2ftc=",
+      "version": "1.0.30000733",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000733.tgz",
+      "integrity": "sha1-OmJbxBx6n5nVnWRVKFfdGvDt2dQ=",
       "dev": true
     },
     "caseless": {
@@ -1209,7 +1232,7 @@
       "requires": {
         "ansi-styles": "3.2.0",
         "escape-string-regexp": "1.0.5",
-        "supports-color": "4.2.1"
+        "supports-color": "4.4.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1228,9 +1251,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -1238,6 +1261,12 @@
         }
       }
     },
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
+      "dev": true
+    },
     "chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -1246,6 +1275,7 @@
       "requires": {
         "anymatch": "1.3.0",
         "async-each": "1.0.1",
+        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1306,29 +1336,14 @@
       "integrity": "sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k="
     },
     "clean-css": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz",
-      "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.8.tgz",
+      "integrity": "sha1-BhRVsklKdQrJj0bY1euxfGeeqdE=",
       "dev": true,
       "requires": {
         "source-map": "0.5.6"
       }
     },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -1625,15 +1640,92 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
+    "copy-webpack-plugin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz",
+      "integrity": "sha1-lyjjg7lDFgUNDHRjlY8rhcCqggA=",
+      "dev": true,
+      "requires": {
+        "bluebird": "2.11.0",
+        "fs-extra": "0.26.7",
+        "glob": "6.0.4",
+        "is-glob": "3.1.0",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "node-dir": "0.1.17"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+          "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "0.26.7",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
+          }
+        }
+      }
+    },
     "core-js": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
       "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY="
     },
     "core-object": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/core-object/-/core-object-3.1.4.tgz",
-      "integrity": "sha1-bfQB6FgSS+n3Vy9MSjTGFQlS1LY=",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/core-object/-/core-object-3.1.5.tgz",
+      "integrity": "sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==",
       "dev": true,
       "requires": {
         "chalk": "2.1.0"
@@ -1729,6 +1821,12 @@
         }
       }
     },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
+      "dev": true
+    },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -1751,7 +1849,7 @@
         "create-hmac": "1.1.6",
         "diffie-hellman": "5.0.2",
         "inherits": "2.0.3",
-        "pbkdf2": "3.0.13",
+        "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
         "randombytes": "2.0.5"
       }
@@ -1763,9 +1861,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.5",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.5.tgz",
-      "integrity": "sha512-/FJmsDD8e6xZOBHMFShN/BCjnrEybq0spYaTZ1QoZ10/jhUa1LDDojQELu/JJ1ykZZjt0nSwkYrb2Mfx3bZx3Q==",
+      "version": "0.28.7",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
+      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.22.0",
@@ -1905,7 +2003,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.29"
+        "es5-ext": "0.10.30"
       }
     },
     "d3": {
@@ -2342,15 +2440,6 @@
             "path-is-absolute": "1.0.1",
             "rimraf": "2.6.1"
           }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
         }
       }
     },
@@ -2482,10 +2571,16 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
+    "ejs": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
+      "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
+      "dev": true
+    },
     "electron-to-chromium": {
-      "version": "1.3.18",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
-      "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=",
+      "version": "1.3.21",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz",
+      "integrity": "sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=",
       "dev": true
     },
     "element-resize-detector": {
@@ -2511,15 +2606,6 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
-    "ember-cli-normalize-entity-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz",
-      "integrity": "sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=",
-      "dev": true,
-      "requires": {
-        "silent-error": "1.1.0"
-      }
-    },
     "ember-cli-string-utils": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz",
@@ -2638,12 +2724,6 @@
         "tapable": "0.2.8"
       }
     },
-    "ensure-posix-path": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz",
-      "integrity": "sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI=",
-      "dev": true
-    },
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
@@ -2675,9 +2755,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.29",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.29.tgz",
-      "integrity": "sha512-KXla9NXo5sdaEkGSmbFPYgjH6m75kxsthL6GDRSug/Y2OiMoYm0I9giL39j4cgmaFmAbkIFJ6gG+SGKnLSmOvA==",
+      "version": "0.10.30",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",
+      "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.1",
@@ -2691,7 +2771,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29",
+        "es5-ext": "0.10.30",
         "es6-symbol": "3.1.1"
       }
     },
@@ -2702,7 +2782,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29",
+        "es5-ext": "0.10.30",
         "es6-iterator": "2.0.1",
         "es6-set": "0.1.5",
         "es6-symbol": "3.1.1",
@@ -2716,7 +2796,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29",
+        "es5-ext": "0.10.30",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -2729,7 +2809,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29"
+        "es5-ext": "0.10.30"
       }
     },
     "es6-weak-map": {
@@ -2739,7 +2819,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29",
+        "es5-ext": "0.10.30",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1"
       }
@@ -2797,9 +2877,9 @@
       "dev": true
     },
     "etag": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
-      "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
     "event-emitter": {
@@ -2809,7 +2889,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.29"
+        "es5-ext": "0.10.30"
       }
     },
     "eventemitter3": {
@@ -2834,9 +2914,9 @@
       }
     },
     "evp_bytestokey": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz",
-      "integrity": "sha512-ni0r0lrm7AOzsh2qC5mi9sj8S0gmj5fLNjfFpxN05FB4tAVZEKotbkjOtLPqTCX/CXT7NsUr6juZb4IFJeNNdA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
         "md5.js": "1.3.4",
@@ -2965,7 +3045,7 @@
         "depd": "1.1.1",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
-        "etag": "1.8.0",
+        "etag": "1.8.1",
         "finalhandler": "1.0.4",
         "fresh": "0.5.0",
         "merge-descriptors": "1.0.1",
@@ -2997,21 +3077,6 @@
           "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
           "dev": true
         },
-        "finalhandler": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz",
-          "integrity": "sha512-16l/r8RgzlXKmFOhZpHBztvye+lAhC5SU7hXavnerC9UfZqZxxXl3BzL8MhffPT3kF61lj9Oav2LKEzh0ei7tg==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.8",
-            "encodeurl": "1.0.1",
-            "escape-html": "1.0.3",
-            "on-finished": "2.3.0",
-            "parseurl": "1.3.1",
-            "statuses": "1.3.1",
-            "unpipe": "1.0.0"
-          }
-        },
         "qs": {
           "version": "6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
@@ -3026,17 +3091,6 @@
       "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
       "dev": true
     },
-    "external-editor": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
-      "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.18",
-        "jschardet": "1.5.1",
-        "tmp": "0.0.31"
-      }
-    },
     "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -3082,16 +3136,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": "0.6.5"
-      }
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5"
+        "websocket-driver": "0.7.0"
       }
     },
     "file-loader": {
@@ -3207,9 +3252,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
-      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true
     },
     "fresh": {
@@ -3228,14 +3273,25 @@
       }
     },
     "fs-extra": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz",
-      "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
+        "jsonfile": "4.0.0",
         "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
       }
     },
     "fs.realpath": {
@@ -3244,6 +3300,905 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -3257,9 +4212,9 @@
       }
     },
     "function-bind": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "gauge": {
@@ -3500,7 +4455,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.0"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -3591,14 +4546,6 @@
       "dev": true,
       "requires": {
         "rsvp": "3.2.1"
-      },
-      "dependencies": {
-        "rsvp": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz",
-          "integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=",
-          "dev": true
-        }
       }
     },
     "heimdalljs-logger": {
@@ -3664,19 +4611,19 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz",
-      "integrity": "sha512-iKRzQQDuTCsq0Ultbi/mfJJnR0D3AdZKTq966Gsp92xkmAPCV4Xi08qhJ0Dl3ZAWemSgJ7qZK+UsZc0gFqK6wg==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz",
+      "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
-        "clean-css": "4.1.7",
+        "clean-css": "4.1.8",
         "commander": "2.11.0",
         "he": "1.1.1",
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.0.28"
+        "uglify-js": "3.1.1"
       }
     },
     "html-webpack-plugin": {
@@ -3686,7 +4633,7 @@
       "dev": true,
       "requires": {
         "bluebird": "3.5.0",
-        "html-minifier": "3.5.3",
+        "html-minifier": "3.5.5",
         "loader-utils": "0.2.17",
         "lodash": "4.17.4",
         "pretty-error": "2.1.1",
@@ -3699,7 +4646,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -3772,6 +4719,12 @@
         "statuses": "1.3.1"
       }
     },
+    "http-parser-js": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.6.tgz",
+      "integrity": "sha1-GVJz9YcExFLWcQdr4gEyndNB3FU=",
+      "dev": true
+    },
     "http-proxy": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
@@ -3856,7 +4809,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.11"
       },
       "dependencies": {
         "has-flag": {
@@ -3866,20 +4819,26 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
           "dev": true,
           "requires": {
             "chalk": "2.1.0",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
+            "source-map": "0.5.7",
+            "supports-color": "4.4.0"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -3936,12 +4895,6 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
-    "inflection": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
-      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -3964,45 +4917,6 @@
       "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
       "dev": true
     },
-    "inquirer": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz",
-      "integrity": "sha512-bTKLzEHJVATimZO/YFdLrom0lRx1BHfRYskFHfIMVkGdp8+dIZaxuU+4yrsS1lcu6YWywVQVVsfvdwESzbeqHw==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "2.0.0",
-        "chalk": "2.1.0",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "2.0.4",
-        "figures": "2.0.0",
-        "lodash": "4.17.4",
-        "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rx-lite": "4.0.8",
-        "rx-lite-aggregates": "4.0.8",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
     "internal-ip": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
@@ -4013,9 +4927,9 @@
       }
     },
     "interpret": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
+      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
       "dev": true
     },
     "intl": {
@@ -4203,12 +5117,6 @@
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
       "dev": true
     },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -4309,7 +5217,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -4543,12 +5451,6 @@
       "dev": true,
       "optional": true
     },
-    "jschardet": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz",
-      "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==",
-      "dev": true
-    },
     "jsesc": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
@@ -4601,9 +5503,9 @@
       "dev": true
     },
     "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11"
@@ -4750,6 +5652,15 @@
         "is-buffer": "1.1.5"
       }
     },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
     "lazy-cache": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
@@ -4801,12 +5712,12 @@
       }
     },
     "license-webpack-plugin": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.5.1.tgz",
-      "integrity": "sha1-aNivEDSGqcTrzt237V071h84O+Q=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.0.1.tgz",
+      "integrity": "sha512-RQscYHQvaVFleUF3unLdQu6ORVVDqof2W0kM/3IFbLZheTMFXG/Y+dTU/RFaLxsBpaNN23MdPKST43D295j6JA==",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1"
+        "ejs": "2.5.7"
       }
     },
     "load-json-file": {
@@ -4834,7 +5745,7 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "3.1.3",
+        "big.js": "3.2.0",
         "emojis-list": "2.1.0",
         "json5": "0.5.1"
       }
@@ -4947,6 +5858,12 @@
         }
       }
     },
+    "loglevel": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.5.0.tgz",
+      "integrity": "sha512-OQ2jhWI5G2qsvO0UFNyCQWgKl/tFiwuPIXxELzACeUO2FqstN/R7mmL09+nhv6xOWVPPojQO1A90sCEoJSgBcQ==",
+      "dev": true
+    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -5015,15 +5932,6 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
-    "matcher-collection": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.4.tgz",
-      "integrity": "sha1-L2auCGmZbynkPQtiyD3R1D5YF1U=",
-      "dev": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
     "math-expression-evaluator": {
       "version": "1.2.17",
       "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@@ -5035,6 +5943,17 @@
       "resolved": "https://registry.npmjs.org/md2/-/md2-0.0.28.tgz",
       "integrity": "sha512-XQ71eTVKG3oRsGBj3lMLqL8p2inueqDXn++a2EntzWkUPlBZXPCPtlpfI9ER/LAlBKwJZQSqTzFItw7q9+vgvw=="
     },
+    "md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+      "dev": true,
+      "requires": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "1.1.5"
+      }
+    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -5259,12 +6178,6 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
     "nan": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
@@ -5313,14 +6226,23 @@
       }
     },
     "no-case": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-      "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
       "requires": {
         "lower-case": "1.1.4"
       }
     },
+    "node-dir": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
+      "dev": true,
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
     "node-forge": {
       "version": "0.6.33",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz",
@@ -5623,15 +6545,6 @@
         "wrappy": "1.0.2"
       }
     },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "1.1.0"
-      }
-    },
     "opn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
@@ -5736,9 +6649,9 @@
       }
     },
     "p-map": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
-      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
     "pako": {
@@ -5753,7 +6666,7 @@
       "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1"
+        "no-case": "2.3.2"
       }
     },
     "parse-asn1": {
@@ -5763,10 +6676,10 @@
       "dev": true,
       "requires": {
         "asn1.js": "4.9.1",
-        "browserify-aes": "1.0.6",
+        "browserify-aes": "1.0.8",
         "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.2",
-        "pbkdf2": "3.0.13"
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.14"
       }
     },
     "parse-glob": {
@@ -5880,9 +6793,9 @@
       }
     },
     "pbkdf2": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz",
-      "integrity": "sha512-+dCHxDH+djNtjgWmvVC/my3SYBAKpKNqKSjLkp+GtWWYe4XPE+e/PSD2aCanlEZZnqPk2uekTKNC/ccbwd2X2Q==",
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
+      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
       "dev": true,
       "requires": {
         "create-hash": "1.1.3",
@@ -6200,7 +7113,7 @@
       "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.11"
       },
       "dependencies": {
         "has-flag": {
@@ -6210,20 +7123,26 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
           "dev": true,
           "requires": {
             "chalk": "2.1.0",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
+            "source-map": "0.5.7",
+            "supports-color": "4.4.0"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -6238,7 +7157,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.11"
       },
       "dependencies": {
         "has-flag": {
@@ -6248,20 +7167,26 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
           "dev": true,
           "requires": {
             "chalk": "2.1.0",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
+            "source-map": "0.5.7",
+            "supports-color": "4.4.0"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -6276,7 +7201,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.11"
       },
       "dependencies": {
         "has-flag": {
@@ -6286,20 +7211,26 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
           "dev": true,
           "requires": {
             "chalk": "2.1.0",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
+            "source-map": "0.5.7",
+            "supports-color": "4.4.0"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -6314,7 +7245,7 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.11"
       },
       "dependencies": {
         "has-flag": {
@@ -6324,20 +7255,26 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
           "dev": true,
           "requires": {
             "chalk": "2.1.0",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
+            "source-map": "0.5.7",
+            "supports-color": "4.4.0"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -6609,7 +7546,7 @@
       "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
       "dev": true,
       "requires": {
-        "forwarded": "0.1.0",
+        "forwarded": "0.1.2",
         "ipaddr.js": "1.4.0"
       }
     },
@@ -7026,16 +7963,6 @@
         "path-parse": "1.0.5"
       }
     },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
-      }
-    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -7065,40 +7992,16 @@
       }
     },
     "rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz",
+      "integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=",
       "dev": true
     },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "2.1.0"
-      }
-    },
     "rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "requires": {
-        "rx-lite": "4.0.8"
-      }
-    },
     "rxjs": {
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
@@ -7170,15 +8073,6 @@
         "ajv": "5.2.2"
       }
     },
-    "script-loader": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.0.tgz",
-      "integrity": "sha1-aF3H5waeDe56kmdPDrxbD1W6pew=",
-      "dev": true,
-      "requires": {
-        "raw-loader": "0.5.1"
-      }
-    },
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
@@ -7264,7 +8158,7 @@
         "destroy": "1.0.4",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
-        "etag": "1.8.0",
+        "etag": "1.8.1",
         "fresh": "0.5.0",
         "http-errors": "1.6.2",
         "mime": "1.3.4",
@@ -7583,9 +8477,9 @@
       }
     },
     "sockjs-client": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.2.tgz",
-      "integrity": "sha1-8CEqhVDkyUaMjM6u79LjSTwDOtU=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
       "dev": true,
       "requires": {
         "debug": "2.6.8",
@@ -7602,7 +8496,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.6.5"
+            "websocket-driver": "0.7.0"
           }
         }
       }
@@ -7651,7 +8545,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -7801,15 +8695,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -7837,6 +8722,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -7993,24 +8887,6 @@
         "inherits": "2.0.3"
       }
     },
-    "temp": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-      "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "1.0.2",
-        "rimraf": "2.2.8"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-          "dev": true
-        }
-      }
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -8262,9 +9138,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.0.28",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz",
-      "integrity": "sha512-0h/qGay016GG2lVav3Kz174F3T2Vjlz2v6HCt+WDQpoXfco0hWwF5gHK9yh88mUYvIC+N7Z8NT8WpjSp1yoqGA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz",
+      "integrity": "sha512-f7DpmEgt/RYAKzQzcfahn3JYZHobDwTZCa8oixC7pweVGEIizTX2kTYdNWcdk00xsMJqUhI8RDAa9HXHXGhNxA==",
       "dev": true,
       "requires": {
         "commander": "2.11.0",
@@ -8554,16 +9430,6 @@
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
       "dev": true
     },
-    "walk-sync": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-      "dev": true,
-      "requires": {
-        "ensure-posix-path": "1.0.2",
-        "matcher-collection": "1.0.4"
-      }
-    },
     "watchpack": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
@@ -8643,19 +9509,19 @@
       }
     },
     "webpack": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.4.1.tgz",
-      "integrity": "sha1-TD9PP7MYFVpNsMtqNv8FxWl0GPQ=",
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.6.tgz",
+      "integrity": "sha512-sXnxfx6KoZVrFAGLjdhCCwDtDwkYMfwm8mJjkQv3thr5pjTlbxopVlr/kJwc9Bz317gL+gNjvz++ir9TgG1MDg==",
       "dev": true,
       "requires": {
-        "acorn": "5.1.1",
+        "acorn": "5.1.2",
         "acorn-dynamic-import": "2.0.2",
         "ajv": "5.2.2",
         "ajv-keywords": "2.1.0",
         "async": "2.5.0",
         "enhanced-resolve": "3.4.1",
         "escope": "3.6.0",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "json-loader": "0.5.7",
         "json5": "0.5.1",
         "loader-runner": "2.3.0",
@@ -8664,7 +9530,7 @@
         "mkdirp": "0.5.1",
         "node-libs-browser": "2.0.0",
         "source-map": "0.5.6",
-        "supports-color": "4.2.1",
+        "supports-color": "4.4.0",
         "tapable": "0.2.8",
         "uglifyjs-webpack-plugin": "0.4.6",
         "watchpack": "1.4.0",
@@ -8753,9 +9619,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8799,6 +9665,64 @@
         }
       }
     },
+    "webpack-concat-plugin": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-concat-plugin/-/webpack-concat-plugin-1.4.0.tgz",
+      "integrity": "sha512-Ym9Qm5Sw9oXJYChNJk09I/yaXDaV3UDxsa07wcCvILzIeSJTnSUZjhS4y2YkULzgE8VHOv9X04KtlJPZGwXqMg==",
+      "dev": true,
+      "requires": {
+        "md5": "2.2.1",
+        "uglify-js": "2.8.29"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
     "webpack-dev-middleware": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
@@ -8813,9 +9737,9 @@
       }
     },
     "webpack-dev-server": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.5.1.tgz",
-      "integrity": "sha1-oC5yaoe7YD211xq7fW0mSb8Qx2k=",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz",
+      "integrity": "sha1-IVgPWgjNBlxxFEz29hw0W8pZqLg=",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -8828,12 +9752,14 @@
         "html-entities": "1.2.1",
         "http-proxy-middleware": "0.17.4",
         "internal-ip": "1.2.0",
+        "ip": "1.1.5",
+        "loglevel": "1.5.0",
         "opn": "4.0.2",
         "portfinder": "1.0.13",
         "selfsigned": "1.10.1",
         "serve-index": "1.9.0",
         "sockjs": "0.3.18",
-        "sockjs-client": "1.1.2",
+        "sockjs-client": "1.1.4",
         "spdy": "3.4.7",
         "strip-ansi": "3.0.1",
         "supports-color": "3.2.3",
@@ -8856,7 +9782,7 @@
             "globby": "6.1.0",
             "is-path-cwd": "1.0.0",
             "is-path-in-cwd": "1.0.0",
-            "p-map": "1.1.1",
+            "p-map": "1.2.0",
             "pify": "3.0.0",
             "rimraf": "2.6.1"
           }
@@ -8970,18 +9896,19 @@
       }
     },
     "websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "websocket-extensions": "0.1.1"
+        "http-parser-js": "0.4.6",
+        "websocket-extensions": "0.1.2"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
       "dev": true
     },
     "when": {
diff --git a/package.json b/package.json
index f7865a3b..2c22464b 100644
--- a/package.json
+++ b/package.json
@@ -45,26 +45,26 @@
     "zone.js": "0.8.17"
   },
   "devDependencies": {
-    "@angular/cli": "^1.3.2",
+    "@angular/cli": "1.4.2",
     "@angular/compiler-cli": "4.3.5",
     "@angular/language-service": "4.3.5",
-    "@ngtools/webpack": "^1.6.2",
-    "@types/jasmine": "^2.5.54",
-    "@types/jasminewd2": "^2.0.2",
-    "@types/node": "^6.0.88",
-    "codelyzer": "~3.0.1",
-    "jasmine-core": "~2.6.2",
-    "jasmine-spec-reporter": "~4.1.0",
+    "@ngtools/webpack": "1.7.1",
+    "@types/jasmine": "2.6.0",
+    "@types/jasminewd2": "2.0.2",
+    "@types/node": "6.0.88",
+    "codelyzer": "3.0.1",
+    "jasmine-core": "2.6.2",
+    "jasmine-spec-reporter": "4.1.0",
     "karma": "1.7.1",
-    "karma-chrome-launcher": "~2.1.1",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "node-sass": "^4.5.3",
-    "protractor": "~5.1.2",
-    "ts-node": "~3.0.4",
-    "tslint": "~5.3.2",
-    "typescript": "~2.3.3"
+    "karma-chrome-launcher": "2.1.1",
+    "karma-cli": "1.0.1",
+    "karma-coverage-istanbul-reporter": "1.2.1",
+    "karma-jasmine": "1.1.0",
+    "karma-jasmine-html-reporter": "0.2.2",
+    "node-sass": "4.5.3",
+    "protractor": "5.1.2",
+    "ts-node": "3.0.4",
+    "tslint": "5.3.2",
+    "typescript": "2.3.3"
   }
 }

From b55bce2de4f72fb6db2a8dbc201207958cbfcdda Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 15:58:47 +0300
Subject: [PATCH 06/27] fixed: navigation collapsable issue on route change
 fixed: footer stays on top of the navigation on mobile

---
 .../nav-vertical-collapse.component.ts        | 19 ++++++++++++-------
 .../vertical/navbar-vertical.component.scss   | 10 ++++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
index dc2d2535..a32e0c9a 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -143,18 +143,23 @@ export class FuseNavVerticalCollapseComponent implements OnInit
             return false;
         }
 
-        for ( const children of parent.children )
+        for ( let i = 0; i < parent.children.length; i++ )
         {
-            if ( children.url === url )
+            if ( parent.children[i].children )
+            {
+                if ( this.isUrlInChildren(parent.children[i], url) )
+                {
+                    return true;
+                }
+            }
+
+            if ( parent.children[i].url === url )
             {
                 return true;
             }
-
-            if ( children.children )
-            {
-                return this.isUrlInChildren(children, url);
-            }
         }
+
+        return false;
     }
 
     ngOnInit()
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.scss b/src/app/main/navbar/vertical/navbar-vertical.component.scss
index 7e9fd2bf..c047c2a6 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.scss
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.scss
@@ -32,7 +32,7 @@ fuse-navbar-vertical {
     background-color: #FFFFFF;
     overflow-y: auto;
     overflow-x: hidden;
-    z-index: 3;
+    z-index: 4;
     box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2), 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12);
     transition: all .3s cubic-bezier(.55, 0, .55, .2), width .1s linear, min-width .1s linear, max-width .1s linear;
     transform: translateX(0);
@@ -70,30 +70,36 @@ fuse-navbar-vertical {
     }
 
     &.close {
+        box-shadow: none;
+
         &.left-navbar {
             transform: translateX(-100%) !important;
         }
+
         &.right-navbar {
             transform: translateX(100%) !important;
         }
-        box-shadow: none;
     }
 
     @include media-breakpoint('lt-lg') {
         position: absolute;
         top: 0;
         bottom: 0;
+
         &.left-navbar {
             left: 0;
         }
+
         &.right-navbar {
             right: 0;
         }
 
         &:not(.initialized) {
+
             &.left-navbar {
                 transform: translateX(-100%);
             }
+
             &.right-navbar {
                 transform: translateX(100%);
             }

From 6d20c1d62df0ac96da9738f1357fff79a8acc588 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Mon, 18 Sep 2017 16:06:15 +0300
Subject: [PATCH 07/27] Custom perfect-scrollbar directive for better control
 (replaced the ngx-perfect-scrollbar with fuse-perfect-scrollbar)

---
 package-lock.json                             | 110 +++++++----
 package.json                                  |   1 +
 src/app/app.module.ts                         |   3 -
 .../material-color-picker.component.html      |   4 +-
 .../shortcuts/shortcuts.component.html        |   4 +-
 .../fuse-perfect-scrollbar.directive.ts       | 173 ++++++++++++++++++
 src/app/core/modules/shared.module.ts         |   6 +-
 src/app/core/scss/core.scss                   |   4 +-
 src/app/core/scss/partials/_page-layouts.scss |   8 -
 src/app/core/scss/partials/_scrollbars.scss   |  35 ++--
 .../partials/plugins/_perfect-scrollbar.scss  |   1 +
 .../apps/calendar/calendar.component.html     |   4 +-
 .../event-form/event-form.component.html      |   2 +-
 .../chat/chat-view/chat-view.component.html   |   2 +-
 .../chat/chat-view/chat-view.component.ts     |   4 +-
 .../sidenavs/left/chats/chats.component.html  |   2 +-
 .../sidenavs/left/user/user.component.html    |   2 +-
 .../right/contact/contact.component.html      |   2 +-
 .../contact-form/contact-form.component.html  |   2 +-
 .../apps/contacts/contacts.component.html     |   4 +-
 .../sidenavs/main/main.component.html         |   2 +-
 .../dashboards/project/project.component.html |   6 +-
 .../file-manager/file-manager.component.html  |   4 +-
 .../sidenavs/details/details.component.html   |   2 +-
 .../sidenavs/main/main.component.html         |   2 +-
 .../dialogs/compose/compose.component.html    |   2 +-
 .../content/apps/mail/mail.component.html     |   6 +-
 .../sidenavs/main/main-sidenav.component.html |   2 +-
 .../board/dialogs/card/card.component.html    |   2 +-
 .../label-selector.component.html             |   2 +-
 .../scrumboard/board/list/list.component.html |   2 +-
 .../scrumboard/board/list/list.component.ts   |   4 +-
 .../sidenavs/settings/settings.component.html |   4 +-
 .../apps/scrumboard/scrumboard.component.html |   2 +-
 .../sidenavs/main/main-sidenav.component.html |   2 +-
 .../content/apps/todo/todo.component.html     |   6 +-
 .../datatable/ngx-datatable.component.html    |   2 +-
 .../countdown/countdown.component.html        |   2 +-
 .../components/hljs/hljs.component.html       |   2 +-
 .../material-color-picker.component.html      |   2 +-
 .../navigation/navigation.component.html      |   2 +-
 .../price-tables/price-tables.component.html  |   2 +-
 .../search-bar/search-bar.component.html      |   2 +-
 .../shortcuts/shortcuts.component.html        |   2 +-
 .../components/widget/widget.component.html   |   2 +-
 .../forgot-password.component.html            |   2 +-
 .../authentication/lock/lock.component.html   |   2 +-
 .../login-2/login-2.component.html            |   2 +-
 .../authentication/login/login.component.html |   2 +-
 .../register-2/register-2.component.html      |   2 +-
 .../register/register.component.html          |   2 +-
 .../reset-password.component.html             |   2 +-
 .../coming-soon/coming-soon.component.html    |   2 +-
 .../invoices/compact/compact.component.html   |   2 +-
 .../invoices/modern/modern.component.html     |   2 +-
 .../maintenance/maintenance.component.html    |   2 +-
 .../pages/profile/profile.component.html      |   2 +-
 .../pages/search/search.component.html        |   2 +-
 .../services/config/config.component.html     |   2 +-
 .../splash-screen.component.html              |   2 +-
 .../content/ui/colors/colors.component.html   |   2 +-
 .../content/ui/forms/forms.component.html     |   2 +-
 .../helper-classes.component.html             |   2 +-
 .../content/ui/icons/icons.component.html     |   2 +-
 .../page-layouts/blank/blank.component.html   |   2 +-
 .../fullwidth-2/fullwidth-2.component.html    |   2 +-
 .../carded/fullwidth/fullwidth.component.html |   4 +-
 .../left-sidenav-2.component.html             |   6 +-
 .../left-sidenav/left-sidenav.component.html  |   6 +-
 .../right-sidenav-2.component.html            |   6 +-
 .../right-sidenav.component.html              |   6 +-
 .../simple/fullwidth/fullwidth.component.html |   2 +-
 .../left-sidenav-2.component.html             |   4 +-
 .../left-sidenav-3.component.html             |   6 +-
 .../left-sidenav/left-sidenav.component.html  |   6 +-
 .../right-sidenav-2.component.html            |   4 +-
 .../right-sidenav-3.component.html            |   6 +-
 .../right-sidenav.component.html              |   6 +-
 .../simple/tabbed/tabbed.component.html       |   2 +-
 .../ui/typography/typography.component.html   |   2 +-
 src/app/main/main.component.scss              |  13 --
 src/app/main/main.component.ts                |  15 +-
 .../vertical/navbar-vertical.component.html   |   2 +-
 .../vertical/navbar-vertical.component.ts     |   6 +-
 84 files changed, 388 insertions(+), 197 deletions(-)
 create mode 100644 src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts

diff --git a/package-lock.json b/package-lock.json
index 2cd49d08..9010ae8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "requires": {
         "loader-utils": "1.1.0",
         "source-map": "0.5.6",
-        "typescript": "2.3.4",
+        "typescript": "2.3.3",
         "webpack-sources": "1.0.1"
       }
     },
@@ -113,7 +113,7 @@
         "style-loader": "0.13.2",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.1",
-        "typescript": "2.3.4",
+        "typescript": "2.3.3",
         "url-loader": "0.5.9",
         "webpack": "3.5.6",
         "webpack-concat-plugin": "1.4.0",
@@ -286,9 +286,9 @@
       "dev": true
     },
     "@types/jasminewd2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz",
-      "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.2.tgz",
+      "integrity": "sha1-X2jh5pe/ELxv2Mvy4Aaj1nEsW2Q=",
       "dev": true,
       "requires": {
         "@types/jasmine": "2.6.0"
@@ -5181,22 +5181,45 @@
       "dev": true
     },
     "istanbul-api": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.11.tgz",
-      "integrity": "sha1-/MC0YeKzvaceMFFVE4I4doJX2d4=",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.14.tgz",
+      "integrity": "sha1-JbxXAffGgMD//5E95G42GaOm5oA=",
       "dev": true,
       "requires": {
         "async": "2.5.0",
         "fileset": "2.0.3",
         "istanbul-lib-coverage": "1.1.1",
         "istanbul-lib-hook": "1.0.7",
-        "istanbul-lib-instrument": "1.7.4",
+        "istanbul-lib-instrument": "1.8.0",
         "istanbul-lib-report": "1.1.1",
         "istanbul-lib-source-maps": "1.2.1",
-        "istanbul-reports": "1.1.1",
+        "istanbul-reports": "1.1.2",
         "js-yaml": "3.7.0",
         "mkdirp": "0.5.1",
         "once": "1.4.0"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.18.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz",
+          "integrity": "sha1-ZvbJQhzJ7EcE928tsIS6kHiitTI=",
+          "dev": true,
+          "requires": {
+            "babel-generator": "6.25.0",
+            "babel-template": "6.25.0",
+            "babel-traverse": "6.25.0",
+            "babel-types": "6.25.0",
+            "babylon": "6.18.0",
+            "istanbul-lib-coverage": "1.1.1",
+            "semver": "5.4.1"
+          }
+        }
       }
     },
     "istanbul-instrumenter-loader": {
@@ -5281,9 +5304,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-P8G873A0kW24XRlxHVGhMJBhQ8gWAec+dae7ZxOBzxT4w+a9ATSPvRVK3LB1RAJ9S8bg2tOyWHAGW40Zd2dKfw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha1-D7Lj9qqZIr085F0F2KtNXo4HvU8=",
       "dev": true,
       "requires": {
         "handlebars": "4.0.10"
@@ -5361,15 +5384,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "source-map": "0.5.6",
+            "source-map": "0.5.7",
             "uglify-to-browserify": "1.0.2",
             "yargs": "3.10.0"
           },
           "dependencies": {
             "source-map": {
-              "version": "0.5.6",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-              "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
               "dev": true,
               "optional": true
             }
@@ -5398,19 +5421,19 @@
       "requires": {
         "exit": "0.1.2",
         "glob": "7.1.2",
-        "jasmine-core": "2.6.4"
+        "jasmine-core": "2.6.2"
       }
     },
     "jasmine-core": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
-      "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz",
+      "integrity": "sha1-dOoffPQoaRryARB9YxI0AnoJ2qs=",
       "dev": true
     },
     "jasmine-spec-reporter": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz",
-      "integrity": "sha1-Wm1Yq11hvqcwn7wnkjlRF1axtYg=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.0.tgz",
+      "integrity": "sha1-uKp1hN9Y5Nq2Gs2++3bQlqo4Zj8=",
       "dev": true,
       "requires": {
         "colors": "1.1.2"
@@ -5610,13 +5633,12 @@
       }
     },
     "karma-coverage-istanbul-reporter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.0.tgz",
-      "integrity": "sha1-0ULNnFVzHJ42Pvc3To7xoxvr+ts=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.2.1.tgz",
+      "integrity": "sha1-XjynuaFT2xy63/70xG2XjTilMVQ=",
       "dev": true,
       "requires": {
-        "istanbul-api": "1.1.11",
-        "minimatch": "3.0.4"
+        "istanbul-api": "1.1.14"
       }
     },
     "karma-jasmine": {
@@ -6805,6 +6827,11 @@
         "sha.js": "2.4.8"
       }
     },
+    "perfect-scrollbar": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-0.8.1.tgz",
+      "integrity": "sha512-RNC5tX/JMRYR+qVdJTEAWnRxw0Yf9lvbO8lTuAOvgDODkiA8lveTSkvrNMhmaGKEyimJpJl+myb/syVS9YyPuw=="
+    },
     "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
@@ -8974,9 +9001,9 @@
       "dev": true
     },
     "ts-node": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.0.6.tgz",
-      "integrity": "sha1-VRJ/95DH7r9rpowebd6UsJqqIeA=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.0.4.tgz",
+      "integrity": "sha1-oUdevyT9Ti7i+6ixqhYFuXe95QY=",
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
@@ -8988,7 +9015,7 @@
         "source-map-support": "0.4.15",
         "tsconfig": "6.0.0",
         "v8flags": "2.1.1",
-        "yn": "2.0.0"
+        "yn": "1.3.0"
       },
       "dependencies": {
         "chalk": {
@@ -9132,9 +9159,9 @@
       }
     },
     "typescript": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz",
-      "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.3.tgz",
+      "integrity": "sha1-ljnzw7QBSOjKl/4IpR3RiRu2viI=",
       "dev": true
     },
     "uglify-js": {
@@ -10168,10 +10195,13 @@
       "dev": true
     },
     "yn": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
-      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
-      "dev": true
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-1.3.0.tgz",
+      "integrity": "sha1-GwgSq7jYBdSJZvjfOF3J2syaGdg=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1"
+      }
     },
     "zone.js": {
       "version": "0.8.17",
diff --git a/package.json b/package.json
index 2c22464b..4ad2ef2c 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "ngx-color-picker": "4.3.1",
     "ngx-cookie-service": "1.0.7",
     "ngx-perfect-scrollbar": "4.6.2",
+    "perfect-scrollbar": "0.8.1",
     "rxjs": "5.4.3",
     "web-animations-js": "2.3.1",
     "zone.js": "0.8.17"
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 45056275..30f8f928 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -9,7 +9,6 @@ import 'hammerjs';
 import { SharedModule } from './core/modules/shared.module';
 import { AppComponent } from './app.component';
 import { ProjectModule } from './main/content/apps/dashboards/project/project.module';
-import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
 import { FuseMainModule } from './main/main.module';
 import { PagesModule } from './main/content/pages/pages.module';
@@ -69,8 +68,6 @@ const appRoutes: Routes = [
 
         InMemoryWebApiModule.forRoot(FuseFakeDbService, {delay: 0}),
 
-        PerfectScrollbarModule.forRoot(),
-
         FuseMainModule,
 
         ProjectModule,
diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.html b/src/app/core/components/material-color-picker/material-color-picker.component.html
index 0e22118b..e305b812 100644
--- a/src/app/core/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.html
@@ -45,7 +45,7 @@
 
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfectScrollbar>
+                 class="colors" fusePerfectScrollbar>
                 <div class="color"
                      [ngClass]="'md-'+color.key+'-bg'"
                      *ngFor="let color of (colors | keys)"
@@ -63,7 +63,7 @@
              [@slideInRight]>
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfectScrollbar>
+                 class="colors" fusePerfectScrollbar>
                 <div class="color"
                      *ngFor="let hue of hues"
                      [fxHide]="selectedPalette === 'white' && hue !== '500'|| selectedPalette === 'black' && hue !== '500'"
diff --git a/src/app/core/components/shortcuts/shortcuts.component.html b/src/app/core/components/shortcuts/shortcuts.component.html
index 0bf67594..ad98a338 100644
--- a/src/app/core/components/shortcuts/shortcuts.component.html
+++ b/src/app/core/components/shortcuts/shortcuts.component.html
@@ -47,7 +47,7 @@
             </md-input-container>
 
             <md-divider></md-divider>
-            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
+            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>
 
                 <md-list-item *ngFor="let shortcutItem of shortcutItems"
                               (click)="toggleShortcut($event, shortcutItem)">
@@ -68,7 +68,7 @@
                 </md-list-item>
             </md-nav-list>
 
-            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
+            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>
                 <md-list-item *ngFor="let navigationItem of filteredNavigationItems"
                               (click)="toggleShortcut($event, navigationItem)">
                     <div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
new file mode 100644
index 00000000..d3b734be
--- /dev/null
+++ b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
@@ -0,0 +1,173 @@
+import { AfterViewInit, Directive, ElementRef, NgZone, OnDestroy, OnInit } from '@angular/core';
+import * as Ps from 'perfect-scrollbar';
+import { FuseConfigService } from '../../services/config.service';
+import { Subscription } from 'rxjs/Subscription';
+import { Platform } from '@angular/cdk/platform';
+
+@Directive({
+    selector: '[fusePerfectScrollbar]'
+})
+export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnDestroy
+{
+    onSettingsChanged: Subscription;
+    isDisableCustomScrollbars = false;
+    isMobile = false;
+    isInitialized = true;
+
+    constructor(
+        private element: ElementRef,
+        private zone: NgZone,
+        private fuseConfig: FuseConfigService,
+        private platform: Platform
+    )
+    {
+        this.onSettingsChanged =
+            this.fuseConfig.onSettingsChanged
+                .subscribe(
+                    (settings) => {
+                        this.isDisableCustomScrollbars = !settings.customScrollbars;
+                    }
+                );
+
+        if ( this.platform.ANDROID || this.platform.IOS )
+        {
+            this.isMobile = true;
+        }
+    }
+
+    ngOnInit(): void
+    {
+
+    }
+
+    ngAfterViewInit(): void
+    {
+        if ( this.isMobile || this.isDisableCustomScrollbars )
+        {
+            this.isInitialized = false;
+            return;
+        }
+
+        this.zone.runOutsideAngular(() => {
+
+            // Initialize the perfect-scrollbar
+            Ps.initialize(this.element.nativeElement);
+        });
+    }
+
+    ngOnDestroy(): void
+    {
+        if ( !this.isInitialized )
+        {
+            return;
+        }
+
+        this.onSettingsChanged.unsubscribe();
+
+        // Destroy the perfect-scrollbar
+        Ps.destroy(this.element.nativeElement);
+    }
+
+    update()
+    {
+        if ( !this.isInitialized )
+        {
+            return;
+        }
+
+        // Update the perfect-scrollbar
+        Ps.update(this.element.nativeElement);
+    }
+
+    destroy()
+    {
+        this.ngOnDestroy();
+    }
+
+    scrollToX(x: number, speed?: number)
+    {
+        this.animateScrolling('scrollLeft', x, speed);
+    }
+
+    scrollToY(y: number, speed?: number)
+    {
+        this.animateScrolling('scrollTop', y, speed);
+    }
+
+    scrollToTop(offset?: number, speed?: number)
+    {
+        this.animateScrolling('scrollTop', (offset || 0), speed);
+    }
+
+    scrollToLeft(offset?: number, speed?: number)
+    {
+        this.animateScrolling('scrollLeft', (offset || 0), speed);
+    }
+
+    scrollToRight(offset?: number, speed?: number)
+    {
+        const width = this.element.nativeElement.scrollWidth;
+
+        this.animateScrolling('scrollLeft', width - (offset || 0), speed);
+    }
+
+    scrollToBottom(offset?: number, speed?: number)
+    {
+        const height = this.element.nativeElement.scrollHeight;
+
+        this.animateScrolling('scrollTop', height - (offset || 0), speed);
+    }
+
+    animateScrolling(target: string, value: number, speed?: number)
+    {
+        if ( !speed )
+        {
+            this.element.nativeElement[target] = value;
+
+            // PS has weird event sending order, this is a workaround for that
+            this.update();
+
+            this.update();
+        }
+        else if ( value !== this.element.nativeElement[target] )
+        {
+            let newValue = 0;
+            let scrollCount = 0;
+
+            let oldTimestamp = performance.now();
+            let oldValue = this.element.nativeElement[target];
+
+            const cosParameter = (oldValue - value) / 2;
+
+            const step = (newTimestamp) => {
+                scrollCount += Math.PI / (speed / (newTimestamp - oldTimestamp));
+
+                newValue = Math.round(value + cosParameter + cosParameter * Math.cos(scrollCount));
+
+                // Only continue animation if scroll position has not changed
+                if ( this.element.nativeElement[target] === oldValue )
+                {
+                    if ( scrollCount >= Math.PI )
+                    {
+                        this.element.nativeElement[target] = value;
+
+                        // PS has weird event sending order, this is a workaround for that
+                        this.update();
+
+                        this.update();
+                    }
+                    else
+                    {
+                        this.element.nativeElement[target] = oldValue = newValue;
+
+                        oldTimestamp = newTimestamp;
+
+                        window.requestAnimationFrame(step);
+                    }
+                }
+            };
+
+            window.requestAnimationFrame(step);
+        }
+    }
+}
diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts
index e2c5e7d6..93885da7 100644
--- a/src/app/core/modules/shared.module.ts
+++ b/src/app/core/modules/shared.module.ts
@@ -4,7 +4,6 @@ import { CommonModule } from '@angular/common';
 
 import { MaterialModule } from './material.module';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 import { ColorPickerModule } from 'ngx-color-picker';
 import { NgxDnDModule } from '@swimlane/ngx-dnd';
 import { NgxDatatableModule } from '@swimlane/ngx-datatable';
@@ -18,6 +17,7 @@ import { FuseMatchMedia } from '../services/match-media.service';
 import { FuseNavbarVerticalService } from '../../main/navbar/vertical/navbar-vertical.service';
 import { FuseMdSidenavHelperService } from '../directives/md-sidenav-helper/md-sidenav-helper.service';
 import { FuseHljsComponent } from '../components/hljs/hljs.component';
+import { FusePerfectScrollbarDirective } from '../directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive';
 import { FuseMaterialColorPickerComponent } from '../components/material-color-picker/material-color-picker.component';
 import { Md2Module } from 'md2';
@@ -31,6 +31,7 @@ import { CookieService } from 'ngx-cookie-service';
         FuseCountdownComponent,
         FuseHljsComponent,
         FuseIfOnDomDirective,
+        FusePerfectScrollbarDirective,
         FuseMaterialColorPickerComponent
     ],
     imports        : [
@@ -39,7 +40,6 @@ import { CookieService } from 'ngx-cookie-service';
         CommonModule,
         FormsModule,
         FusePipesModule,
-        PerfectScrollbarModule,
         ReactiveFormsModule,
         ColorPickerModule,
         NgxDnDModule,
@@ -56,7 +56,7 @@ import { CookieService } from 'ngx-cookie-service';
         FusePipesModule,
         FuseCountdownComponent,
         FuseHljsComponent,
-        PerfectScrollbarModule,
+        FusePerfectScrollbarDirective,
         ReactiveFormsModule,
         ColorPickerModule,
         NgxDnDModule,
diff --git a/src/app/core/scss/core.scss b/src/app/core/scss/core.scss
index 6e7a37f2..ec657acc 100644
--- a/src/app/core/scss/core.scss
+++ b/src/app/core/scss/core.scss
@@ -2,8 +2,8 @@
 @import '~@swimlane/ngx-datatable/release/index.css';
 @import '~@swimlane/ngx-datatable/release/themes/material.css';
 @import '~@swimlane/ngx-datatable/release/assets/icons.css';
-// Perfect Scrollbar
-@import "~ngx-perfect-scrollbar/dist/lib/perfect-scrollbar.component.css";
+// Perfect scrollbar
+@import '~perfect-scrollbar/dist/css/perfect-scrollbar.min.css';
 // Fuse
 @import "fuse";
 
diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss
index 87322fce..81f815e5 100644
--- a/src/app/core/scss/partials/_page-layouts.scss
+++ b/src/app/core/scss/partials/_page-layouts.scss
@@ -309,10 +309,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                     > .mat-drawer-content {
                         flex: 1 0 auto;
                         max-height: none;
-
-                        > .center {
-                            overflow: hidden;
-                        }
                     }
                 }
             }
@@ -483,10 +479,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                     > .mat-sidenav-content,
                     > .mat-drawer-content {
                         flex: 1 0 auto;
-
-                        > .center {
-                            overflow: hidden;
-                        }
                     }
                 }
             }
diff --git a/src/app/core/scss/partials/_scrollbars.scss b/src/app/core/scss/partials/_scrollbars.scss
index 285b5df4..8c7b785c 100644
--- a/src/app/core/scss/partials/_scrollbars.scss
+++ b/src/app/core/scss/partials/_scrollbars.scss
@@ -1,20 +1,23 @@
-::-webkit-scrollbar {
-    width: 12px;
-    height: 12px;
-    background-color: rgba(0, 0, 0, 0);
-}
+body:not(.is-mobile) {
 
-::-webkit-scrollbar:hover {
-    background-color: rgba(0, 0, 0, 0.12);
-}
+    ::-webkit-scrollbar {
+        width: 12px;
+        height: 12px;
+        background-color: rgba(0, 0, 0, 0);
+    }
 
-::-webkit-scrollbar-thumb {
-    border: 2px solid transparent;
-    box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.37);
-    border-radius: 24px;
-}
+    ::-webkit-scrollbar:hover {
+        background-color: rgba(0, 0, 0, 0.12);
+    }
 
-::-webkit-scrollbar-thumb:active {
-    box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.54);
-    border-radius: 24px;
+    ::-webkit-scrollbar-thumb {
+        border: 2px solid transparent;
+        box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.37);
+        border-radius: 24px;
+    }
+
+    ::-webkit-scrollbar-thumb:active {
+        box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.54);
+        border-radius: 24px;
+    }
 }
\ No newline at end of file
diff --git a/src/app/core/scss/partials/plugins/_perfect-scrollbar.scss b/src/app/core/scss/partials/plugins/_perfect-scrollbar.scss
index 7e93827e..917597a0 100644
--- a/src/app/core/scss/partials/plugins/_perfect-scrollbar.scss
+++ b/src/app/core/scss/partials/plugins/_perfect-scrollbar.scss
@@ -1,4 +1,5 @@
 .ps {
+    position: relative;
 
     > .ps__scrollbar-y-rail {
         z-index: 99999;
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index 783c76ab..47b1545b 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,4 +1,4 @@
-<div id="calendar" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="calendar" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header" [ngClass]="viewDate | date:'MMM'">
@@ -86,7 +86,7 @@
     <!-- / HEADER -->
 
     <!-- CONTENT -->
-    <div class="content" perfectScrollbar>
+    <div class="content" fusePerfectScrollbar>
         <div [ngSwitch]="view">
             <mwl-calendar-month-view
                 *ngSwitchCase="'month'"
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
index 16733e02..60270d72 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfectScrollbar>
+<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
 
     <form name="eventForm" [formGroup]="eventForm" class="event-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.html b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
index bc8352f6..3e818c87 100644
--- a/src/app/main/content/apps/chat/chat-view/chat-view.component.html
+++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
@@ -57,7 +57,7 @@
     <!-- / CHAT TOOLBAR -->
 
     <!-- CHAT CONTENT -->
-    <div id="chat-content" fxFlex perfectScrollbar>
+    <div id="chat-content" fxFlex fusePerfectScrollbar>
 
         <!-- CHAT MESSAGES -->
         <div class="chat-messages">
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
index ba15972e..ecc14037 100644
--- a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
+++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component, OnInit, ViewChild, ViewChildren } from '@angular/core';
 import { ChatService } from '../chat.service';
 import { NgForm } from '@angular/forms';
-import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
+import { FusePerfectScrollbarDirective } from '../../../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 
 @Component({
     selector   : 'fuse-chat-view',
@@ -16,7 +16,7 @@ export class FuseChatViewComponent implements OnInit, AfterViewInit
     contact: any;
     replyInput: any;
     selectedChat: any;
-    @ViewChild(PerfectScrollbarDirective) directiveScroll: PerfectScrollbarDirective;
+    @ViewChild(FusePerfectScrollbarDirective) directiveScroll: FusePerfectScrollbarDirective;
     @ViewChildren('replyInput') replyInputField;
     @ViewChild('replyForm') replyForm: NgForm;
 
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
index a613b33b..228360bf 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
@@ -98,7 +98,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content" perfectScrollbar fxFlex>
+<div class="sidenav-content" fusePerfectScrollbar fxFlex>
 
     <!-- CHATS CONTENT -->
     <div>
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
index 42422e48..092ab6bd 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
@@ -29,7 +29,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfectScrollbar fxFlex>
+<div class="sidenav-content p-16" fusePerfectScrollbar fxFlex>
 
     <!-- USER MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
index 5034e3e6..bd3c06ec 100644
--- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
@@ -31,7 +31,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfectScrollbar fxFlex *ngIf="contact">
+<div class="sidenav-content p-16" fusePerfectScrollbar fxFlex *ngIf="contact">
 
     <!-- CONTACT MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
index 3852138f..3f5d83e7 100644
--- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
+++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
@@ -15,7 +15,7 @@
     </md-toolbar-row>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfectScrollbar>
+<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
 
     <form [formGroup]="contactForm">
 
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 88748549..24d898c4 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -1,4 +1,4 @@
-<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
+<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="start start"
@@ -51,7 +51,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24 pr-sm-92" perfectScrollbar>
+        <div class="center p-24 pr-sm-92" fusePerfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content md-white-bg mat-elevation-z4">
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
index 4f400d0a..0b2af02d 100644
--- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
@@ -13,7 +13,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfectScrollbar>
+        <div class="content py-16" fusePerfectScrollbar>
 
             <div class="nav">
 
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index ef6f8b7b..3a38494d 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -1,9 +1,9 @@
-<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfectScrollbar>
+<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row">
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" fxFlex perfectScrollbar>
+        <div class="center" fxFlex fusePerfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24 pb-0" fxLayout="column" fxLayoutAlign="space-between">
@@ -690,7 +690,7 @@
         <!-- SIDENAV -->
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfectScrollbar>
+            <div class="sidenav-content" fusePerfectScrollbar>
                 <!-- WIDGET GROUP -->
                 <div class="widget-group" fxLayout="column" fxFlex="100">
 
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index ab7dcdfd..d6f499e6 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -1,4 +1,4 @@
-<div id="file-manager" class="page-layout simple right-sidenav" perfectScrollbar>
+<div id="file-manager" class="page-layout simple right-sidenav" fusePerfectScrollbar>
 
     <md-sidenav-container>
 
@@ -58,7 +58,7 @@
             <!-- / HEADER -->
 
             <!-- CONTENT -->
-            <div class="content md-white-bg" perfectScrollbar>
+            <div class="content md-white-bg" fusePerfectScrollbar>
                 <fuse-file-list></fuse-file-list>
             </div>
             <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
index ee9ab507..51b60b43 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
@@ -27,7 +27,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content p-24 md-white-bg" perfectScrollbar>
+<div class="content p-24 md-white-bg" fusePerfectScrollbar>
 
     <div class="file-details">
 
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
index 4387a1cc..26021601 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
@@ -10,7 +10,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content py-16" perfectScrollbar>
+<div class="content py-16" fusePerfectScrollbar>
 
     <div class="nav">
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index 703ae091..4f44c51e 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfectScrollbar>
+<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
 
     <form name="composeForm" [formGroup]="composeForm" class="compose-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index 0ab84d6e..1f516acd 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -1,4 +1,4 @@
-<div id="mail" class="page-layout carded left-sidenav" perfectScrollbar>
+<div id="mail" class="page-layout carded left-sidenav" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -96,9 +96,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxLayoutAlign="row">
 
-                    <fuse-mail-list perfectScrollbar fxFlex></fuse-mail-list>
+                    <fuse-mail-list fusePerfectScrollbar fxFlex></fuse-mail-list>
 
-                    <fuse-mail-details perfectScrollbar fxFlex></fuse-mail-details>
+                    <fuse-mail-details fusePerfectScrollbar fxFlex></fuse-mail-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index eb9bbfa2..249a4458 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfectScrollbar>
+<div class="content" fusePerfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index 9acf27b3..8218cd59 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -123,7 +123,7 @@
     </div>
 </md-toolbar>
 
-<div *ngIf="card" md-dialog-content class="p-24 m-0" perfectScrollbar>
+<div *ngIf="card" md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
 
     <div fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"
          fxLayout.xs="column" fxLayoutAlign="center center">
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
index cdce00c1..a39ed54b 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
@@ -10,7 +10,7 @@
             </button>
         </div>
 
-        <div fxFlex fxLayout="column" perfectScrollbar>
+        <div fxFlex fxLayout="column" fusePerfectScrollbar>
 
             <div class="label pl-12 mx-8 mb-8" *ngFor="let label of board.labels" fxFlex="0 0 auto" fxLayout="row" fxFlexAlign="space-between center"
                  [class]="label.color">
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.html b/src/app/main/content/apps/scrumboard/board/list/list.component.html
index 11b00722..63487391 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.html
@@ -26,7 +26,7 @@
 
         <div class="list-cards ngx-dnd-container"
              [model]="list.idCards" ngxDroppable="card" (out)="onDrop($event)"
-             perfectScrollbar #listScroll>
+             fusePerfectScrollbar #listScroll>
             <fuse-scrumboard-board-card ngxDraggable
                                         (click)="openCardDialog(cardId)"
                                         class="scrumboard-board-card mat-elevation-z2 ngx-dnd-item"
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.ts b/src/app/main/content/apps/scrumboard/board/list/list.component.ts
index af0f398f..e5c7d2e1 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.ts
@@ -3,11 +3,11 @@ import { FuseUtils } from '../../../../../../core/fuseUtils';
 import { ScrumboardService } from 'app/main/content/apps/scrumboard/scrumboard.service';
 import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs/Subscription';
-import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
 import { MdDialog, MdDialogRef } from '@angular/material';
 import { FuseScrumboardCardDialogComponent } from '../dialogs/card/card.component';
 import { FuseConfirmDialogComponent } from '../../../../../../core/components/confirm-dialog/confirm-dialog.component';
 import { Card } from '../../card.model';
+import { FusePerfectScrollbarDirective } from '../../../../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 
 @Component({
     selector     : 'fuse-scrumboard-board-list',
@@ -21,7 +21,7 @@ export class FuseScrumboardBoardListComponent implements OnInit, OnDestroy
     dialogRef: any;
 
     @Input() list;
-    @ViewChild(PerfectScrollbarDirective) listScroll: PerfectScrollbarDirective;
+    @ViewChild(FusePerfectScrollbarDirective) listScroll: FusePerfectScrollbarDirective;
 
     onBoardChanged: Subscription;
 
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
index cbd13873..756a57a9 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
@@ -9,7 +9,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfectScrollbar>
+        <div class="content py-16" fusePerfectScrollbar>
 
             <div class="nav">
                 <div class="nav-item">
@@ -67,7 +67,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content p-8" perfectScrollbar>
+        <div class="content p-8" fusePerfectScrollbar>
             <fuse-scrumboard-board-color-selector></fuse-scrumboard-board-color-selector>
         </div>
         <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/content/apps/scrumboard/scrumboard.component.html
index 5c155f91..a5a29202 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.html
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.html
@@ -1,5 +1,5 @@
 <!-- BOARDS -->
-<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex perfectScrollbar>
+<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex fusePerfectScrollbar>
 
     <div class="header pt-44 pt-md-88" fxFlex="0 0 auto">
         <h1>Scrumboard App</h1>
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index 06204091..c8025806 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfectScrollbar>
+<div class="content" fusePerfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
index e270c87d..fd447bbc 100644
--- a/src/app/main/content/apps/todo/todo.component.html
+++ b/src/app/main/content/apps/todo/todo.component.html
@@ -1,4 +1,4 @@
-<div id="todo" class="page-layout carded left-sidenav" perfectScrollbar>
+<div id="todo" class="page-layout carded left-sidenav" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -82,9 +82,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxFlexAlign="row">
 
-                    <fuse-todo-list perfectScrollbar fxFlex></fuse-todo-list>
+                    <fuse-todo-list fusePerfectScrollbar fxFlex></fuse-todo-list>
 
-                    <fuse-todo-details perfectScrollbar fxFlex></fuse-todo-details>
+                    <fuse-todo-details fusePerfectScrollbar fxFlex></fuse-todo-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
index 4208b7ee..9a8cda10 100644
--- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
+++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
@@ -1,4 +1,4 @@
-<div id="ngx-datatable" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="ngx-datatable" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between">
diff --git a/src/app/main/content/components/countdown/countdown.component.html b/src/app/main/content/components/countdown/countdown.component.html
index 595f16d6..46b59307 100644
--- a/src/app/main/content/components/countdown/countdown.component.html
+++ b/src/app/main/content/components/countdown/countdown.component.html
@@ -1,4 +1,4 @@
-<div id="countdown" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="countdown" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/hljs/hljs.component.html b/src/app/main/content/components/hljs/hljs.component.html
index 7031b830..b0928175 100644
--- a/src/app/main/content/components/hljs/hljs.component.html
+++ b/src/app/main/content/components/hljs/hljs.component.html
@@ -1,4 +1,4 @@
-<div id="hljs" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="hljs" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.html b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
index 421afdd8..c439d4cf 100644
--- a/src/app/main/content/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
@@ -1,4 +1,4 @@
-<div id="material-color-picker" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="material-color-picker" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/content/components/navigation/navigation.component.html
index 42f5dd18..609ae677 100644
--- a/src/app/main/content/components/navigation/navigation.component.html
+++ b/src/app/main/content/components/navigation/navigation.component.html
@@ -1,4 +1,4 @@
-<div id="navigation" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="navigation" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/price-tables/price-tables.component.html b/src/app/main/content/components/price-tables/price-tables.component.html
index 360ad49f..7b8306ce 100644
--- a/src/app/main/content/components/price-tables/price-tables.component.html
+++ b/src/app/main/content/components/price-tables/price-tables.component.html
@@ -1,4 +1,4 @@
-<div id="price-tables" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="price-tables" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/search-bar/search-bar.component.html b/src/app/main/content/components/search-bar/search-bar.component.html
index cce891da..53a20f4f 100644
--- a/src/app/main/content/components/search-bar/search-bar.component.html
+++ b/src/app/main/content/components/search-bar/search-bar.component.html
@@ -1,4 +1,4 @@
-<div id="search-bar" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="search-bar" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.html b/src/app/main/content/components/shortcuts/shortcuts.component.html
index 20c80877..f9fd9044 100644
--- a/src/app/main/content/components/shortcuts/shortcuts.component.html
+++ b/src/app/main/content/components/shortcuts/shortcuts.component.html
@@ -1,4 +1,4 @@
-<div id="shortcuts" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="shortcuts" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/widget/widget.component.html b/src/app/main/content/components/widget/widget.component.html
index 852d1994..bf6dc57b 100644
--- a/src/app/main/content/components/widget/widget.component.html
+++ b/src/app/main/content/components/widget/widget.component.html
@@ -1,4 +1,4 @@
-<div id="widget" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="widget" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
index 82f826bc..81962f9b 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
@@ -1,4 +1,4 @@
-<div id="forgot-password" fxLayout="column" perfectScrollbar>
+<div id="forgot-password" fxLayout="column" fusePerfectScrollbar>
 
     <div id="forgot-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.html b/src/app/main/content/pages/authentication/lock/lock.component.html
index 05b03cfa..1b74729a 100644
--- a/src/app/main/content/pages/authentication/lock/lock.component.html
+++ b/src/app/main/content/pages/authentication/lock/lock.component.html
@@ -1,4 +1,4 @@
-<div id="lock" fxLayout="column" perfectScrollbar>
+<div id="lock" fxLayout="column" fusePerfectScrollbar>
 
     <div id="lock-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
index 1c5a6a87..fe2b6f79 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.html
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="login-form-wrapper" perfectScrollbar>
+    <div id="login-form-wrapper" fusePerfectScrollbar>
 
         <div id="login-form">
 
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
index 31dc57fc..69a23fdb 100644
--- a/src/app/main/content/pages/authentication/login/login.component.html
+++ b/src/app/main/content/pages/authentication/login/login.component.html
@@ -1,4 +1,4 @@
-<div id="login" fxLayout="column" perfectScrollbar>
+<div id="login" fxLayout="column" fusePerfectScrollbar>
 
     <div id="login-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
index bead6516..bbc773bc 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.html
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="register-form-wrapper" perfectScrollbar>
+    <div id="register-form-wrapper" fusePerfectScrollbar>
 
         <div id="register-form">
 
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
index aba4ffad..ec5127f9 100644
--- a/src/app/main/content/pages/authentication/register/register.component.html
+++ b/src/app/main/content/pages/authentication/register/register.component.html
@@ -1,4 +1,4 @@
-<div id="register" fxLayout="column" perfectScrollbar>
+<div id="register" fxLayout="column" fusePerfectScrollbar>
 
     <div id="register-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
index 7c466e7b..45527e9e 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
@@ -1,4 +1,4 @@
-<div id="reset-password" fxLayout="column" perfectScrollbar>
+<div id="reset-password" fxLayout="column" fusePerfectScrollbar>
 
     <div id="reset-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
index 39de6389..447ad97e 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.html
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.html
@@ -1,4 +1,4 @@
-<div id="coming-soon" fxLayout="column" perfectScrollbar>
+<div id="coming-soon" fxLayout="column" fusePerfectScrollbar>
 
     <div id="coming-soon-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.html b/src/app/main/content/pages/invoices/compact/compact.component.html
index ec3da93d..526ecfa6 100644
--- a/src/app/main/content/pages/invoices/compact/compact.component.html
+++ b/src/app/main/content/pages/invoices/compact/compact.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="compact page-layout blank" fxLayout="row" perfectScrollbar>
+<div id="invoice" class="compact page-layout blank" fxLayout="row" fusePerfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.html b/src/app/main/content/pages/invoices/modern/modern.component.html
index 0021b3bd..5f20ecc5 100644
--- a/src/app/main/content/pages/invoices/modern/modern.component.html
+++ b/src/app/main/content/pages/invoices/modern/modern.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="modern page-layout blank" fxLayout="row" perfectScrollbar>
+<div id="invoice" class="modern page-layout blank" fxLayout="row" fusePerfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
index d4721910..09b74843 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.html
+++ b/src/app/main/content/pages/maintenance/maintenance.component.html
@@ -1,4 +1,4 @@
-<div id="maintenance" fxLayout="column" perfectScrollbar>
+<div id="maintenance" fxLayout="column" fusePerfectScrollbar>
 
     <div id="maintenance-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html
index e33e5e60..ce2c7f7d 100644
--- a/src/app/main/content/pages/profile/profile.component.html
+++ b/src/app/main/content/pages/profile/profile.component.html
@@ -1,4 +1,4 @@
-<div id="profile" class="page-layout simple tabbed" perfectScrollbar>
+<div id="profile" class="page-layout simple tabbed" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/pages/search/search.component.html b/src/app/main/content/pages/search/search.component.html
index 3f789344..e2f7eb9b 100644
--- a/src/app/main/content/pages/search/search.component.html
+++ b/src/app/main/content/pages/search/search.component.html
@@ -1,4 +1,4 @@
-<div id="search" class="page-layout simple tabbed" perfectScrollbar>
+<div id="search" class="page-layout simple tabbed" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/content/services/config/config.component.html
index d4db2c5e..485e9282 100644
--- a/src/app/main/content/services/config/config.component.html
+++ b/src/app/main/content/services/config/config.component.html
@@ -1,4 +1,4 @@
-<div id="config" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="config" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.html b/src/app/main/content/services/splash-screen/splash-screen.component.html
index 39e3c392..e259bc45 100644
--- a/src/app/main/content/services/splash-screen/splash-screen.component.html
+++ b/src/app/main/content/services/splash-screen/splash-screen.component.html
@@ -1,4 +1,4 @@
-<div id="splash-screen" class="page-layout simple fullwidth" perfectScrollbar>
+<div id="splash-screen" class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/colors/colors.component.html b/src/app/main/content/ui/colors/colors.component.html
index 67da3633..ec3b0082 100644
--- a/src/app/main/content/ui/colors/colors.component.html
+++ b/src/app/main/content/ui/colors/colors.component.html
@@ -1,4 +1,4 @@
-<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
+<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/content/ui/forms/forms.component.html
index 2a64ee2f..64e336f4 100644
--- a/src/app/main/content/ui/forms/forms.component.html
+++ b/src/app/main/content/ui/forms/forms.component.html
@@ -1,4 +1,4 @@
-<div id="forms" class="page-layout simple fullwidth" fxLayout="column" perfectScrollbar>
+<div id="forms" class="page-layout simple fullwidth" fxLayout="column" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.html b/src/app/main/content/ui/helper-classes/helper-classes.component.html
index 375dde1f..c5b0c198 100644
--- a/src/app/main/content/ui/helper-classes/helper-classes.component.html
+++ b/src/app/main/content/ui/helper-classes/helper-classes.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/icons/icons.component.html b/src/app/main/content/ui/icons/icons.component.html
index 535acd27..a3189c2b 100644
--- a/src/app/main/content/ui/icons/icons.component.html
+++ b/src/app/main/content/ui/icons/icons.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.html b/src/app/main/content/ui/page-layouts/blank/blank.component.html
index e8b26ddb..05682c35 100644
--- a/src/app/main/content/ui/page-layouts/blank/blank.component.html
+++ b/src/app/main/content/ui/page-layouts/blank/blank.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout blank p-24" perfectScrollbar>
+<div class="page-layout blank p-24" fusePerfectScrollbar>
 
     <h2>Blank Page</h2>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
index a907e53a..8fdc64a9 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth single-scroll" perfectScrollbar>
+<div class="page-layout carded fullwidth single-scroll" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
index b773dc15..74768558 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth" perfectScrollbar>
+<div class="page-layout carded fullwidth" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -23,7 +23,7 @@
             <!-- / CONTENT TOOLBAR -->
 
             <!-- CONTENT -->
-            <div class="content p-24" perfectScrollbar>
+            <div class="content p-24" fusePerfectScrollbar>
 
                 <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
index a3142a62..885763c3 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav single-scroll" perfectScrollbar>
+<div class="page-layout carded left-sidenav single-scroll" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfectScrollbar>
+            <div class="content p-24" fusePerfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
@@ -50,7 +50,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfectScrollbar>
+                <div class="content p-24" fusePerfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
index 291bf374..b2b52e3c 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav" perfectScrollbar>
+<div class="page-layout carded left-sidenav" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfectScrollbar>
+            <div class="content p-24" fusePerfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -52,7 +52,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfectScrollbar>
+                <div class="content p-24" fusePerfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
index 3609d0e2..9bc7ca3b 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav single-scroll" perfectScrollbar>
+<div class="page-layout carded right-sidenav single-scroll" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfectScrollbar>
+                <div class="content p-24" fusePerfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfectScrollbar>
+            <div class="content p-24" fusePerfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
index 58fa1092..48f48aae 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav" perfectScrollbar>
+<div class="page-layout carded right-sidenav" fusePerfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfectScrollbar>
+                <div class="content p-24" fusePerfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfectScrollbar>
+            <div class="content p-24" fusePerfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
index dce9c771..fb61114e 100644
--- a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple fullwidth" perfectScrollbar>
+<div class="page-layout simple fullwidth" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
index 32f5ca49..4c72ef67 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav single-scroll" perfectScrollbar>
+<div class="page-layout simple left-sidenav single-scroll" fusePerfectScrollbar>
 
     <md-sidenav-container>
 
@@ -12,7 +12,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfectScrollbar>
+        <div class="center" fusePerfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
index 2209e661..19154bec 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
+<div class="page-layout simple left-sidenav inner-sidenav" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -22,7 +22,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfectScrollbar>
+            <div class="sidenav-content" fusePerfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -32,7 +32,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24" perfectScrollbar>
+        <div class="center p-24" fusePerfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
index cce37f1d..f1a5aa54 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav" perfectScrollbar>
+<div class="page-layout simple left-sidenav" fusePerfectScrollbar>
 
     <md-sidenav-container>
 
@@ -6,7 +6,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfectScrollbar>
+            <div class="sidenav-content p-24" fusePerfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -16,7 +16,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfectScrollbar>
+        <div class="center" fusePerfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
index f43fec7f..8aa1b40d 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav single-scroll" perfectScrollbar>
+<div class="page-layout simple right-sidenav single-scroll" fusePerfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfectScrollbar>
+        <div class="center" fusePerfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
index aa320940..f5865f7e 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple right-sidenav inner-sidenav" perfectScrollbar>
+<div class="page-layout simple right-sidenav inner-sidenav" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -19,7 +19,7 @@
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center p-24" perfectScrollbar>
+        <div class="center p-24" fusePerfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfectScrollbar>
+            <div class="sidenav-content" fusePerfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
index f530784d..52644c7b 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav" perfectScrollbar>
+<div class="page-layout simple right-sidenav" fusePerfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfectScrollbar>
+        <div class="center" fusePerfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfectScrollbar>
+            <div class="sidenav-content p-24" fusePerfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
index 299b3c9f..f4c1dee2 100644
--- a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple tabbed" perfectScrollbar>
+<div class="page-layout simple tabbed" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24">
diff --git a/src/app/main/content/ui/typography/typography.component.html b/src/app/main/content/ui/typography/typography.component.html
index 53e180f3..c4b4fee3 100644
--- a/src/app/main/content/ui/typography/typography.component.html
+++ b/src/app/main/content/ui/typography/typography.component.html
@@ -1,4 +1,4 @@
-<div id="typography" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
+<div id="typography" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss
index 5d58ded9..85dcb0f1 100644
--- a/src/app/main/main.component.scss
+++ b/src/app/main/main.component.scss
@@ -12,19 +12,6 @@ fuse-main {
         @include mat-elevation(8);
     }
 
-    &.disable-perfect-scrollbar {
-
-        .ps {
-            -webkit-overflow-scrolling: touch !important;
-            overflow: auto !important;
-        }
-
-        .ps__scrollbar-x-rail,
-        .ps__scrollbar-y-rail {
-            display: none !important;
-        }
-    }
-
     > .mat-sidenav-container {
         display: flex;
         flex: 1;
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
index a4880222..c7896e3c 100644
--- a/src/app/main/main.component.ts
+++ b/src/app/main/main.component.ts
@@ -1,6 +1,8 @@
-import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core';
+import { Component, ElementRef, HostBinding, Inject, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
 import { FuseConfigService } from '../core/services/config.service';
+import { Platform } from '@angular/cdk/platform';
+import { DOCUMENT } from '@angular/common';
 
 @Component({
     selector     : 'fuse-main',
@@ -12,13 +14,14 @@ export class FuseMainComponent implements OnInit, OnDestroy
 {
     onSettingsChanged: Subscription;
     fuseSettings: any;
-    @HostBinding('class.disable-perfect-scrollbar') disableCustomScrollbars;
     @HostBinding('class.boxed') boxed;
 
     constructor(
         private _renderer: Renderer2,
         private _elementRef: ElementRef,
-        private fuseConfig: FuseConfigService
+        private fuseConfig: FuseConfigService,
+        private platform: Platform,
+        @Inject(DOCUMENT) private document: any
     )
     {
         this.onSettingsChanged =
@@ -26,10 +29,14 @@ export class FuseMainComponent implements OnInit, OnDestroy
                 .subscribe(
                     (newSettings) => {
                         this.fuseSettings = newSettings;
-                        this.disableCustomScrollbars = !this.fuseSettings.customScrollbars;
                         this.boxed = this.fuseSettings.layout.mode === 'boxed';
                     }
                 );
+
+        if ( this.platform.ANDROID || this.platform.IOS )
+        {
+            this.document.body.className += ' is-mobile';
+        }
     }
 
     ngOnInit()
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.html b/src/app/main/navbar/vertical/navbar-vertical.component.html
index 96743792..a88e997b 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.html
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.html
@@ -15,6 +15,6 @@
 
 </div>
 
-<div class="navbar-content" perfectScrollbar>
+<div class="navbar-content" fusePerfectScrollbar>
     <fuse-navigation layout="vertical"></fuse-navigation>
 </div>
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.ts b/src/app/main/navbar/vertical/navbar-vertical.component.ts
index cd0ca2a6..ec7b23a0 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.ts
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.ts
@@ -5,8 +5,8 @@ import { FuseNavbarVerticalService } from './navbar-vertical.service';
 import { ObservableMedia } from '@angular/flex-layout';
 import { FuseMainComponent } from '../../main.component';
 import { NavigationEnd, Router } from '@angular/router';
-import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
 import { FuseNavigationService } from '../../../core/components/navigation/navigation.service';
+import { FusePerfectScrollbarDirective } from '../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 
 @Component({
     selector     : 'fuse-navbar-vertical',
@@ -21,7 +21,7 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
     @HostBinding('class.folded-open') isFoldedOpen: boolean;
     @HostBinding('class.initialized') initialized: boolean;
     @Input('folded') foldedByDefault = false;
-    @ViewChild(PerfectScrollbarDirective) perfectScrollbarDirective;
+    @ViewChild(FusePerfectScrollbarDirective) fusePerfectScrollbarDirective;
 
     matchMediaWatcher: Subscription;
 
@@ -39,7 +39,7 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
         this.fuseNavigationService.onNavCollapseToggled.subscribe(() => {
 
             setTimeout(() => {
-                this.perfectScrollbarDirective.update();
+                this.fusePerfectScrollbarDirective.update();
             }, 310);
         });
 

From d6d74cb998f4d8b1a027c9ee431962321632a83f Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Wed, 20 Sep 2017 10:06:28 +0300
Subject: [PATCH 08/27] small tweaks

---
 src/app/core/animations.ts                                  | 4 +---
 .../directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts   | 2 +-
 .../fuse-perfect-scrollbar.directive.ts                     | 6 +++---
 .../main/content/apps/chat/chat-view/chat-view.component.ts | 3 ++-
 .../content/apps/dashboards/project/project.component.html  | 1 -
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/app/core/animations.ts b/src/app/core/animations.ts
index d6f3ff61..65e7a622 100644
--- a/src/app/core/animations.ts
+++ b/src/app/core/animations.ts
@@ -1,6 +1,4 @@
-import { sequence, trigger, stagger, animate, style, group, query, transition, keyframes, animateChild, state } from '@angular/animations';
-
-// const query = (s, a, o = {optional: true}) => q(s, a, o);
+import { sequence, trigger, animate, style, group, query, transition, animateChild, state } from '@angular/animations';
 
 export class Animations
 {
diff --git a/src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts b/src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts
index 3854c0f9..b7042968 100644
--- a/src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts
+++ b/src/app/core/directives/fuse-if-on-dom/fuse-if-on-dom.directive.ts
@@ -21,7 +21,7 @@ export class FuseIfOnDomDirective implements AfterContentChecked
         {
             setTimeout(() => {
                 this.viewContainer.createEmbeddedView(this.templateRef);
-            }, 0);
+            }, 350);
             this.isCreated = true;
         }
         else if ( this.isCreated && !document.body.contains(this.element.nativeElement) )
diff --git a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
index d3b734be..b1b42b41 100644
--- a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
+++ b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
@@ -35,12 +35,12 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
         }
     }
 
-    ngOnInit(): void
+    ngOnInit()
     {
 
     }
 
-    ngAfterViewInit(): void
+    ngAfterViewInit()
     {
         if ( this.isMobile || this.isDisableCustomScrollbars )
         {
@@ -55,7 +55,7 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
         });
     }
 
-    ngOnDestroy(): void
+    ngOnDestroy()
     {
         if ( !this.isInitialized )
         {
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
index ecc14037..92c7bce4 100644
--- a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
+++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
@@ -72,11 +72,12 @@ export class FuseChatViewComponent implements OnInit, AfterViewInit
         speed = speed || 400;
         if ( this.directiveScroll )
         {
+            this.directiveScroll.update();
+
             setTimeout(() => {
                 this.directiveScroll.scrollToBottom(0, speed);
             });
         }
-
     }
 
     reply(event)
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index 3a38494d..d8dc13a5 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -282,7 +282,6 @@
                                                         [xAxisLabel]="widget5.supporting.xAxisLabel"
                                                         [yAxisLabel]="widget5.supporting.yAxisLabel"
                                                         [curve]="widget5.supporting.curve">
-                                                        >
                                                     </ngx-charts-area-chart>
                                                 </div>
                                             </div>

From 126e32d9e761cc54b9b536ea2f392153e2fc3a66 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Wed, 20 Sep 2017 10:06:43 +0300
Subject: [PATCH 09/27] updated Angular to 4.4.3

---
 package-lock.json | 74 +++++++++++++++++++++++------------------------
 package.json      | 22 +++++++-------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9010ae8d..91972508 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,9 +43,9 @@
       }
     },
     "@angular/animations": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.5.tgz",
-      "integrity": "sha1-hapFTIh8x8zhFjfqX26a+tiEkOE=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.3.tgz",
+      "integrity": "sha1-OWxKW/sihH+eRYJFuplfnBMMDPM=",
       "requires": {
         "tslib": "1.7.1"
       }
@@ -124,28 +124,28 @@
       }
     },
     "@angular/common": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.5.tgz",
-      "integrity": "sha1-X2sRNH6uHfw0YjzP1MBsj0xIji0=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz",
+      "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.5.tgz",
-      "integrity": "sha1-UNPJhmV77/H+9Pbdmj+ljiSr1Ug=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz",
+      "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.5.tgz",
-      "integrity": "sha1-JOmbNsCQk2P/gke/MxqLiert/mM=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz",
+      "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.3.5",
+        "@angular/tsc-wrapped": "4.4.3",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       },
@@ -159,9 +159,9 @@
       }
     },
     "@angular/core": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.5.tgz",
-      "integrity": "sha1-vR79vx68+5wnojjiqkxIFZsIlbs=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz",
+      "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=",
       "requires": {
         "tslib": "1.7.1"
       }
@@ -175,25 +175,25 @@
       }
     },
     "@angular/forms": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.5.tgz",
-      "integrity": "sha1-UZqtCtgqG4cBmTf6k/wUdzRzd4c=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz",
+      "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.5.tgz",
-      "integrity": "sha1-gdSwdhyO8DXLC3NjAMI382KG8fA=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz",
+      "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/language-service": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.5.tgz",
-      "integrity": "sha1-ttiC6kDRjVE/w6A1p5h1Ap/jjwE=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.4.3.tgz",
+      "integrity": "sha1-RScBGllJZ6OW7/PAXtFb1MhtUbc=",
       "dev": true
     },
     "@angular/material": {
@@ -205,33 +205,33 @@
       }
     },
     "@angular/platform-browser": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.5.tgz",
-      "integrity": "sha1-wNA0CUmcwp+BZ3qrYjyQhnYNhO8=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz",
+      "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.5.tgz",
-      "integrity": "sha1-Sml7OwrsgFsziE/UqbNHMGW6seA=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz",
+      "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/router": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.5.tgz",
-      "integrity": "sha1-GICCdHvJtpdPnUs/VVe0NGRdI80=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.3.tgz",
+      "integrity": "sha1-JsyUd1o4YJRq6vHC6PYPTUTpCZE=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.5.tgz",
-      "integrity": "sha1-lf2qgTz8VyYvx+9f6nJtYorvq6w=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz",
+      "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
diff --git a/package.json b/package.json
index 4ad2ef2c..c3770b5b 100644
--- a/package.json
+++ b/package.json
@@ -12,18 +12,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "4.3.5",
+    "@angular/animations": "4.4.3",
     "@angular/cdk": "2.0.0-beta.10",
-    "@angular/common": "4.3.5",
-    "@angular/compiler": "4.3.5",
-    "@angular/core": "4.3.5",
+    "@angular/common": "4.4.3",
+    "@angular/compiler": "4.4.3",
+    "@angular/core": "4.4.3",
     "@angular/flex-layout": "2.0.0-beta.9",
-    "@angular/forms": "4.3.5",
-    "@angular/http": "4.3.5",
+    "@angular/forms": "4.4.3",
+    "@angular/http": "4.4.3",
     "@angular/material": "2.0.0-beta.10",
-    "@angular/platform-browser": "4.3.5",
-    "@angular/platform-browser-dynamic": "4.3.5",
-    "@angular/router": "4.3.5",
+    "@angular/platform-browser": "4.4.3",
+    "@angular/platform-browser-dynamic": "4.4.3",
+    "@angular/router": "4.4.3",
     "@swimlane/ngx-charts": "6.0.2",
     "@swimlane/ngx-datatable": "9.3.1",
     "@swimlane/ngx-dnd": "3.0.0",
@@ -47,8 +47,8 @@
   },
   "devDependencies": {
     "@angular/cli": "1.4.2",
-    "@angular/compiler-cli": "4.3.5",
-    "@angular/language-service": "4.3.5",
+    "@angular/compiler-cli": "4.4.3",
+    "@angular/language-service": "4.4.3",
     "@ngtools/webpack": "1.7.1",
     "@types/jasmine": "2.6.0",
     "@types/jasminewd2": "2.0.2",

From 32960abd7cb9464078a859bae1f2480bae7078e2 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Wed, 20 Sep 2017 17:38:14 +0300
Subject: [PATCH 10/27] fixed sidenav for fuse
 https://github.com/angular/material2/issues/7201

---
 package-lock.json                             |  3 +-
 src/app/core/animations.ts                    | 38 +++++++--------
 .../md-sidenav-helper.directive.ts            |  2 +-
 .../scss/partials/_angular-material-fix.scss  | 47 +++++++++++++++++++
 src/app/core/scss/partials/_page-layouts.scss | 22 +--------
 .../dashboards/project/project.component.html |  3 +-
 6 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 91972508..65a4ac97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9178,8 +9178,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "uglifyjs-webpack-plugin": {
       "version": "0.4.6",
diff --git a/src/app/core/animations.ts b/src/app/core/animations.ts
index 65e7a622..611dd1f1 100644
--- a/src/app/core/animations.ts
+++ b/src/app/core/animations.ts
@@ -267,7 +267,7 @@ export class Animations
 
     public static routerTransitionFade = trigger('routerTransitionFade', [
 
-        transition('* => *', [
+        transition('* => *', group([
 
             query('fuse-content > :enter, fuse-content > :leave ', [
                 style({
@@ -283,28 +283,26 @@ export class Animations
                     opacity: 0
                 })
             ], {optional: true}),
-            // sequence([
-                query('fuse-content > :leave', [
-                    style({
-                        opacity: 1
-                    }),
-                    animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
-                        style({
-                            opacity: 0
-                        }))
-                ], {optional: true}),
-                query('fuse-content > :enter', [
+            query('fuse-content > :leave', [
+                style({
+                    opacity: 1
+                }),
+                animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
                     style({
                         opacity: 0
-                    }),
-                    animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
-                        style({
-                            opacity: 1
-                        }))
-                ], {optional: true}),
-            // ]),
+                    }))
+            ], {optional: true}),
+            query('fuse-content > :enter', [
+                style({
+                    opacity: 0
+                }),
+                animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                    style({
+                        opacity: 1
+                    }))
+            ], {optional: true}),
             query('fuse-content > :enter', animateChild(), {optional: true}),
             query('fuse-content > :leave', animateChild(), {optional: true})
-        ])
+        ]))
     ]);
 }
diff --git a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
index b487bd50..ca6fa6af 100644
--- a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
+++ b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
@@ -73,7 +73,7 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
     {
         setTimeout(() => {
             this.stopTransition = false;
-        }, 0);
+        }, 300);
     }
 
     ngOnDestroy()
diff --git a/src/app/core/scss/partials/_angular-material-fix.scss b/src/app/core/scss/partials/_angular-material-fix.scss
index f0ec4593..ca87b3c9 100644
--- a/src/app/core/scss/partials/_angular-material-fix.scss
+++ b/src/app/core/scss/partials/_angular-material-fix.scss
@@ -4,3 +4,50 @@
         border-radius: 50%;
     }
 }
+
+md-sidenav-container {
+
+    md-sidenav {
+        order: 1;
+
+        &.md-is-locked-open {
+            position: relative !important;
+        }
+
+        &.md-stop-transition {
+            transition: none !important;
+            transform: translate3d(0, 0, 0) !important;
+
+            ~ .mat-sidenav-content,
+            ~ .mat-drawer-content {
+                transition: none !important;
+            }
+        }
+
+        &.mat-sidenav-opened {
+
+            &.mat-drawer-side {
+
+                &.md-is-locked-open {
+                    position: relative !important;
+                }
+
+                ~ .mat-sidenav-content,
+                ~ .mat-drawer-content {
+                    transition: none !important;
+                    margin-left: 0 !important;
+                    margin-right: 0 !important;
+                    transform: translate3d(0, 0, 0) !important;
+                }
+            }
+        }
+
+        &.mat-drawer-end {
+            order: 3;
+        }
+    }
+
+    .mat-drawer-content {
+        order: 2;
+    }
+}
\ No newline at end of file
diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss
index 81f815e5..0ce92f09 100644
--- a/src/app/core/scss/partials/_page-layouts.scss
+++ b/src/app/core/scss/partials/_page-layouts.scss
@@ -137,19 +137,10 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                     @include mat-elevation(7);
 
                     &.md-is-locked-open {
-                        position: relative;
                         background: none;
                         box-shadow: none;
                     }
 
-                    &.md-stop-transition {
-
-                        ~ .mat-sidenav-content,
-                        ~ .mat-drawer-content {
-                            transition: none;
-                        }
-                    }
-
                     .header {
                         height: $carded-header-height;
                         min-height: $carded-header-height;
@@ -233,7 +224,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
 
                         ~ .mat-sidenav-content,
                         ~ .mat-drawer-content {
-                            margin-left: 0 !important;
 
                             .center {
                                 margin-left: 0;
@@ -257,7 +247,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
 
                         ~ .mat-sidenav-content,
                         ~ .mat-drawer-content {
-                            margin-right: 0 !important;
 
                             .center {
                                 margin-right: 0;
@@ -347,7 +336,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
 
             > md-sidenav-container {
                 display: flex;
-                flex-direction: column;
+                // flex-direction: column;
+                flex-direction: row;
                 flex: 1;
                 background: none;
                 z-index: 2;
@@ -368,14 +358,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
                         background: transparent;
                     }
 
-                    &.md-stop-transition {
-
-                        ~ .mat-sidenav-content,
-                        ~ .mat-drawer-content {
-                            transition: none;
-                        }
-                    }
-
                     .sidenav-content {
                         height: 100%;
                     }
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index d8dc13a5..00fc77a3 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -687,7 +687,8 @@
         <!-- / CENTER -->
 
         <!-- SIDENAV -->
-        <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
+        <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side"
+                    fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
             <div class="sidenav-content" fusePerfectScrollbar>
                 <!-- WIDGET GROUP -->

From 769e67c2f3cab448c984f40548ba08c8010593c3 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 10:58:19 +0300
Subject: [PATCH 11/27] Added HMR config. Use 'npm run hmr' for HMR enabled
 environment. This start script disables the sourcemaps to further increase
 the re-compile performance. If you need HMR with sourcemaps use 'npm run
 hmrs'

---
 .angular-cli.json                    |  1 +
 package-lock.json                    |  9 ++++++++-
 package.json                         |  3 +++
 src/environments/environment.hmr.ts  |  4 ++++
 src/environments/environment.prod.ts |  3 ++-
 src/environments/environment.ts      |  3 ++-
 src/hmr.ts                           | 15 +++++++++++++++
 src/main.ts                          | 20 +++++++++++++++++++-
 8 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/environments/environment.hmr.ts
 create mode 100644 src/hmr.ts

diff --git a/.angular-cli.json b/.angular-cli.json
index ccf86d4d..8e74396f 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -25,6 +25,7 @@
             "environmentSource": "environments/environment.ts",
             "environments": {
                 "dev": "environments/environment.ts",
+                "hmr": "environments/environment.hmr.ts",
                 "prod": "environments/environment.prod.ts"
             }
         }
diff --git a/package-lock.json b/package-lock.json
index 65a4ac97..80643c94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -237,6 +237,12 @@
         "tsickle": "0.21.6"
       }
     },
+    "@angularclass/hmr": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@angularclass/hmr/-/hmr-2.1.3.tgz",
+      "integrity": "sha1-NOZY7T2jfyOwogDi2lqJvpK7IJ8=",
+      "dev": true
+    },
     "@ngtools/json-schema": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz",
@@ -9178,7 +9184,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "uglifyjs-webpack-plugin": {
       "version": "0.4.6",
diff --git a/package.json b/package.json
index c3770b5b..a54b30a8 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
+    "hmr": "ng serve --hmr -e=hmr -sm=false",
+    "hmrs": "ng serve --hmr -e=hmr",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
@@ -49,6 +51,7 @@
     "@angular/cli": "1.4.2",
     "@angular/compiler-cli": "4.4.3",
     "@angular/language-service": "4.4.3",
+    "@angularclass/hmr": "2.1.3",
     "@ngtools/webpack": "1.7.1",
     "@types/jasmine": "2.6.0",
     "@types/jasminewd2": "2.0.2",
diff --git a/src/environments/environment.hmr.ts b/src/environments/environment.hmr.ts
new file mode 100644
index 00000000..e1c43c7f
--- /dev/null
+++ b/src/environments/environment.hmr.ts
@@ -0,0 +1,4 @@
+export const environment = {
+    production: false,
+    hmr: true
+};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 5d083316..3420b328 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,3 +1,4 @@
 export const environment = {
-    production: true
+    production: true,
+    hmr: false
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6f30aa44..8bd4860c 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,5 +4,6 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-    production: false
+    production: false,
+    hmr: false
 };
diff --git a/src/hmr.ts b/src/hmr.ts
new file mode 100644
index 00000000..29a02d8e
--- /dev/null
+++ b/src/hmr.ts
@@ -0,0 +1,15 @@
+import { NgModuleRef, ApplicationRef } from '@angular/core';
+import { createNewHosts } from '@angularclass/hmr';
+
+export const hmrBootstrap = (module: any, bootstrap: () => Promise<NgModuleRef<any>>) => {
+    let ngModule: NgModuleRef<any>;
+    module.hot.accept();
+    bootstrap().then(mod => ngModule = mod);
+    module.hot.dispose(() => {
+        const appRef: ApplicationRef = ngModule.injector.get(ApplicationRef);
+        const elements = appRef.components.map(c => c.location.nativeElement);
+        const makeVisible = createNewHosts(elements);
+        ngModule.destroy();
+        makeVisible();
+    });
+};
diff --git a/src/main.ts b/src/main.ts
index 8254f71b..0c1d9414 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,10 +3,28 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+import { hmrBootstrap } from './hmr';
 
 if ( environment.production )
 {
     enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
+
+if ( environment.hmr )
+{
+    if ( module['hot'] )
+    {
+        hmrBootstrap(module, bootstrap);
+    }
+    else
+    {
+        console.error('HMR is not enabled for webpack-dev-server!');
+        console.log('Are you using the --hmr flag for ng serve?');
+    }
+}
+else
+{
+    bootstrap();
+}

From b9198e3717f74e01cb6f6ab78e5482c643179003 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 12:08:52 +0300
Subject: [PATCH 12/27] Entirely changed the navigation model structure
 (sorry!) + Fixed: Horizontal and Vertical navigation must be able to use the
 same model structure + Fixed: Collapsable nav item that has the active menu
 shouldn't be collapsed when other collapsables toggles

---
 .../nav-horizontal-collapse.component.html    |   5 +-
 .../navigation/navigation.component.html      |  21 +-
 .../navigation/navigation.component.ts        |   6 +-
 .../navigation/navigation.module.ts           |   4 +-
 .../navigation/navigation.service.ts          |  14 +-
 .../nav-vertical-collapse.component.html      |   4 +-
 .../nav-vertical-collapse.component.ts        |  12 +-
 .../nav-vertical-group.component.html         |  10 +
 .../nav-vertical-group.component.scss         |  23 +
 .../nav-group/nav-vertical-group.component.ts |  21 +
 .../nav-vertical-subheader.component.html     |   1 -
 .../nav-vertical-subheader.component.scss     |  20 -
 .../nav-vertical-subheader.component.ts       |  21 -
 src/app/core/scss/partials/_navigation.scss   |  40 ++
 src/app/navigation.model.ts                   | 557 +++---------------
 15 files changed, 215 insertions(+), 544 deletions(-)
 create mode 100644 src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
 create mode 100644 src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss
 create mode 100644 src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts
 delete mode 100644 src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.html
 delete mode 100644 src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.scss
 delete mode 100644 src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.ts

diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
index 045e077d..4f061e79 100644
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
@@ -9,9 +9,8 @@
     <div class="{{fuseSettings.colorClasses.navbar}}">
 
         <ng-container *ngFor="let item of item.children">
-            <fuse-nav-horizontal-item *ngIf="item.type=='nav-item'" [item]="item"></fuse-nav-horizontal-item>
-            <fuse-nav-horizontal-collapse *ngIf="item.type=='nav-collapse'"
-                                          [item]="item"></fuse-nav-horizontal-collapse>
+            <fuse-nav-horizontal-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-horizontal-item>
+            <fuse-nav-horizontal-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-horizontal-collapse>
         </ng-container>
 
     </div>
diff --git a/src/app/core/components/navigation/navigation.component.html b/src/app/core/components/navigation/navigation.component.html
index 12b31aff..d2cb94b2 100644
--- a/src/app/core/components/navigation/navigation.component.html
+++ b/src/app/core/components/navigation/navigation.component.html
@@ -1,27 +1,32 @@
-<div id="main-navigation" class="nav" [ngClass]="{'horizontal':layout === 'horizontal'}">
+<div id="main-navigation" class="nav"
+     [ngClass]="{'horizontal':layout === 'horizontal', 'vertical':layout === 'vertical'}">
 
+    <!-- Vertical Navigation Layout -->
     <ng-container *ngIf="layout === 'vertical'">
 
-        <ng-container *ngFor="let item of verticalNavigation">
+        <ng-container *ngFor="let item of navigationModel">
 
-            <fuse-nav-vertical-subheader *ngIf="item.type=='subheader'" [item]="item"></fuse-nav-vertical-subheader>
-            <fuse-nav-vertical-item *ngIf="item.type=='nav-item'" [item]="item"></fuse-nav-vertical-item>
-            <fuse-nav-vertical-collapse *ngIf="item.type=='nav-collapse'" [item]="item"></fuse-nav-vertical-collapse>
+            <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
+            <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
+            <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
 
         </ng-container>
 
     </ng-container>
+    <!-- / Vertical Navigation Layout -->
 
+    <!-- Horizontal Navigation Layout -->
     <ng-container *ngIf="layout === 'horizontal'">
 
-        <ng-container *ngFor="let item of horizontalNavigation">
+        <ng-container *ngFor="let item of navigationModel">
 
+            <fuse-nav-horizontal-collapse *ngIf="item.type=='group'" [item]="item"></fuse-nav-horizontal-collapse>
+            <fuse-nav-horizontal-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-horizontal-collapse>
             <fuse-nav-horizontal-item *ngIf="item.type=='nav-item'" [item]="item"></fuse-nav-horizontal-item>
-            <fuse-nav-horizontal-collapse *ngIf="item.type=='nav-collapse'"
-                                          [item]="item"></fuse-nav-horizontal-collapse>
 
         </ng-container>
 
     </ng-container>
+    <!-- / Horizontal Navigation Layout -->
 
 </div>
diff --git a/src/app/core/components/navigation/navigation.component.ts b/src/app/core/components/navigation/navigation.component.ts
index 02da575c..20f71ab7 100644
--- a/src/app/core/components/navigation/navigation.component.ts
+++ b/src/app/core/components/navigation/navigation.component.ts
@@ -9,15 +9,13 @@ import { FuseNavigationService } from './navigation.service';
 })
 export class FuseNavigationComponent
 {
-    verticalNavigation: any[];
-    horizontalNavigation: any[];
+    navigationModel: any[];
 
     @Input('layout') layout = 'vertical';
 
     constructor(private navigationService: FuseNavigationService)
     {
-        this.verticalNavigation = navigationService.getNavigation('verticalNavItems');
-        this.horizontalNavigation = navigationService.getNavigation('horizontalNavItems');
+        this.navigationModel = navigationService.getNavigationModel();
     }
 
 }
diff --git a/src/app/core/components/navigation/navigation.module.ts b/src/app/core/components/navigation/navigation.module.ts
index 9f0bd0bf..42e680cd 100644
--- a/src/app/core/components/navigation/navigation.module.ts
+++ b/src/app/core/components/navigation/navigation.module.ts
@@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router';
 import { FuseNavigationComponent } from './navigation.component';
 import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component';
 import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component';
-import { FuseNavVerticalSubheaderComponent } from './vertical/nav-subheader/nav-vertical-subheader.component';
+import { FuseNavVerticalGroupComponent } from './vertical/nav-group/nav-vertical-group.component';
 import { FuseNavHorizontalItemComponent } from './horizontal/nav-item/nav-horizontal-item.component';
 import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/nav-horizontal-collapse.component';
 
@@ -18,7 +18,7 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na
     ],
     declarations: [
         FuseNavigationComponent,
-        FuseNavVerticalSubheaderComponent,
+        FuseNavVerticalGroupComponent,
         FuseNavVerticalItemComponent,
         FuseNavVerticalCollapseComponent,
         FuseNavHorizontalItemComponent,
diff --git a/src/app/core/components/navigation/navigation.service.ts b/src/app/core/components/navigation/navigation.service.ts
index 8e71d2e0..4f9b6cc7 100644
--- a/src/app/core/components/navigation/navigation.service.ts
+++ b/src/app/core/components/navigation/navigation.service.ts
@@ -1,25 +1,25 @@
 import { EventEmitter, Injectable } from '@angular/core';
-import { FuseNavigation } from '../../../navigation.model';
+import { NavigationModel } from '../../../navigation.model';
 
 @Injectable()
 export class FuseNavigationService
 {
     onNavCollapseToggled = new EventEmitter<any>();
-    navigation: FuseNavigation;
+    navigationModel: NavigationModel;
     flatNavigation: any[] = [];
 
     constructor()
     {
-        this.navigation = new FuseNavigation();
+        this.navigationModel = new NavigationModel();
     }
 
     /**
-     * Get navigation array
+     * Get navigation model
      * @returns {any[]}
      */
-    getNavigation(item)
+    getNavigationModel()
     {
-        return this.navigation[item];
+        return this.navigationModel.model;
     }
 
     /**
@@ -31,7 +31,7 @@ export class FuseNavigationService
     {
         if ( !navigationItems )
         {
-            navigationItems = this.navigation;
+            navigationItems = this.navigationModel;
         }
 
         for ( const navItem of navigationItems )
diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
index ce5449a3..2c3e9647 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
@@ -5,7 +5,7 @@
 </a>
 <div class="children" [@slideInOut]="isOpen">
     <ng-container *ngFor="let item of item.children">
-        <fuse-nav-vertical-item *ngIf="item.type=='nav-item'" [item]="item"></fuse-nav-vertical-item>
-        <fuse-nav-vertical-collapse *ngIf="item.type=='nav-collapse'" [item]="item"></fuse-nav-vertical-collapse>
+        <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
+        <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
     </ng-container>
 </div>
diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
index a32e0c9a..6abcc630 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -15,7 +15,10 @@ export class FuseNavVerticalCollapseComponent implements OnInit
     @HostBinding('class') classes = 'nav-collapse nav-item';
     @HostBinding('class.open') public isOpen = false;
 
-    constructor(private navigationService: FuseNavigationService, private router: Router)
+    constructor(
+        private navigationService: FuseNavigationService,
+        private router: Router
+    )
     {
         // Listen for route changes
         router.events.subscribe(
@@ -49,6 +52,13 @@ export class FuseNavVerticalCollapseComponent implements OnInit
                             return;
                         }
 
+                        // Check if the url can be found in
+                        // one of the children of this item
+                        if ( this.isUrlInChildren(this.item, this.router.url) )
+                        {
+                            return;
+                        }
+
                         // If the clicked item is not this item, collapse...
                         if ( this.item !== clickedItem )
                         {
diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
new file mode 100644
index 00000000..3fd40abf
--- /dev/null
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
@@ -0,0 +1,10 @@
+<div class="group-title">
+    <span class="hint-text">{{ item.title }}</span>
+</div>
+<div class="group-items">
+    <ng-container *ngFor="let item of item.children">
+        <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
+        <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
+        <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
+    </ng-container>
+</div>
\ No newline at end of file
diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss
new file mode 100644
index 00000000..7021a70f
--- /dev/null
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss
@@ -0,0 +1,23 @@
+:host {
+
+    .folded:not(.folded-open) & {
+
+        > .group-title {
+            align-items: center;
+
+            > span {
+                opacity: 0;
+                transition: opacity 200ms ease;
+            }
+
+            &:before {
+                content: '';
+                display: block;
+                position: absolute;
+                min-width: 1.6rem;
+                border-top: 2px solid;
+                opacity: 0.2;
+            }
+        }
+    }
+}
diff --git a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts
new file mode 100644
index 00000000..f429b5d1
--- /dev/null
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts
@@ -0,0 +1,21 @@
+import { Component, HostBinding, Input, OnInit } from '@angular/core';
+
+@Component({
+    selector   : 'fuse-nav-vertical-group',
+    templateUrl: './nav-vertical-group.component.html',
+    styleUrls  : ['./nav-vertical-group.component.scss']
+})
+export class FuseNavVerticalGroupComponent implements OnInit
+{
+    @HostBinding('class') classes = 'nav-group';
+    @Input() item: any;
+
+    constructor()
+    {
+    }
+
+    ngOnInit()
+    {
+    }
+
+}
diff --git a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.html b/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.html
deleted file mode 100644
index 208267c6..00000000
--- a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="hint-text">{{ item.title }}</span>
diff --git a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.scss b/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.scss
deleted file mode 100644
index 53ab5b7f..00000000
--- a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-
-:host {
-
-    .folded:not(.folded-open) & {
-
-        &:before {
-            content: '';
-            display: block;
-            position: absolute;
-            min-width: 1.6rem;
-            border-top: 2px solid;
-            opacity: 0.2;
-        }
-
-        > span {
-            opacity: 0;
-            transition: opacity 200ms ease;
-        }
-    }
-}
diff --git a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.ts b/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.ts
deleted file mode 100644
index 72a00643..00000000
--- a/src/app/core/components/navigation/vertical/nav-subheader/nav-vertical-subheader.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, HostBinding, Input, OnInit } from '@angular/core';
-
-@Component({
-    selector   : 'fuse-nav-vertical-subheader',
-    templateUrl: './nav-vertical-subheader.component.html',
-    styleUrls  : ['./nav-vertical-subheader.component.scss']
-})
-export class FuseNavVerticalSubheaderComponent implements OnInit
-{
-    @HostBinding('class') classes = 'nav-subheader';
-    @Input() item: any;
-
-    constructor()
-    {
-    }
-
-    ngOnInit()
-    {
-    }
-
-}
diff --git a/src/app/core/scss/partials/_navigation.scss b/src/app/core/scss/partials/_navigation.scss
index f003e88e..0c8e8607 100644
--- a/src/app/core/scss/partials/_navigation.scss
+++ b/src/app/core/scss/partials/_navigation.scss
@@ -11,6 +11,21 @@
         white-space: nowrap;
     }
 
+    .nav-group {
+
+        > .group-title {
+            position: relative;
+            display: flex;
+            align-items: center;
+            height: 48px;
+            font-weight: 500;
+            padding-left: 24px;
+            margin-top: 8px;
+            font-size: 12px;
+            white-space: nowrap;
+        }
+    }
+
     .nav-item {
 
         .nav-link {
@@ -119,6 +134,31 @@
         }
     }
 
+    > .nav-group {
+
+        > .group-items {
+
+            > .nav-collapse {
+                background: transparent;
+                transition: background 200ms ease-in-out;
+
+                &.open {
+                    background: rgba(0, 0, 0, 0.12);
+                }
+            }
+        }
+    }
+
+    &.vertical {
+
+        .nav-group {
+
+            .group-title {
+                text-transform: uppercase;
+            }
+        }
+    }
+
     &.horizontal {
         display: flex;
         flex-direction: row;
diff --git a/src/app/navigation.model.ts b/src/app/navigation.model.ts
index 25a1920e..260f00e9 100644
--- a/src/app/navigation.model.ts
+++ b/src/app/navigation.model.ts
@@ -1,415 +1,22 @@
-export class FuseNavigation
+export class NavigationModel
 {
-    public verticalNavItems: any[];
-    public horizontalNavItems: any[];
+    model: any[];
 
     constructor()
     {
-        this.verticalNavItems = [
-            {
-                'title': 'APPS',
-                'type' : 'subheader'
-            },
-            {
-                'title'   : 'Dashboards',
-                'type'    : 'nav-collapse',
-                'icon'    : 'dashboard',
-                'children': [
-                    {
-                        'type' : 'nav-item',
-                        'title': 'Project',
-                        'url'  : '/apps/dashboards/project'
-                    }
-                ]
-            },
-            {
-                'title': 'Calendar',
-                'type' : 'nav-item',
-                'icon' : 'today',
-                'url'  : '/apps/calendar'
-            },
-            {
-                'title': 'Mail',
-                'type' : 'nav-item',
-                'icon' : 'email',
-                'url'  : '/apps/mail',
-                'badge': {
-                    'title': 25,
-                    'bg'   : '#F44336',
-                    'fg'   : '#FFFFFF'
-                }
-            },
-            {
-                'title': 'Chat',
-                'type' : 'nav-item',
-                'icon' : 'chat',
-                'url'  : '/apps/chat',
-                'badge': {
-                    'title': 13,
-                    'bg'   : '#09d261',
-                    'fg'   : '#FFFFFF'
-                }
-            },
-            {
-                'title': 'File Manager',
-                'type' : 'nav-item',
-                'icon' : 'folder',
-                'url'  : '/apps/file-manager'
-            },
-            {
-                'title': 'Contacts',
-                'type' : 'nav-item',
-                'icon' : 'account_box',
-                'url'  : '/apps/contacts'
-            },
-            {
-                'title': 'To-Do',
-                'type' : 'nav-item',
-                'icon' : 'check_box',
-                'url'  : '/apps/todo',
-                'badge': {
-                    'title': 3,
-                    'bg'   : '#FF6F00',
-                    'fg'   : '#FFFFFF'
-                }
-            },
-            {
-                'title': 'Scrumboard',
-                'type' : 'nav-item',
-                'icon' : 'assessment',
-                'url'  : '/apps/scrumboard'
-            },
-            {
-                'title': 'PAGES',
-                'type' : 'subheader'
-            },
-            {
-                'title'   : 'Authentication',
-                'type'    : 'nav-collapse',
-                'icon'    : 'lock',
-                'children': [
-                    {
-                        'title': 'Login',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/login'
-                    },
-                    {
-                        'title': 'Login v2',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/login-2'
-                    },
-                    {
-                        'title': 'Register',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/register'
-                    },
-                    {
-                        'title': 'Register v2',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/register-2'
-                    },
-                    {
-                        'title': 'Forgot Password',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/forgot-password'
-                    },
-                    {
-                        'title': 'Reset Password',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/reset-password'
-                    },
-                    {
-                        'title': 'Lock Screen',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/auth/lock'
-                    }
-                ]
-            },
-            {
-                'title': 'Coming Soon',
-                'type' : 'nav-item',
-                'icon' : 'alarm',
-                'url'  : '/pages/coming-soon'
-            },
-            {
-                'title'   : 'Errors',
-                'type'    : 'nav-collapse',
-                'icon'    : 'error',
-                'children': [
-                    {
-                        'title': '404',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/errors/error-404'
-                    },
-                    {
-                        'title': '500',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/errors/error-500'
-                    }
-                ]
-            },
-            {
-                'title'   : 'Invoice',
-                'type'    : 'nav-collapse',
-                'icon'    : 'receipt',
-                'children': [
-                    {
-                        'title': 'Modern',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/invoices/modern'
-                    },
-                    {
-                        'title': 'Compact',
-                        'type' : 'nav-item',
-                        'url'  : '/pages/invoices/compact'
-                    }
-                ]
-            },
-            {
-                'title': 'Maintenance',
-                'type' : 'nav-item',
-                'icon' : 'build',
-                'url'  : '/pages/maintenance'
-            },
-            {
-                'title': 'Profile',
-                'type' : 'nav-item',
-                'icon' : 'person',
-                'url'  : '/pages/profile'
-            },
-            {
-                'title': 'Search',
-                'type' : 'nav-item',
-                'icon' : 'search',
-                'url'  : '/pages/search'
-            },
-            {
-                'title': 'USER INTERFACE',
-                'type' : 'subheader'
-            },
-            {
-                'title': 'Forms',
-                'type' : 'nav-item',
-                'icon' : 'web_asset',
-                'url'  : '/ui/forms'
-            },
-            {
-                'title': 'Icons',
-                'type' : 'nav-item',
-                'icon' : 'photo',
-                'url'  : '/ui/icons'
-            },
-            {
-                'title': 'Typography',
-                'type' : 'nav-item',
-                'icon' : 'text_fields',
-                'url'  : '/ui/typography'
-            },
-            {
-                'title': 'Helper Classes',
-                'type' : 'nav-item',
-                'icon' : 'help',
-                'url'  : '/ui/helper-classes'
-            },
-            {
-                'title'   : 'Page Layouts',
-                'type'    : 'nav-collapse',
-                'icon'    : 'view_quilt',
-                'children': [
-                    {
-                        'title'   : 'Carded',
-                        'type'    : 'nav-collapse',
-                        'children': [
-                            {
-                                'title': 'Full Width',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/full-width'
-                            },
-                            {
-                                'title': 'Full Width 2',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/full-width-2'
-                            },
-                            {
-                                'title': 'Left Sidenav',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/left-sidenav'
-                            },
-                            {
-                                'title': 'Left Sidenav 2',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/left-sidenav-2'
-                            },
-                            {
-                                'title': 'Right Sidenav',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/right-sidenav'
-                            },
-                            {
-                                'title': 'Right Sidenav 2',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/carded/right-sidenav-2'
-                            }
-                        ]
-                    },
-                    {
-                        'title'   : 'Simple',
-                        'type'    : 'nav-collapse',
-                        'children': [
-                            {
-                                'title': 'Full Width',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/full-width'
-                            },
-                            {
-                                'title': 'Left Sidenav',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/left-sidenav'
-                            },
-                            {
-                                'title': 'Left Sidenav 2',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/left-sidenav-2'
-                            },
-                            {
-                                'title': 'Left Sidenav 3',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/left-sidenav-3'
-                            },
-                            {
-                                'title': 'Right Sidenav',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/right-sidenav'
-                            },
-                            {
-                                'title': 'Right Sidenav 2',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/right-sidenav-2'
-                            },
-                            {
-                                'title': 'Right Sidenav 3',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/right-sidenav-3'
-                            },
-                            {
-                                'title': 'Tabbed',
-                                'type' : 'nav-item',
-                                'url'  : '/ui/page-layouts/simple/tabbed'
-                            }
-                        ]
-                    },
-                    {
-                        'title': 'Blank',
-                        'type' : 'nav-item',
-                        'url'  : '/ui/page-layouts/blank'
-                    }
-                ]
-            },
-            {
-                'title': 'Colors',
-                'type' : 'nav-item',
-                'icon' : 'color_lens',
-                'url'  : '/ui/colors'
-            },
-            {
-                'title': 'SERVICES',
-                'type' : 'subheader'
-            },
-            {
-                'title': 'Config',
-                'type' : 'nav-item',
-                'icon' : 'settings',
-                'url'  : '/services/config'
-            },
-            {
-                'title': 'Splash Screen',
-                'type' : 'nav-item',
-                'icon' : 'settings',
-                'url'  : '/services/splash-screen'
-            },
-            {
-                'title': 'COMPONENTS',
-                'type' : 'subheader'
-            },
-            {
-                'title': 'Countdown',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/countdown'
-            },
-            {
-                'title': 'Highlight.js',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/highlightjs'
-            },
-            {
-                'title': 'Material Color Picker',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/material-color-picker'
-            },
-            {
-                'title': 'Navigation',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/navigation'
-            },
-            {
-                'title': 'Price Tables',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/price-tables'
-            },
-            {
-                'title': 'Search Bar',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/search-bar'
-            },
-            {
-                'title': 'Shortcuts',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/shortcuts'
-            },
-            {
-                'title': 'Widget',
-                'type' : 'nav-item',
-                'icon' : 'settings_input_component',
-                'url'  : '/components/widget'
-            },
-            {
-                'title': '3RD PARTY COMPONENTS',
-                'type' : 'subheader'
-            },
-            {
-                'title'   : 'Datatables',
-                'type'    : 'nav-collapse',
-                'icon'    : 'border_all',
-                'children': [
-                    {
-                        'title': 'ngx-datatable',
-                        'type' : 'nav-item',
-                        'url'  : '/components-third-party/datatables/ngx-datatable'
-                    }
-                ]
-            }
-        ];
-
-        this.horizontalNavItems = [
+        this.model = [
             {
                 'title'   : 'Applications',
+                'type'    : 'group',
                 'icon'    : 'apps',
-                'type'    : 'nav-collapse',
                 'children': [
                     {
                         'title'   : 'Dashboards',
-                        'type'    : 'nav-collapse',
+                        'type'    : 'collapse',
                         'icon'    : 'dashboard',
                         'children': [
                             {
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'title': 'Project',
                                 'url'  : '/apps/dashboards/project'
                             }
@@ -417,13 +24,13 @@ export class FuseNavigation
                     },
                     {
                         'title': 'Calendar',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'today',
                         'url'  : '/apps/calendar'
                     },
                     {
                         'title': 'Mail',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'email',
                         'url'  : '/apps/mail',
                         'badge': {
@@ -434,7 +41,7 @@ export class FuseNavigation
                     },
                     {
                         'title': 'Chat',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'chat',
                         'url'  : '/apps/chat',
                         'badge': {
@@ -445,19 +52,19 @@ export class FuseNavigation
                     },
                     {
                         'title': 'File Manager',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'folder',
                         'url'  : '/apps/file-manager'
                     },
                     {
                         'title': 'Contacts',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'account_box',
                         'url'  : '/apps/contacts'
                     },
                     {
                         'title': 'To-Do',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'check_box',
                         'url'  : '/apps/todo',
                         'badge': {
@@ -468,7 +75,7 @@ export class FuseNavigation
                     },
                     {
                         'title': 'Scrumboard',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'assessment',
                         'url'  : '/apps/scrumboard'
                     }
@@ -476,106 +83,106 @@ export class FuseNavigation
             },
             {
                 'title'   : 'Pages',
+                'type'    : 'group',
                 'icon'    : 'pages',
-                'type'    : 'nav-collapse',
                 'children': [
                     {
                         'title'   : 'Authentication',
-                        'type'    : 'nav-collapse',
+                        'type'    : 'collapse',
                         'icon'    : 'lock',
                         'children': [
                             {
                                 'title': 'Login',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/login'
                             },
                             {
                                 'title': 'Login v2',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/login-2'
                             },
                             {
                                 'title': 'Register',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/register'
                             },
                             {
                                 'title': 'Register v2',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/register-2'
                             },
                             {
                                 'title': 'Forgot Password',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/forgot-password'
                             },
                             {
                                 'title': 'Reset Password',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/reset-password'
                             },
                             {
                                 'title': 'Lock Screen',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/auth/lock'
                             }
                         ]
                     },
                     {
                         'title': 'Coming Soon',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'alarm',
                         'url'  : '/pages/coming-soon'
                     },
                     {
                         'title'   : 'Errors',
-                        'type'    : 'nav-collapse',
+                        'type'    : 'collapse',
                         'icon'    : 'error',
                         'children': [
                             {
                                 'title': '404',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/errors/error-404'
                             },
                             {
                                 'title': '500',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/errors/error-500'
                             }
                         ]
                     },
                     {
                         'title'   : 'Invoice',
-                        'type'    : 'nav-collapse',
+                        'type'    : 'collapse',
                         'icon'    : 'receipt',
                         'children': [
                             {
                                 'title': 'Modern',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/invoices/modern'
                             },
                             {
                                 'title': 'Compact',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/pages/invoices/compact'
                             }
                         ]
                     },
                     {
                         'title': 'Maintenance',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'build',
                         'url'  : '/pages/maintenance'
                     },
                     {
                         'title': 'Profile',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'person',
                         'url'  : '/pages/profile'
                     },
                     {
                         'title': 'Search',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'search',
                         'url'  : '/pages/search'
                     }
@@ -583,130 +190,130 @@ export class FuseNavigation
             },
             {
                 'title'   : 'User Interface',
+                'type'    : 'group',
                 'icon'    : 'web',
-                'type'    : 'nav-collapse',
                 'children': [
                     {
                         'title': 'Forms',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'web_asset',
                         'url'  : '/ui/forms'
                     },
                     {
                         'title': 'Icons',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'photo',
                         'url'  : '/ui/icons'
                     },
                     {
                         'title': 'Typography',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'text_fields',
                         'url'  : '/ui/typography'
                     },
                     {
                         'title': 'Helper Classes',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'help',
                         'url'  : '/ui/helper-classes'
                     },
                     {
                         'title'   : 'Page Layouts',
-                        'type'    : 'nav-collapse',
+                        'type'    : 'collapse',
                         'icon'    : 'view_quilt',
                         'children': [
                             {
                                 'title'   : 'Carded',
-                                'type'    : 'nav-collapse',
+                                'type'    : 'collapse',
                                 'children': [
                                     {
                                         'title': 'Full Width',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/full-width'
                                     },
                                     {
                                         'title': 'Full Width 2',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/full-width-2'
                                     },
                                     {
                                         'title': 'Left Sidenav',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/left-sidenav'
                                     },
                                     {
                                         'title': 'Left Sidenav 2',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/left-sidenav-2'
                                     },
                                     {
                                         'title': 'Right Sidenav',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/right-sidenav'
                                     },
                                     {
                                         'title': 'Right Sidenav 2',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/carded/right-sidenav-2'
                                     }
                                 ]
                             },
                             {
                                 'title'   : 'Simple',
-                                'type'    : 'nav-collapse',
+                                'type'    : 'collapse',
                                 'children': [
                                     {
                                         'title': 'Full Width',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/full-width'
                                     },
                                     {
                                         'title': 'Left Sidenav',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/left-sidenav'
                                     },
                                     {
                                         'title': 'Left Sidenav 2',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/left-sidenav-2'
                                     },
                                     {
                                         'title': 'Left Sidenav 3',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/left-sidenav-3'
                                     },
                                     {
                                         'title': 'Right Sidenav',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/right-sidenav'
                                     },
                                     {
                                         'title': 'Right Sidenav 2',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/right-sidenav-2'
                                     },
                                     {
                                         'title': 'Right Sidenav 3',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/right-sidenav-3'
                                     },
                                     {
                                         'title': 'Tabbed',
-                                        'type' : 'nav-item',
+                                        'type' : 'item',
                                         'url'  : '/ui/page-layouts/simple/tabbed'
                                     }
                                 ]
                             },
                             {
                                 'title': 'Blank',
-                                'type' : 'nav-item',
+                                'type' : 'item',
                                 'url'  : '/ui/page-layouts/blank'
                             }
                         ]
                     },
                     {
                         'title': 'Colors',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'color_lens',
                         'url'  : '/ui/colors'
                     }
@@ -714,18 +321,18 @@ export class FuseNavigation
             },
             {
                 'title'   : 'Services',
+                'type'    : 'group',
                 'icon'    : 'settings',
-                'type'    : 'nav-collapse',
                 'children': [
                     {
                         'title': 'Config',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings',
                         'url'  : '/services/config'
                     },
                     {
                         'title': 'Splash Screen',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings',
                         'url'  : '/services/splash-screen'
                     }
@@ -733,73 +340,73 @@ export class FuseNavigation
             },
             {
                 'title'   : 'Components',
+                'type'    : 'group',
                 'icon'    : 'settings_input_component',
-                'type'    : 'nav-collapse',
                 'children': [
                     {
                         'title': 'Countdown',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/countdown'
                     },
                     {
                         'title': 'Highlight.js',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/highlightjs'
                     },
                     {
                         'title': 'Material Color Picker',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/material-color-picker'
                     },
                     {
                         'title': 'Navigation',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/navigation'
                     },
                     {
                         'title': 'Price Tables',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/price-tables'
                     },
                     {
                         'title': 'Search Bar',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/search-bar'
                     },
                     {
                         'title': 'Shortcuts',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/shortcuts'
                     },
                     {
                         'title': 'Widget',
-                        'type' : 'nav-item',
+                        'type' : 'item',
                         'icon' : 'settings_input_component',
                         'url'  : '/components/widget'
-                    },
+                    }
+                ]
+            },
+            {
+                'title'   : '3rd Party components',
+                'type'    : 'group',
+                'icon'    : 'settings_input_component',
+                'children': [
                     {
-                        'title'   : '3rd Party components',
-                        'icon'    : 'settings_input_component',
-                        'type'    : 'nav-collapse',
+                        'title'   : 'Datatables',
+                        'type'    : 'collapse',
+                        'icon'    : 'border_all',
                         'children': [
                             {
-                                'title'   : 'Datatables',
-                                'type'    : 'nav-collapse',
-                                'icon'    : 'border_all',
-                                'children': [
-                                    {
-                                        'title': 'ngx-datatable',
-                                        'type' : 'nav-item',
-                                        'url'  : '/components-third-party/datatables/ngx-datatable'
-                                    }
-                                ]
+                                'title': 'ngx-datatable',
+                                'type' : 'item',
+                                'url'  : '/components-third-party/datatables/ngx-datatable'
                             }
                         ]
                     }

From 05575d3f82e298c58ec1ba453bf44503f7850260 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 14:08:37 +0300
Subject: [PATCH 13/27] Fixed: Navigation model must be public

---
 src/app/navigation.model.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/navigation.model.ts b/src/app/navigation.model.ts
index 260f00e9..9c1210fc 100644
--- a/src/app/navigation.model.ts
+++ b/src/app/navigation.model.ts
@@ -1,6 +1,6 @@
 export class NavigationModel
 {
-    model: any[];
+    public model: any[];
 
     constructor()
     {

From 9cb8c0c96b0267973fc451e15510db9bd982ab32 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 14:56:08 +0300
Subject: [PATCH 14/27] Added a way to swap navigation model on the fly Moved
 the navigation service to the app.module since we need it to be a singleton
 at all times

---
 src/app/app.module.ts                         |  4 +++-
 .../navigation/navigation.component.ts        | 21 ++++++++++++++----
 .../navigation/navigation.service.ts          | 22 +++++++++++++++++--
 src/app/core/modules/shared.module.ts         |  2 --
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 30f8f928..3a0d4fbb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -16,6 +16,7 @@ import { UIModule } from './main/content/ui/ui.module';
 import { ComponentsModule } from './main/content/components/components.module';
 import { FuseSplashScreenService } from './core/services/splash-screen.service';
 import { FuseConfigService } from './core/services/config.service';
+import { FuseNavigationService } from './core/components/navigation/navigation.service';
 import { ComponentsThirdPartyModule } from './main/content/components-third-party/components-third-party.module';
 import { ServicesModule } from './main/content/services/services.module';
 
@@ -80,7 +81,8 @@ const appRoutes: Routes = [
     ],
     providers   : [
         FuseSplashScreenService,
-        FuseConfigService
+        FuseConfigService,
+        FuseNavigationService
     ],
     bootstrap   : [
         AppComponent
diff --git a/src/app/core/components/navigation/navigation.component.ts b/src/app/core/components/navigation/navigation.component.ts
index 20f71ab7..837363dc 100644
--- a/src/app/core/components/navigation/navigation.component.ts
+++ b/src/app/core/components/navigation/navigation.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { Component, Input, OnDestroy, ViewEncapsulation } from '@angular/core';
 import { FuseNavigationService } from './navigation.service';
+import { Subscription } from 'rxjs/Subscription';
 
 @Component({
     selector     : 'fuse-navigation',
@@ -7,15 +8,27 @@ import { FuseNavigationService } from './navigation.service';
     styleUrls    : ['./navigation.component.scss'],
     encapsulation: ViewEncapsulation.None
 })
-export class FuseNavigationComponent
+export class FuseNavigationComponent implements OnDestroy
 {
     navigationModel: any[];
+    navigationModelChangeSubscription: Subscription;
 
     @Input('layout') layout = 'vertical';
 
-    constructor(private navigationService: FuseNavigationService)
+    constructor(private fuseNavigationService: FuseNavigationService)
     {
-        this.navigationModel = navigationService.getNavigationModel();
+        this.navigationModelChangeSubscription =
+            this.fuseNavigationService.onNavigationModelChange
+                .subscribe((navigationModel) => {
+                    console.warn(navigationModel);
+                    this.navigationModel = navigationModel;
+                });
+    }
+
+    ngOnDestroy()
+    {
+        console.warn('destroyed');
+        this.navigationModelChangeSubscription.unsubscribe();
     }
 
 }
diff --git a/src/app/core/components/navigation/navigation.service.ts b/src/app/core/components/navigation/navigation.service.ts
index 4f9b6cc7..8a8e06d0 100644
--- a/src/app/core/components/navigation/navigation.service.ts
+++ b/src/app/core/components/navigation/navigation.service.ts
@@ -1,16 +1,19 @@
 import { EventEmitter, Injectable } from '@angular/core';
 import { NavigationModel } from '../../../navigation.model';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 @Injectable()
 export class FuseNavigationService
 {
     onNavCollapseToggled = new EventEmitter<any>();
+    onNavigationModelChange: BehaviorSubject<any> = new BehaviorSubject({});
     navigationModel: NavigationModel;
     flatNavigation: any[] = [];
 
     constructor()
     {
         this.navigationModel = new NavigationModel();
+        this.onNavigationModelChange.next(this.navigationModel.model);
     }
 
     /**
@@ -22,6 +25,21 @@ export class FuseNavigationService
         return this.navigationModel.model;
     }
 
+    /**
+     * Set the navigation model
+     * @param model
+     */
+    setNavigationModel(model)
+    {
+        // console.log(model);
+
+        this.navigationModel = model;
+
+        console.log(this.navigationModel);
+
+        this.onNavigationModelChange.next(this.navigationModel.model);
+    }
+
     /**
      * Get flattened navigation array
      * @param navigationItems
@@ -41,7 +59,7 @@ export class FuseNavigationService
                 continue;
             }
 
-            if ( navItem.type === 'nav-item' )
+            if ( navItem.type === 'item' )
             {
                 this.flatNavigation.push({
                     title: navItem.title,
@@ -53,7 +71,7 @@ export class FuseNavigationService
                 continue;
             }
 
-            if ( navItem.type === 'nav-collapse' )
+            if ( navItem.type === 'collapse' || navItem.type === 'group' )
             {
                 this.getFlatNavigation(navItem.children);
             }
diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts
index 93885da7..8e83073b 100644
--- a/src/app/core/modules/shared.module.ts
+++ b/src/app/core/modules/shared.module.ts
@@ -12,7 +12,6 @@ import { FuseMdSidenavHelperDirective, FuseMdSidenavTogglerDirective } from '../
 import { FusePipesModule } from '../pipes/pipes.module';
 import { FuseConfirmDialogComponent } from '../components/confirm-dialog/confirm-dialog.component';
 import { FuseCountdownComponent } from '../components/countdown/countdown.component';
-import { FuseNavigationService } from '../components/navigation/navigation.service';
 import { FuseMatchMedia } from '../services/match-media.service';
 import { FuseNavbarVerticalService } from '../../main/navbar/vertical/navbar-vertical.service';
 import { FuseMdSidenavHelperService } from '../directives/md-sidenav-helper/md-sidenav-helper.service';
@@ -70,7 +69,6 @@ import { CookieService } from 'ngx-cookie-service';
     ],
     providers      : [
         CookieService,
-        FuseNavigationService,
         FuseMatchMedia,
         FuseNavbarVerticalService,
         FuseMdSidenavHelperService

From f688a58656f4f1dcf4280e743658eb66df74badf Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Thu, 21 Sep 2017 15:05:18 +0300
Subject: [PATCH 15/27] Animations enhanced for all apps and some pages.

---
 package-lock.json                             | 918 +-----------------
 src/app/core/animations.ts                    | 161 +--
 .../material-color-picker.component.ts        |   4 +-
 .../nav-horizontal-collapse.component.ts      |   4 +-
 .../nav-vertical-collapse.component.ts        |   4 +-
 .../theme-options.component.scss              |   5 +
 .../theme-options/theme-options.component.ts  |  15 +-
 .../apps/calendar/calendar.component.html     |  13 +-
 .../apps/calendar/calendar.component.ts       |  13 +-
 .../chat/chat-start/chat-start.component.html |   7 +-
 .../chat/chat-start/chat-start.component.ts   |   4 +-
 .../main/content/apps/chat/chat.component.ts  |   4 +-
 .../sidenavs/left/chats/chats.component.html  |   8 +-
 .../sidenavs/left/chats/chats.component.ts    |   4 +-
 .../apps/chat/sidenavs/left/left.component.ts |   4 +-
 .../chat/sidenavs/right/right.component.ts    |   4 +-
 .../contact-list/contact-list.component.html  |  11 +-
 .../contact-list/contact-list.component.ts    |   4 +-
 .../apps/contacts/contacts.component.html     |   6 +-
 .../apps/contacts/contacts.component.ts       |   4 +-
 .../dashboards/project/project.component.html |  41 +-
 .../dashboards/project/project.component.scss |   9 +
 .../dashboards/project/project.component.ts   |   4 +-
 .../file-list/file-list.component.html        |   6 +-
 .../file-list/file-list.component.ts          |   4 +-
 .../file-manager/file-manager.component.html  |   6 +-
 .../file-manager/file-manager.component.ts    |   5 +-
 .../sidenavs/details/details.component.html   |   3 +-
 .../sidenavs/details/details.component.ts     |   4 +-
 .../mail-details/mail-details.component.html  |   4 +-
 .../mail-details/mail-details.component.ts    |   4 +-
 .../mail/mail-list/mail-list.component.html   |   9 +-
 .../mail/mail-list/mail-list.component.scss   |   7 +
 .../mail/mail-list/mail-list.component.ts     |   4 +-
 .../sidenavs/main/main-sidenav.component.html |   8 +-
 .../sidenavs/main/main-sidenav.component.ts   |   4 +-
 .../scrumboard/board/board.component.html     |  14 +-
 .../scrumboard/board/board.component.scss     |   2 +-
 .../apps/scrumboard/board/board.component.ts  |   4 +-
 .../label-selector.component.ts               |   4 +-
 .../sidenavs/settings/settings.component.ts   |   5 +-
 .../apps/scrumboard/scrumboard.component.html |  11 +-
 .../apps/scrumboard/scrumboard.component.ts   |   4 +-
 .../sidenavs/main/main-sidenav.component.html |   8 +-
 .../sidenavs/main/main-sidenav.component.ts   |   4 +-
 .../todo-details/todo-details.component.html  |   4 +-
 .../todo-details/todo-details.component.ts    |   4 +-
 .../todo/todo-list/todo-list.component.html   |   5 +-
 .../todo/todo-list/todo-list.component.ts     |   4 +-
 .../main/content/apps/todo/todo.component.ts  |   6 +-
 src/app/main/content/content.component.ts     |  10 +-
 .../forgot-password.component.html            |   2 +-
 .../forgot-password.component.ts              |   4 +-
 .../authentication/lock/lock.component.html   |   2 +-
 .../authentication/lock/lock.component.ts     |   4 +-
 .../login-2/login-2.component.html            |   8 +-
 .../login-2/login-2.component.ts              |   7 +-
 .../authentication/login/login.component.html |   2 +-
 .../authentication/login/login.component.ts   |   4 +-
 .../register-2/register-2.component.html      |   8 +-
 .../register-2/register-2.component.ts        |   7 +-
 .../register/register.component.html          |   2 +-
 .../register/register.component.ts            |   7 +-
 .../reset-password.component.html             |   3 +-
 .../reset-password.component.ts               |   4 +-
 .../coming-soon/coming-soon.component.html    |   2 +-
 .../coming-soon/coming-soon.component.ts      |   4 +-
 .../maintenance/maintenance.component.html    |   2 +-
 .../maintenance/maintenance.component.ts      |   6 +-
 .../pages/profile/profile.component.html      |   9 +-
 .../pages/profile/profile.component.scss      |  67 +-
 .../pages/profile/profile.component.ts        |  11 +-
 .../profile/tabs/about/about.component.html   |  21 +-
 .../profile/tabs/about/about.component.ts     |   4 +-
 .../photos-videos.component.html              |   6 +-
 .../photos-videos/photos-videos.component.ts  |   4 +-
 .../tabs/timeline/timeline.component.html     |  13 +-
 .../tabs/timeline/timeline.component.ts       |   4 +-
 78 files changed, 450 insertions(+), 1175 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80643c94..946b61a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1281,7 +1281,6 @@
       "requires": {
         "anymatch": "1.3.0",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -3306,905 +3305,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.6.2",
-        "node-pre-gyp": "0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -8728,6 +7828,15 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -8755,15 +7864,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/src/app/core/animations.ts b/src/app/core/animations.ts
index 611dd1f1..193b9e10 100644
--- a/src/app/core/animations.ts
+++ b/src/app/core/animations.ts
@@ -1,8 +1,56 @@
-import { sequence, trigger, animate, style, group, query, transition, animateChild, state } from '@angular/animations';
+import { sequence, trigger, animate, style, group, query, transition, animateChild, state, animation, useAnimation, stagger } from '@angular/animations';
 
-export class Animations
-{
-    public static fadeInOut = trigger('fadeInOut', [
+const customAnimation = animation([
+    style({
+        opacity  : '{{opacity}}',
+        transform: 'scale({{scale}}) translate3d({{x}}, {{y}}, {{z}})'
+    }),
+    animate('{{duration}} {{delay}} cubic-bezier(0.0, 0.0, 0.2, 1)', style('*'))
+], {
+    params: {
+        duration: '200ms',
+        delay   : '0ms',
+        opacity : '0',
+        scale   : '1',
+        x       : '0',
+        y       : '0',
+        z       : '0'
+    }
+});
+
+export const fuseAnimations = [
+
+    trigger('animate', [transition('void => *', [useAnimation(customAnimation)])]),
+
+    trigger('animateStagger', [
+        state('50', style('*')),
+        state('100', style('*')),
+        state('200', style('*')),
+
+        transition('void => 50',
+            query('@*',
+                [
+                    stagger('50ms', [
+                        animateChild()
+                    ])
+                ])),
+        transition('void => 100',
+            query('@*',
+                [
+                    stagger('100ms', [
+                        animateChild()
+                    ])
+                ])),
+        transition('void => 200',
+            query('@*',
+                [
+                    stagger('200ms', [
+                        animateChild()
+                    ])
+                ]))
+    ]),
+
+    trigger('fadeInOut', [
         state('0', style({
             display: 'none',
             opacity: 0
@@ -13,9 +61,9 @@ export class Animations
         })),
         transition('1 => 0', animate('300ms ease-out')),
         transition('0 => 1', animate('300ms ease-in'))
-    ]);
+    ]),
 
-    public static slideInOut = trigger('slideInOut', [
+    trigger('slideInOut', [
         state('0', style({
             height : '0px',
             display: 'none'
@@ -26,9 +74,9 @@ export class Animations
         })),
         transition('1 => 0', animate('300ms ease-out')),
         transition('0 => 1', animate('300ms ease-in'))
-    ]);
+    ]),
 
-    public static slideInLeft = trigger('slideInLeft', [
+    trigger('slideInLeft', [
         state('void', style({
             transform: 'translateX(-100%)',
             display  : 'none'
@@ -39,9 +87,9 @@ export class Animations
         })),
         transition('void => *', animate('300ms')),
         transition('* => void', animate('300ms'))
-    ]);
+    ]),
 
-    public static slideInRight = trigger('slideInRight', [
+    trigger('slideInRight', [
         state('void', style({
             transform: 'translateX(100%)',
             display  : 'none'
@@ -52,9 +100,9 @@ export class Animations
         })),
         transition('void => *', animate('300ms')),
         transition('* => void', animate('300ms'))
-    ]);
+    ]),
 
-    public static slideInTop = trigger('slideInTop', [
+    trigger('slideInTop', [
         state('void', style({
             transform: 'translateY(-100%)',
             display  : 'none'
@@ -65,9 +113,9 @@ export class Animations
         })),
         transition('void => *', animate('300ms')),
         transition('* => void', animate('300ms'))
-    ]);
+    ]),
 
-    public static slideInBottom = trigger('slideInBottom', [
+    trigger('slideInBottom', [
         state('void',
             style({
                 transform: 'translateY(100%)',
@@ -79,9 +127,9 @@ export class Animations
         })),
         transition('void => *', animate('300ms')),
         transition('* => void', animate('300ms'))
-    ]);
+    ]),
 
-    public static routerTransitionLeft = trigger('routerTransitionLeft', [
+    trigger('routerTransitionLeft', [
 
         transition('* => *', [
             query('fuse-content > :enter, fuse-content > :leave', [
@@ -106,7 +154,7 @@ export class Animations
                             transform: 'translateX(0)',
                             opacity  : 1
                         }),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateX(-100%)',
                                 opacity  : 0
@@ -114,7 +162,7 @@ export class Animations
                     ], {optional: true}),
                     query('fuse-content > :enter', [
                         style({transform: 'translateX(100%)'}),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateX(0%)',
                                 opacity  : 1
@@ -125,9 +173,9 @@ export class Animations
                 query('fuse-content > :enter', animateChild(), {optional: true})
             ])
         ])
-    ]);
+    ]),
 
-    public static routerTransitionRight = trigger('routerTransitionRight', [
+    trigger('routerTransitionRight', [
 
         transition('* => *', [
             query('fuse-content > :enter, fuse-content > :leave', [
@@ -152,7 +200,7 @@ export class Animations
                             transform: 'translateX(0)',
                             opacity  : 1
                         }),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateX(100%)',
                                 opacity  : 0
@@ -160,7 +208,7 @@ export class Animations
                     ], {optional: true}),
                     query('fuse-content > :enter', [
                         style({transform: 'translateX(-100%)'}),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateX(0%)',
                                 opacity  : 1
@@ -171,9 +219,9 @@ export class Animations
                 query('fuse-content > :enter', animateChild(), {optional: true})
             ])
         ])
-    ]);
+    ]),
 
-    public static routerTransitionUp = trigger('routerTransitionUp', [
+    trigger('routerTransitionUp', [
 
         transition('* => *', [
             query('fuse-content > :enter, fuse-content > :leave', [
@@ -191,35 +239,33 @@ export class Animations
                     opacity  : 0
                 })
             ], {optional: true}),
-            sequence([
-                group([
-                    query('fuse-content > :leave', [
+            group([
+                query('fuse-content > :leave', [
+                    style({
+                        transform: 'translateY(0)',
+                        opacity  : 1
+                    }),
+                    animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                         style({
-                            transform: 'translateY(0)',
+                            transform: 'translateY(-100%)',
+                            opacity  : 0
+                        }))
+                ], {optional: true}),
+                query('fuse-content > :enter', [
+                    style({transform: 'translateY(100%)'}),
+                    animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
+                        style({
+                            transform: 'translateY(0%)',
                             opacity  : 1
-                        }),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
-                            style({
-                                transform: 'translateY(-100%)',
-                                opacity  : 0
-                            }))
-                    ], {optional: true}),
-                    query('fuse-content > :enter', [
-                        style({transform: 'translateY(100%)'}),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
-                            style({
-                                transform: 'translateY(0%)',
-                                opacity  : 1
-                            }))
-                    ], {optional: true})
-                ]),
-                query('fuse-content > :leave', animateChild(), {optional: true}),
-                query('fuse-content > :enter', animateChild(), {optional: true})
-            ])
+                        }))
+                ], {optional: true})
+            ]),
+            query('fuse-content > :leave', animateChild(), {optional: true}),
+            query('fuse-content > :enter', animateChild(), {optional: true})
         ])
-    ]);
+    ]),
 
-    public static routerTransitionDown = trigger('routerTransitionDown', [
+    trigger('routerTransitionDown', [
 
         transition('* => *', [
             query('fuse-content > :enter, fuse-content > :leave', [
@@ -244,7 +290,7 @@ export class Animations
                             transform: 'translateY(0)',
                             opacity  : 1
                         }),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateY(100%)',
                                 opacity  : 0
@@ -252,7 +298,7 @@ export class Animations
                     ], {optional: true}),
                     query('fuse-content > :enter', [
                         style({transform: 'translateY(-100%)'}),
-                        animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                        animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                             style({
                                 transform: 'translateY(0%)',
                                 opacity  : 1
@@ -263,9 +309,9 @@ export class Animations
                 query('fuse-content > :enter', animateChild(), {optional: true})
             ])
         ])
-    ]);
+    ]),
 
-    public static routerTransitionFade = trigger('routerTransitionFade', [
+    trigger('routerTransitionFade', [
 
         transition('* => *', group([
 
@@ -278,6 +324,7 @@ export class Animations
                     right   : 0
                 })
             ], {optional: true}),
+
             query('fuse-content > :enter', [
                 style({
                     opacity: 0
@@ -287,7 +334,7 @@ export class Animations
                 style({
                     opacity: 1
                 }),
-                animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                animate('300ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                     style({
                         opacity: 0
                     }))
@@ -296,7 +343,7 @@ export class Animations
                 style({
                     opacity: 0
                 }),
-                animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)',
+                animate('300ms cubic-bezier(0.0, 0.0, 0.2, 1)',
                     style({
                         opacity: 1
                     }))
@@ -304,5 +351,5 @@ export class Animations
             query('fuse-content > :enter', animateChild(), {optional: true}),
             query('fuse-content > :leave', animateChild(), {optional: true})
         ]))
-    ]);
-}
+    ])
+];
diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.ts b/src/app/core/components/material-color-picker/material-color-picker.component.ts
index 3010b448..786ce470 100644
--- a/src/app/core/components/material-color-picker/material-color-picker.component.ts
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.ts
@@ -1,12 +1,12 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { MatColors } from '../../matColors';
-import { Animations } from '../../animations';
+import { fuseAnimations } from '../../animations';
 
 @Component({
     selector     : 'fuse-material-color-picker',
     templateUrl  : './material-color-picker.component.html',
     styleUrls    : ['./material-color-picker.component.scss'],
-    animations   : [Animations.slideInLeft, Animations.slideInRight],
+    animations   : fuseAnimations,
     encapsulation: ViewEncapsulation.None
 })
 export class FuseMaterialColorPickerComponent implements OnInit, OnChanges
diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts
index 84954253..4fb2853a 100644
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostBinding, HostListener, Input, OnDestroy } from '@angular/core';
-import { Animations } from '../../../../animations';
+import { fuseAnimations } from '../../../../animations';
 import { FuseConfigService } from '../../../../services/config.service';
 import { Subscription } from 'rxjs/Subscription';
 
@@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription';
     selector   : 'fuse-nav-horizontal-collapse',
     templateUrl: './nav-horizontal-collapse.component.html',
     styleUrls  : ['./nav-horizontal-collapse.component.scss'],
-    animations : [Animations.slideInOut]
+    animations : fuseAnimations
 })
 export class FuseNavHorizontalCollapseComponent implements OnDestroy
 {
diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
index a32e0c9a..5585f1e5 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -1,13 +1,13 @@
 import { Component, HostBinding, Input, OnInit } from '@angular/core';
 import { FuseNavigationService } from '../../navigation.service';
 import { NavigationEnd, Router } from '@angular/router';
-import { Animations } from '../../../../animations';
+import { fuseAnimations } from '../../../../animations';
 
 @Component({
     selector   : 'fuse-nav-vertical-collapse',
     templateUrl: './nav-vertical-collapse.component.html',
     styleUrls  : ['./nav-vertical-collapse.component.scss'],
-    animations : [Animations.slideInOut]
+    animations : fuseAnimations
 })
 export class FuseNavVerticalCollapseComponent implements OnInit
 {
diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/app/core/components/theme-options/theme-options.component.scss
index e3cae6f3..f2670861 100644
--- a/src/app/core/components/theme-options/theme-options.component.scss
+++ b/src/app/core/components/theme-options/theme-options.component.scss
@@ -15,6 +15,10 @@
     right: 0;
     top: 160px;
 
+    &.bar-closed .theme-options-panel {
+        display: none;
+    }
+
     .theme-options-panel {
         position: absolute;
         right: 0;
@@ -82,4 +86,5 @@
             opacity: 1;
         }
     }
+
 }
diff --git a/src/app/core/components/theme-options/theme-options.component.ts b/src/app/core/components/theme-options/theme-options.component.ts
index c69966b7..15c6fbc7 100644
--- a/src/app/core/components/theme-options/theme-options.component.ts
+++ b/src/app/core/components/theme-options/theme-options.component.ts
@@ -1,14 +1,14 @@
-import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations';
 import { Subscription } from 'rxjs/Subscription';
 import { FuseConfigService } from '../../services/config.service';
-import { Animations } from '../../animations';
+import { fuseAnimations } from '../../animations';
 
 @Component({
     selector   : 'fuse-theme-options',
     templateUrl: './theme-options.component.html',
     styleUrls  : ['./theme-options.component.scss'],
-    animations : [Animations.fadeInOut]
+    animations : fuseAnimations
 })
 export class FuseThemeOptionsComponent implements OnInit, OnDestroy
 {
@@ -18,10 +18,11 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
 
     public player: AnimationPlayer;
     fuseSettings: any;
-    barClosed: boolean;
 
     onSettingsChanged: Subscription;
 
+    @HostBinding('class.bar-closed') barClosed: boolean;
+
     constructor(
         private animationBuilder: AnimationBuilder,
         private fuseConfig: FuseConfigService,
@@ -53,8 +54,6 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
 
     closeBar()
     {
-        this.barClosed = true;
-
         this.player =
             this.animationBuilder
                 .build([
@@ -63,6 +62,10 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
                 ]).create(this.panel.nativeElement);
 
         this.player.play();
+
+        this.player.onDone(() => {
+            this.barClosed = true;
+        });
     }
 
     openBar()
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index 47b1545b..6f7969e7 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,5 +1,4 @@
 <div id="calendar" class="page-layout simple fullwidth" fusePerfectScrollbar>
-
     <!-- HEADER -->
     <div class="header" [ngClass]="viewDate | date:'MMM'">
 
@@ -9,9 +8,9 @@
 
                 <div class="logo mb-16 mb-sm-0" fxLayout="row" fxLayoutAlign="start center">
 
-                    <md-icon class="logo-icon">today</md-icon>
+                    <md-icon class="logo-icon" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">today</md-icon>
 
-                    <span class="logo-text">Calendar</span>
+                    <span class="logo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">Calendar</span>
 
                 </div>
 
@@ -50,7 +49,8 @@
             <!-- / TOOLBAR -->
 
             <!-- HEADER BOTTOM -->
-            <div class="header-bottom" fxLayout="row" fxLayoutAlign="center center">
+            <div class="header-bottom" fxLayout="row" fxLayoutAlign="center center"
+                 *fuseIfOnDom [@animate]="{value:'*',params:{delay:'150ms'}}">
 
                 <button md-button class="mat-icon-button arrow"
                         mwlCalendarPreviousView
@@ -78,7 +78,8 @@
         </div>
 
         <!-- ADD EVENT BUTTON -->
-        <button md-fab class="add-event-button mat-warn" (click)="addEvent()" aria-label="Add event">
+        <button md-fab class="add-event-button mat-warn" (click)="addEvent()" aria-label="Add event"
+                *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">
             <md-icon>add</md-icon>
         </button>
         <!-- / ADD EVENT BUTTON -->
@@ -86,7 +87,7 @@
     <!-- / HEADER -->
 
     <!-- CONTENT -->
-    <div class="content" fusePerfectScrollbar>
+    <div class="content" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'50px'}}">
         <div [ngSwitch]="view">
             <mwl-calendar-month-view
                 *ngSwitchCase="'month'"
diff --git a/src/app/main/content/apps/calendar/calendar.component.ts b/src/app/main/content/apps/calendar/calendar.component.ts
index 067c0b0f..8c424350 100644
--- a/src/app/main/content/apps/calendar/calendar.component.ts
+++ b/src/app/main/content/apps/calendar/calendar.component.ts
@@ -1,5 +1,5 @@
 import { startOfDay, endOfDay, subDays, addDays, endOfMonth, isSameDay, isSameMonth, addHours } from 'date-fns';
-import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
 import { MdDialog, MdDialogRef } from '@angular/material';
 import { FuseCalendarEventFormDialogComponent } from './event-form/event-form.component';
@@ -13,13 +13,14 @@ import {
     CalendarMonthViewDay
 } from 'angular-calendar';
 import { FuseConfirmDialogComponent } from '../../../../core/components/confirm-dialog/confirm-dialog.component';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
-    selector       : 'fuse-calendar',
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    templateUrl    : './calendar.component.html',
-    styleUrls      : ['./calendar.component.scss'],
-    encapsulation  : ViewEncapsulation.None
+    selector     : 'fuse-calendar',
+    templateUrl  : './calendar.component.html',
+    styleUrls    : ['./calendar.component.scss'],
+    encapsulation: ViewEncapsulation.None,
+    animations   : fuseAnimations
 })
 export class FuseCalendarComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.html b/src/app/main/content/apps/chat/chat-start/chat-start.component.html
index f51a7779..7d7a5e46 100644
--- a/src/app/main/content/apps/chat/chat-start/chat-start.component.html
+++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.html
@@ -1,14 +1,15 @@
 <div fxFlex fxLayout="column" fxLayoutAlign="center center">
 
-    <div class="big-circle mat-elevation-z1" fxLayout="column" fxLayoutAlign="center center">
+    <div class="big-circle mat-elevation-z1 app-logo" fxLayout="column" fxLayoutAlign="center center"
+         *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">
 
         <md-icon class="s-64 s-md-128">chat</md-icon>
 
     </div>
 
-    <span class="app-title my-24">Chat App</span>
+    <span class="app-title my-24" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',y:'25px'}}">Chat App</span>
 
-    <span fxHide fxShow.gt-md class="app-message">Select contact to start the chat!..</span>
+    <span fxHide fxShow.gt-md class="app-message" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'50px'}}">Select contact to start the chat!..</span>
 
     <button md-raised-button fxHide.gt-md class="" fuseMdSidenavToggler="chat-left-sidenav">
         Select contact to start the chat!..
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts
index 4fe1e7b0..3cc6f8b8 100644
--- a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts
+++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts
@@ -1,9 +1,11 @@
 import { Component, OnInit } from '@angular/core';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-chat-start',
     templateUrl: './chat-start.component.html',
-    styleUrls  : ['./chat-start.component.scss']
+    styleUrls  : ['./chat-start.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseChatStartComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/chat/chat.component.ts b/src/app/main/content/apps/chat/chat.component.ts
index c7f5ee60..51cb1971 100644
--- a/src/app/main/content/apps/chat/chat.component.ts
+++ b/src/app/main/content/apps/chat/chat.component.ts
@@ -1,11 +1,13 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ChatService } from './chat.service';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector     : 'fuse-chat',
     templateUrl  : './chat.component.html',
     styleUrls    : ['./chat.component.scss'],
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    animations   : fuseAnimations
 })
 export class FuseChatComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
index 228360bf..a2df3ca7 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
@@ -101,7 +101,7 @@
 <div class="sidenav-content" fusePerfectScrollbar fxFlex>
 
     <!-- CHATS CONTENT -->
-    <div>
+    <div *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
         <!-- CHATS LIST-->
         <div class="chat-list" fxLayout="column">
@@ -112,7 +112,8 @@
 
             <button md-button class="contact"
                     *ngFor="let chat of user.chatList | filter: searchText"
-                    (click)="getChat(chat.contactId)" ngClass="{'unread':contact.unread}">
+                    (click)="getChat(chat.contactId)" ngClass="{'unread':contact.unread}"
+                    [@animate]="{value:'*',params:{y:'100%'}}">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
 
@@ -152,7 +153,8 @@
             <button md-button class="contact"
                     ng-show="chatSearch"
                     *ngFor="let contact of contacts| filter: searchText"
-                    (click)="getChat(contact.id)">
+                    (click)="getChat(contact.id)"
+                    [@animate]="{value:'*',params:{y:'100%'}}">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
                     <div class="avatar-wrapper" fxFlex="0 1 auto">
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
index 0cdd0bae..89cf73f3 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 import { ChatService } from '../../../chat.service';
 import { FuseMdSidenavHelperService } from '../../../../../../../core/directives/md-sidenav-helper/md-sidenav-helper.service';
 import { ObservableMedia } from '@angular/flex-layout';
+import { fuseAnimations } from '../../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-chat-chats-sidenav',
     templateUrl: './chats.component.html',
-    styleUrls  : ['./chats.component.scss']
+    styleUrls  : ['./chats.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseChatChatsSidenavComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.ts b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts
index d12d63ba..3ca134ac 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/left.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../../core/animations';
+import { fuseAnimations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({
     selector   : 'fuse-chat-left-sidenav',
     templateUrl: './left.component.html',
     styleUrls  : ['./left.component.scss'],
-    animations : [Animations.slideInLeft, Animations.slideInRight]
+    animations : fuseAnimations
 })
 export class FuseChatLeftSidenavComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.ts b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts
index 9f7b1515..3d9c33e9 100644
--- a/src/app/main/content/apps/chat/sidenavs/right/right.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../../core/animations';
+import { fuseAnimations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({
     selector   : 'fuse-chat-right-sidenav',
     templateUrl: './right.component.html',
     styleUrls  : ['./right.component.scss'],
-    animations : [Animations.slideInLeft, Animations.slideInRight]
+    animations : fuseAnimations
 })
 export class FuseChatRightSidenavComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.html b/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
index 7a81ccea..5e43e571 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
@@ -1,5 +1,5 @@
-<md-table #table [dataSource]="dataSource">
-
+<md-table #table [dataSource]="dataSource"
+          [@animateStagger]="{value:'50'}">
     <!-- Checkbox Column -->
     <ng-container cdkColumnDef="checkbox">
         <md-header-cell *cdkHeaderCellDef></md-header-cell>
@@ -95,15 +95,18 @@
 
     <md-header-row *cdkHeaderRowDef="displayedColumns"></md-header-row>
     <md-row *cdkRowDef="let contact; columns: displayedColumns;"
+            class="contact"
             (click)="editContact(contact)"
             [ngClass]="{'md-light-blue-50-bg':checkboxes[contact.id]}"
-            md-ripple>
+            md-ripple
+            [@animate]="{value:'*',params:{y:'100%'}}">
     </md-row>
 </md-table>
 
 
 <!-- ADD CONTACT BUTTON -->
-<button md-fab class="md-accent-bg" id="add-contact-button" (click)="newContact()" aria-label="add contact">
+<button md-fab class="md-accent-bg" id="add-contact-button" (click)="newContact()" aria-label="add contact"
+        *fuseIfOnDom [@animate]="{value:'*', params:{delay:'300ms',scale:'.2'}}">
     <md-icon>person_add</md-icon>
 </button>
 <!-- / ADD CONTACT BUTTON -->
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
index f8624b9a..cc0e8287 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
@@ -6,11 +6,13 @@ import { MdDialog, MdDialogRef } from '@angular/material';
 import { FuseConfirmDialogComponent } from '../../../../../core/components/confirm-dialog/confirm-dialog.component';
 import { FormGroup } from '@angular/forms';
 import { DataSource } from '@angular/cdk/collections';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-contacts-contact-list',
     templateUrl: './contact-list.component.html',
-    styleUrls  : ['./contact-list.component.scss']
+    styleUrls  : ['./contact-list.component.scss'],
+    animations   : fuseAnimations
 })
 export class FuseContactsContactListComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 24d898c4..4df1bda9 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -14,8 +14,8 @@
             </button>
 
             <div class="logo" fxLayout="row" fxLayoutAlign="start center">
-                <md-icon class="logo-icon mr-16">account_box</md-icon>
-                <span class="logo-text h1">Contacts</span>
+                <md-icon class="logo-icon mr-16" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">account_box</md-icon>
+                <span class="logo-text h1" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">Contacts</span>
             </div>
 
         </div>
@@ -45,7 +45,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="contacts-main-sidenav" md-is-locked-open="gt-md">
 
-            <fuse-contacts-main-sidenav></fuse-contacts-main-sidenav>
+            <fuse-contacts-main-sidenav *fuseIfOnDom [@animate]="{value:'*'}"></fuse-contacts-main-sidenav>
 
         </md-sidenav>
         <!-- / SIDENAV -->
diff --git a/src/app/main/content/apps/contacts/contacts.component.ts b/src/app/main/content/apps/contacts/contacts.component.ts
index dcc4f8f6..68c708a1 100644
--- a/src/app/main/content/apps/contacts/contacts.component.ts
+++ b/src/app/main/content/apps/contacts/contacts.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ContactsService } from './contacts.service';
-import { Animations } from '../../../../core/animations';
+import { fuseAnimations } from '../../../../core/animations';
 import { FormControl } from '@angular/forms';
 
 @Component({
@@ -8,7 +8,7 @@ import { FormControl } from '@angular/forms';
     templateUrl  : './contacts.component.html',
     styleUrls    : ['./contacts.component.scss'],
     encapsulation: ViewEncapsulation.None,
-    animations   : [Animations.slideInTop]
+    animations   : fuseAnimations
 })
 export class FuseContactsComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index 00fc77a3..7d785fe9 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -10,7 +10,7 @@
 
                 <div fxLayout="row" fxLayoutAlign="space-between start">
 
-                    <span class="mat-display-1 mb-0">Welcome back, John!</span>
+                    <span class="mat-display-1 mb-0 welcome-message" *fuseIfOnDom [@animate]="{value:'*',params:{x:'50px'}}">Welcome back, John!</span>
 
                     <button md-icon-button fuseMdSidenavToggler="dashboards-right-sidenav" fxHide.gt-md>
                         <md-icon>menu</md-icon>
@@ -41,10 +41,10 @@
 
                     <md-tab label="Home">
 
-                        <div class="widget-group p-12" fxLayout="row" fxFlex="100" fxLayoutWrap>
+                        <div class="widget-group p-12" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
                             <!-- WIDGET 1 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -93,7 +93,7 @@
                             <!-- / WIDGET 1 -->
 
                             <!-- WIDGET 2 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -135,7 +135,7 @@
                             <!-- / WIDGET 2 -->
 
                             <!-- WIDGET 3 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -177,7 +177,7 @@
                             <!-- / WIDGET 3 -->
 
                             <!-- WIDGET 4 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -219,7 +219,7 @@
 
 
                             <!-- WIDGET 5 -->
-                            <fuse-widget class="" fxLayout="row" fxFlex="100">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="row" fxFlex="100">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -295,7 +295,7 @@
 
 
                             <!-- WIDGET 6 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -345,7 +345,7 @@
                             <!-- / WIDGET 6 -->
 
                             <!-- WIDGET 7 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -394,10 +394,10 @@
                     <md-tab label="Budget Summary">
 
                         <!-- WIDGET GROUP -->
-                        <div class="widget-group" fxLayout="row" fxFlex="100" fxLayoutWrap>
+                        <div class="widget-group" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
                             <!-- WIDGET 8 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -428,7 +428,7 @@
                             <!-- / WIDGET 8 -->
 
                             <!-- WIDGET 9 -->
-                            <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -542,7 +542,7 @@
                             <!-- / WIDGET 9 -->
 
                             <!-- WIDGET 10 -->
-                            <fuse-widget class="" fxLayout="row" fxFlex="100">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="row" fxFlex="100">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -589,10 +589,10 @@
                     <md-tab label="Team Members">
 
                         <!-- WIDGET GROUP -->
-                        <div class="widget-group" fxLayout="row" fxFlex="100" fxLayoutWrap>
+                        <div class="widget-group" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
                             <!-- WIDGET 11 -->
-                            <fuse-widget class="" fxLayout="row" fxFlex="100">
+                            <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="row" fxFlex="100">
 
                                 <!-- Front -->
                                 <div class="fuse-widget-front md-white-bg mat-elevation-z2">
@@ -687,15 +687,15 @@
         <!-- / CENTER -->
 
         <!-- SIDENAV -->
-        <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side"
-                    fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
+        <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" opened="true" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
             <div class="sidenav-content" fusePerfectScrollbar>
+
                 <!-- WIDGET GROUP -->
-                <div class="widget-group" fxLayout="column" fxFlex="100">
+                <div class="widget-group" fxLayout="column" fxFlex="100" *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
                     <!-- NOW WIDGET -->
-                    <fuse-widget class="sidenav-widget p-0">
+                    <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="sidenav-widget p-0">
 
                         <!-- Front -->
                         <div class="fuse-widget-front">
@@ -738,9 +738,8 @@
                     </fuse-widget>
                     <!-- / NOW WIDGET -->
 
-
                     <!-- WEATHER WIDGET -->
-                    <fuse-widget class="sidenav-widget p-0">
+                    <fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="sidenav-widget p-0">
 
                         <!-- Front -->
                         <div class="fuse-widget-front">
diff --git a/src/app/main/content/apps/dashboards/project/project.component.scss b/src/app/main/content/apps/dashboards/project/project.component.scss
index 4e52524e..4cd2735d 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.scss
+++ b/src/app/main/content/apps/dashboards/project/project.component.scss
@@ -30,6 +30,15 @@
             }
 
             > .content {
+                flex: 1;
+
+                md-tab-group {
+                    height: 100%;
+
+                    .mat-tab-body-wrapper {
+                        flex-grow: 1;
+                    }
+                }
 
                 .mat-tab-label-container {
                     padding: 0 24px;
diff --git a/src/app/main/content/apps/dashboards/project/project.component.ts b/src/app/main/content/apps/dashboards/project/project.component.ts
index 6e81ed55..9c2b6c72 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.ts
+++ b/src/app/main/content/apps/dashboards/project/project.component.ts
@@ -4,12 +4,14 @@ import * as shape from 'd3-shape';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Observable } from 'rxjs/Observable';
 import { DataSource } from '@angular/cdk/collections';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector     : 'fuse-project',
     templateUrl  : './project.component.html',
     styleUrls    : ['./project.component.scss'],
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    animations   : fuseAnimations
 })
 export class FuseProjectComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.html b/src/app/main/content/apps/file-manager/file-list/file-list.component.html
index fe89ad27..b98db1fa 100644
--- a/src/app/main/content/apps/file-manager/file-list/file-list.component.html
+++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.html
@@ -1,4 +1,4 @@
-<md-table #table [dataSource]="dataSource">
+<md-table #table [dataSource]="dataSource" *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
     <!-- Type Column -->
     <ng-container cdkColumnDef="icon">
@@ -53,6 +53,8 @@
     <md-row *cdkRowDef="let row; columns: displayedColumns;"
             (click)="onSelect(row)"
             [ngClass]="{'md-light-blue-50-bg':row == selected}"
-            md-ripple>
+            md-ripple
+            [@animate]="{value:'*',params:{y:'100%'}}"
+    >
     </md-row>
 </md-table>
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts
index 56e21283..15d1d560 100644
--- a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts
+++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 import { FileManagerService } from '../file-manager.service';
 import { Observable } from 'rxjs/Observable';
 import { DataSource } from '@angular/cdk/collections';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-file-list',
     templateUrl: './file-list.component.html',
-    styleUrls  : ['./file-list.component.scss']
+    styleUrls  : ['./file-list.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseFileManagerFileListComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index d6f499e6..f49416be 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -34,7 +34,8 @@
                 <!-- / TOOLBAR -->
 
                 <!-- BREADCRUMB -->
-                <div class="breadcrumb text-truncate h1 pl-72" fxLayout="row" fxLayoutAlign="start center">
+                <div class="breadcrumb text-truncate h1 pl-72" fxLayout="row" fxLayoutAlign="start center"
+                     *fuseIfOnDom [@animate]="{value:'*',params:{x:'50px'}}">
                     <div *ngFor="let path of pathArr; last  as isLast" fxLayout="row" fxLayoutAlign="start center">
                         <span>{{path}}</span>
                         <md-icon *ngIf="!isLast" class="separator">chevron_right</md-icon>
@@ -48,7 +49,8 @@
                     <button md-fab
                             class="add-file-button mat-warn"
                             (click)="fileInput.click()"
-                            aria-label="Add file">
+                            aria-label="Add file"
+                            *fuseIfOnDom [@animate]="{value:'*', params:{delay:'300ms',scale:'0.2'}}">
                         <md-icon>add</md-icon>
                     </button>
                 </div>
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.ts b/src/app/main/content/apps/file-manager/file-manager.component.ts
index 0fd30a5f..3374fc48 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.ts
+++ b/src/app/main/content/apps/file-manager/file-manager.component.ts
@@ -1,11 +1,13 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { FileManagerService } from './file-manager.service';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector     : 'fuse-file-manager',
     templateUrl  : './file-manager.component.html',
     styleUrls    : ['./file-manager.component.scss'],
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    animations   : fuseAnimations
 })
 export class FuseFileManagerComponent implements OnInit
 {
@@ -15,7 +17,6 @@ export class FuseFileManagerComponent implements OnInit
 
     constructor(private fileManagerService: FileManagerService)
     {
-
     }
 
     ngOnInit()
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
index 51b60b43..9c4b4cf7 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
@@ -29,7 +29,8 @@
 <!-- SIDENAV CONTENT -->
 <div class="content p-24 md-white-bg" fusePerfectScrollbar>
 
-    <div class="file-details">
+    <div class="file-details"
+         *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms'}}">
 
         <div class="preview file-icon" fxLayout="row" fxLayoutAlign="center center">
             <md-icon class="type-icon s-48" [class]="selected.type"></md-icon>
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
index cb08fb7b..ced23ac0 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
@@ -1,10 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { FileManagerService } from '../../file-manager.service';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-file-manager-details-sidenav',
     templateUrl: './details.component.html',
-    styleUrls  : ['./details.component.scss']
+    styleUrls  : ['./details.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseFileManagerDetailsSidenavComponent implements OnInit
 {
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.html b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
index 0927817a..42df8292 100644
--- a/src/app/main/content/apps/mail/mail-details/mail-details.component.html
+++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="!mail" fxLayout="column" fxLayoutAlign="center center" fxFlex>
-    <md-icon class="s-128 mb-16">email</md-icon>
-    <span class="select-message-text hint-text">Select a message to read</span>
+    <md-icon class="s-128 mb-16 select-message-icon" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">email</md-icon>
+    <span class="select-message-text hint-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">Select a message to read</span>
 </div>
 
 <div *ngIf="mail">
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts
index ca3d9165..ac475616 100644
--- a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts
+++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts
@@ -2,11 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MailService } from '../mail.service';
 import { Mail } from '../mail.model';
 import { Subscription } from 'rxjs/Subscription';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-mail-details',
     templateUrl: './mail-details.component.html',
-    styleUrls  : ['./mail-details.component.scss']
+    styleUrls  : ['./mail-details.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseMailDetailsComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.html b/src/app/main/content/apps/mail/mail-list/mail-list.component.html
index 713a359c..467fac48 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list.component.html
+++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.html
@@ -2,6 +2,9 @@
     <span class="no-messages-text hint-text">There are no messages!</span>
 </div>
 
-<fuse-mail-list-item md-ripple *ngFor="let mail of mails" [mail]="mail" (click)="readMail(mail.id)"
-                     [ngClass]="{'current-mail':mail?.id == currentMail?.id}">
-</fuse-mail-list-item>
+<div class="mail-list" *fuseIfOnDom [@animateStagger]="{value:'50'}">
+    <fuse-mail-list-item md-ripple *ngFor="let mail of mails" [mail]="mail" (click)="readMail(mail.id)"
+                         [ngClass]="{'current-mail':mail?.id == currentMail?.id}"
+                         [@animate]="{value:'*',params:{y:'100%'}}">
+    </fuse-mail-list-item>
+</div>
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss
index 6451a90e..440b75aa 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss
+++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss
@@ -11,4 +11,11 @@
         font-size: 24px;
         font-weight: 300;
     }
+
+    .mail-list {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+    }
 }
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts
index 1059f2be..54eb8985 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts
+++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts
@@ -4,11 +4,13 @@ import { ActivatedRoute } from '@angular/router';
 import { MailService } from '../mail.service';
 import { Location } from '@angular/common';
 import { Subscription } from 'rxjs/Subscription';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-mail-list',
     templateUrl: './mail-list.component.html',
-    styleUrls  : ['./mail-list.component.scss']
+    styleUrls  : ['./mail-list.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseMailListComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index 249a4458..a00fbb05 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -2,11 +2,11 @@
 <div fxLayout="column" fxLayoutAlign="space-between start"
      class="header p-24 md-accent-bg" class.gt-md="header p-24 white-fg">
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <md-icon class="logo-icon s-32">mail</md-icon>
-        <span class="logo-text">Mailbox</span>
+        <md-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">mail</md-icon>
+        <span class="logo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">Mailbox</span>
     </div>
 
-    <div class="account" fxLayout="column">
+    <div class="account" fxLayout="column" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms'}}">
         <div class="title">John Doe</div>
         <md-select class="account-selection" placeholder="Mail Selection"
                    floatPlaceholder="never"
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" fusePerfectScrollbar>
+<div class="content" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{y:'50px'}}">
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
index 2e92d113..54b1d3bc 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
@@ -4,11 +4,13 @@ import { Subscription } from 'rxjs/Subscription';
 import { FuseMailComposeDialogComponent } from '../../dialogs/compose/compose.component';
 import { MdDialog } from '@angular/material';
 import { FormGroup } from '@angular/forms';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-mail-main-sidenav',
     templateUrl: './main-sidenav.component.html',
-    styleUrls  : ['./main-sidenav.component.scss']
+    styleUrls  : ['./main-sidenav.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseMailMainSidenavComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.html b/src/app/main/content/apps/scrumboard/board/board.component.html
index de67df7d..1bb4f21c 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.html
+++ b/src/app/main/content/apps/scrumboard/board/board.component.html
@@ -50,11 +50,12 @@
         </div>
         <!-- / HEADER -->
 
-        <div fxFlex class="board-content-wrapper p-16 p-md-24">
+        <div fxFlex class="board-content-wrapper p-16 p-md-24" [class]="board.settings.color+'-100-bg'">
 
             <!-- BOARD -->
-            <div class="board-content ngx-dnd-container p-16 p-md-24" [class]="board.settings.color+'-100-bg'" fxLayout="row"
-                 ngxDroppable="list" [model]="board.lists" (out)="onDrop($event)">
+            <div class="board-content ngx-dnd-container p-16 p-md-24" fxLayout="row"
+                 ngxDroppable="list" [model]="board.lists" (out)="onDrop($event)"
+                 *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
                 <!-- LIST -->
                 <fuse-scrumboard-board-list
@@ -62,12 +63,15 @@
                     ngxDraggable
                     *ngFor="let list of board.lists"
                     [model]="list"
-                    [list]="list">
+                    [list]="list"
+                    [@animate]="{value:'*',params:{duration:'350ms',x:'100%'}}">
                 </fuse-scrumboard-board-list>
                 <!-- / LIST -->
 
                 <!-- NEW LIST BUTTON-->
-                <fuse-scrumboard-board-add-list class="new-list-wrapper" (onlistAdd)="onListAdd($event)"></fuse-scrumboard-board-add-list>
+                <fuse-scrumboard-board-add-list class="new-list-wrapper" (onlistAdd)="onListAdd($event)"
+                                                [@animate]="{value:'*',params:{duration:'350ms',x:'100%'}}">
+                </fuse-scrumboard-board-add-list>
                 <!-- / NEW LIST BUTTON-->
 
             </div>
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.scss b/src/app/main/content/apps/scrumboard/board/board.component.scss
index 9d1ccb1c..edb67fc6 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/board.component.scss
@@ -100,6 +100,7 @@
 
             .board-content-wrapper {
                 position: relative;
+                background: #E5E7E8;
 
                 .board-content {
                     position: absolute;
@@ -108,7 +109,6 @@
                     bottom: 0;
                     left: 0;
                     height: 100%;
-                    background: #E5E7E8;
                     overflow-y: hidden;
                     overflow-x: auto;
                     -webkit-overflow-scrolling: touch;
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.ts b/src/app/main/content/apps/scrumboard/board/board.component.ts
index 4eaa55d7..b9e4e5bc 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/board.component.ts
@@ -4,11 +4,13 @@ import { ScrumboardService } from '../scrumboard.service';
 import { Subscription } from 'rxjs/Subscription';
 import { Location } from '@angular/common';
 import { List } from '../list.model';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-scrumboard-board',
     templateUrl: './board.component.html',
-    styleUrls  : ['./board.component.scss']
+    styleUrls  : ['./board.component.scss'],
+    animations  : fuseAnimations
 })
 export class FuseScrumboardBoardComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
index 9eda6022..dc031d81 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
@@ -2,14 +2,14 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsul
 import { Subscription } from 'rxjs/Subscription';
 import { ScrumboardService } from '../../../../scrumboard.service';
 import { FuseUtils } from '../../../../../../../../core/fuseUtils';
-import { Animations } from '../../../../../../../../core/animations';
+import { fuseAnimations } from '../../../../../../../../core/animations';
 
 @Component({
     selector     : 'fuse-scrumboard-label-selector',
     templateUrl  : './label-selector.component.html',
     styleUrls    : ['./label-selector.component.scss'],
     encapsulation: ViewEncapsulation.None,
-    animations   : [Animations.slideInLeft, Animations.slideInRight]
+    animations   : fuseAnimations
 })
 
 export class FuseScrumboardLabelSelectorComponent implements OnInit, OnDestroy
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts
index b23eb83c..ddb268a8 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
 import { ScrumboardService } from '../../../scrumboard.service';
-import { Animations } from '../../../../../../../core/animations';
+import { fuseAnimations } from '../../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-scrumboard-board-settings',
     templateUrl: './settings.component.html',
     styleUrls  : ['./settings.component.scss'],
-    animations : [Animations.slideInLeft, Animations.slideInRight]
+    animations : fuseAnimations
 })
 export class FuseScrumboardBoardSettingsSidenavComponent implements OnInit, OnDestroy
 {
@@ -19,7 +19,6 @@ export class FuseScrumboardBoardSettingsSidenavComponent implements OnInit, OnDe
         private scrumboardService: ScrumboardService
     )
     {
-
     }
 
     ngOnInit()
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/content/apps/scrumboard/scrumboard.component.html
index a5a29202..9aea1c88 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.html
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.html
@@ -1,17 +1,19 @@
 <!-- BOARDS -->
 <div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex fusePerfectScrollbar>
 
-    <div class="header pt-44 pt-md-88" fxFlex="0 0 auto">
+    <div class="header pt-44 pt-md-88" fxFlex="0 0 auto" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms'}}">
         <h1>Scrumboard App</h1>
     </div>
 
     <!-- BOARD LIST -->
-    <div class="board-list" fxFlex="0 0 auto" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap>
+    <div class="board-list" fxFlex="0 0 auto" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap
+         *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
         <!-- BOARD -->
         <div class="board-list-item" *ngFor="let board of boards"
              [routerLink]="'/apps/scrumboard/boards/'+board.id+'/'+board.uri"
-             fxLayout="column" fxLayoutAlign="center center">
+             fxLayout="column" fxLayoutAlign="center center"
+             [@animate]="{value:'*',params:{y:'100%'}}">
             <md-icon class="s-64">assessment</md-icon>
             <div class="board-name">{{board.name}}</div>
         </div>
@@ -19,7 +21,8 @@
 
         <!-- NEW BOARD BUTTON -->
         <div class="board-list-item add-new-board" fxLayout="column" fxLayoutAlign="center center"
-             (click)="newBoard()">
+             (click)="newBoard()"
+             [@animate]="{value:'*',params:{y:'100%'}}">
             <md-icon class="s-64">add_circle</md-icon>
             <div class="board-name">Add new board</div>
         </div>
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.ts b/src/app/main/content/apps/scrumboard/scrumboard.component.ts
index 1b17dd5d..969748a4 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.ts
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.ts
@@ -3,11 +3,13 @@ import { ScrumboardService } from './scrumboard.service';
 import { Subscription } from 'rxjs/Subscription';
 import { Router } from '@angular/router';
 import { Board } from './board.model';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector   : 'fuse-scrumboard',
     templateUrl: './scrumboard.component.html',
-    styleUrls  : ['./scrumboard.component.scss']
+    styleUrls  : ['./scrumboard.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseScrumboardComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index c8025806..4eda7b40 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -2,11 +2,11 @@
 <div fxLayout="column" fxLayoutAlign="space-between start"
      class="header p-24 md-accent-bg" class.gt-md="header p-24 white-fg">
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <md-icon class="logo-icon s-32">check_box</md-icon>
-        <span class="logo-text">To-do</span>
+        <md-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">check_box</md-icon>
+        <span class="logo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">To-do</span>
     </div>
 
-    <div class="account" fxLayout="column">
+    <div class="account" fxLayout="column" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms'}}">
         <div class="title">John Doe</div>
         <md-select class="account-selection" placeholder="Todo Selection"
                    floatPlaceholder="never"
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" fusePerfectScrollbar>
+<div class="content" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{y:'50px'}}">
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
index c81f88f1..a8956656 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
@@ -2,11 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { TodoService } from '../../todo.service';
 import { Subscription } from 'rxjs/Subscription';
 import { Router } from '@angular/router';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-todo-main-sidenav',
     templateUrl: './main-sidenav.component.html',
-    styleUrls  : ['./main-sidenav.component.scss']
+    styleUrls  : ['./main-sidenav.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseTodoMainSidenavComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.html b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
index d17658e9..9884527d 100644
--- a/src/app/main/content/apps/todo/todo-details/todo-details.component.html
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="!todo" fxLayout="column" fxLayoutAlign="center center" fxFlex>
-    <md-icon class="s-120 mb-12">check_box</md-icon>
-    <span class="hint-text mat-h1">Select a todo</span>
+    <md-icon class="s-120 mb-12 select-todo-icon" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">check_box</md-icon>
+    <span class="hint-text mat-h1 select-todo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">Select a todo</span>
 </div>
 
 <div *ngIf="todo">
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts
index dc736847..1a82ca19 100644
--- a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts
@@ -4,11 +4,13 @@ import { Todo } from '../todo.model';
 import { Subscription } from 'rxjs/Subscription';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FuseUtils } from '../../../../../core/fuseUtils';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-todo-details',
     templateUrl: './todo-details.component.html',
-    styleUrls  : ['./todo-details.component.scss']
+    styleUrls  : ['./todo-details.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseTodoDetailsComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.html b/src/app/main/content/apps/todo/todo-list/todo-list.component.html
index 460c949f..d6e9382b 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list.component.html
+++ b/src/app/main/content/apps/todo/todo-list/todo-list.component.html
@@ -1,13 +1,14 @@
 <div *ngIf="todos.length === 0" fxLayout="column" fxLayoutAlign="center center" fxFlex>
     <span class="hint-text mat-h3">There are no todos!</span>
 </div>
-<div class="todo-list" ngxDroppable [model]="todos" (out)="onDrop($event)">
+<div class="todo-list" ngxDroppable [model]="todos" (out)="onDrop($event)" *fuseIfOnDom [@animateStagger]="{value:'50'}">
     <fuse-todo-list-item class="todo-list-item has-handle"
                          *ngFor="let todo of todos" [todo]="todo"
                          ngxDraggable
                          [model]="todo"
                          (click)="readTodo(todo.id)"
                          [ngClass]="{'current-todo':todo?.id == currentTodo?.id}"
-                         md-ripple>
+                         md-ripple
+                         [@animate]="{value:'*',params:{y:'100%'}}">
     </fuse-todo-list-item>
 </div>
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list.component.ts
index dac030cd..268070e2 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list.component.ts
+++ b/src/app/main/content/apps/todo/todo-list/todo-list.component.ts
@@ -4,11 +4,13 @@ import { ActivatedRoute } from '@angular/router';
 import { TodoService } from '../todo.service';
 import { Location } from '@angular/common';
 import { Subscription } from 'rxjs/Subscription';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-todo-list',
     templateUrl: './todo-list.component.html',
-    styleUrls  : ['./todo-list.component.scss']
+    styleUrls  : ['./todo-list.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseTodoListComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/apps/todo/todo.component.ts b/src/app/main/content/apps/todo/todo.component.ts
index 31661447..4511b929 100644
--- a/src/app/main/content/apps/todo/todo.component.ts
+++ b/src/app/main/content/apps/todo/todo.component.ts
@@ -1,13 +1,15 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
 import { TodoService } from './todo.service';
 import { FormControl } from '@angular/forms';
 import { Todo } from './todo.model';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector   : 'fuse-todo',
     templateUrl: './todo.component.html',
-    styleUrls  : ['./todo.component.scss']
+    styleUrls  : ['./todo.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseTodoComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts
index 1d05e904..297eaa11 100644
--- a/src/app/main/content/content.component.ts
+++ b/src/app/main/content/content.component.ts
@@ -1,6 +1,6 @@
 import { Component, HostBinding, OnInit, OnDestroy } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-import { Animations } from '../../core/animations';
+import { fuseAnimations } from '../../core/animations';
 import { FuseConfigService } from '../../core/services/config.service';
 import { Subscription } from 'rxjs/Subscription';
 import 'rxjs/add/operator/filter';
@@ -10,13 +10,7 @@ import 'rxjs/add/operator/map';
     selector   : 'fuse-content',
     templateUrl: './content.component.html',
     styleUrls  : ['./content.component.scss'],
-    animations : [
-        Animations.routerTransitionUp,
-        Animations.routerTransitionDown,
-        Animations.routerTransitionRight,
-        Animations.routerTransitionLeft,
-        Animations.routerTransitionFade
-    ]
+    animations : fuseAnimations
 })
 export class FuseContentComponent implements OnInit, OnDestroy
 {
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
index 81962f9b..1eb104b1 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
@@ -1,6 +1,6 @@
 <div id="forgot-password" fxLayout="column" fusePerfectScrollbar>
 
-    <div id="forgot-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
+    <div id="forgot-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
         <div id="forgot-password-form">
 
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
index cdd9f2d6..5c060222 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
@@ -1,11 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-forgot-password',
     templateUrl: './forgot-password.component.html',
-    styleUrls  : ['./forgot-password.component.scss']
+    styleUrls  : ['./forgot-password.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseForgotPasswordComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.html b/src/app/main/content/pages/authentication/lock/lock.component.html
index 1b74729a..cf055f5d 100644
--- a/src/app/main/content/pages/authentication/lock/lock.component.html
+++ b/src/app/main/content/pages/authentication/lock/lock.component.html
@@ -2,7 +2,7 @@
 
     <div id="lock-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
-        <div id="lock-form">
+        <div id="lock-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
             <div fxLayout="row" fxLayoutAlign="start center" fxLayout.sm="column" fxLayoutAlign.sm="center center">
                 <div class="avatar-container">
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.ts b/src/app/main/content/pages/authentication/lock/lock.component.ts
index bbd3fe12..b08145a3 100644
--- a/src/app/main/content/pages/authentication/lock/lock.component.ts
+++ b/src/app/main/content/pages/authentication/lock/lock.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector: 'fuse-lock',
     templateUrl: './lock.component.html',
-    styleUrls: ['./lock.component.scss']
+    styleUrls: ['./lock.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseLockComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
index fe2b6f79..8177b1bc 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.html
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html
@@ -1,21 +1,21 @@
 <div id="login" fxLayout="row" fxLayoutAlign="start">
 
     <div id="login-intro" fxFlex fxHide fxShow.gt-xs>
-        <div class="logo">
+        <div class="logo" *fuseIfOnDom [@animate]="{value:'*',params:{scale:'0.2'}}">
             <span>F</span>
         </div>
 
-        <div class="title">
+        <div class="title" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',y:'25px'}}">
             Welcome to the FUSE!
         </div>
 
-        <div class="description">
+        <div class="description" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',y:'25px'}}">
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ullamcorper nisl erat,
             vel convallis elit fermentum pellentesque. Sed mollis velit facilisis facilisis viverra.
         </div>
     </div>
 
-    <div id="login-form-wrapper" fusePerfectScrollbar>
+    <div id="login-form-wrapper" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',x:'100%'}}">
 
         <div id="login-form">
 
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.ts b/src/app/main/content/pages/authentication/login-2/login-2.component.ts
index 22faf546..f74ba611 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.ts
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-login-2',
     templateUrl: './login-2.component.html',
-    styleUrls  : ['./login-2.component.scss']
+    styleUrls  : ['./login-2.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseLogin2Component implements OnInit
 {
@@ -15,7 +17,8 @@ export class FuseLogin2Component implements OnInit
 
     constructor(
         private fuseConfig: FuseConfigService,
-        private formBuilder: FormBuilder)
+        private formBuilder: FormBuilder
+    )
     {
         this.fuseConfig.setSettings({
             layout: {
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
index 69a23fdb..4221ec98 100644
--- a/src/app/main/content/pages/authentication/login/login.component.html
+++ b/src/app/main/content/pages/authentication/login/login.component.html
@@ -2,7 +2,7 @@
 
     <div id="login-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
-        <div id="login-form">
+        <div id="login-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
             <div class="logo md-accent-bg">
                 <span>F</span>
             </div>
diff --git a/src/app/main/content/pages/authentication/login/login.component.ts b/src/app/main/content/pages/authentication/login/login.component.ts
index a1fcee1b..c8f4f4a4 100644
--- a/src/app/main/content/pages/authentication/login/login.component.ts
+++ b/src/app/main/content/pages/authentication/login/login.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-login',
     templateUrl: './login.component.html',
-    styleUrls  : ['./login.component.scss']
+    styleUrls  : ['./login.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseLoginComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
index bbc773bc..5092e6fe 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.html
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html
@@ -1,21 +1,21 @@
 <div id="register" fxLayout="row" fxLayoutAlign="start">
 
     <div id="register-intro" fxFlex fxHide fxShow.gt-xs>
-        <div class="logo">
+        <div class="logo" *fuseIfOnDom [@animate]="{value:'*',params:{scale:'0.2'}}">
             <span>F</span>
         </div>
 
-        <div class="title">
+        <div class="title" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',y:'25px'}}">
             Welcome to the FUSE!
         </div>
 
-        <div class="description">
+        <div class="description" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',y:'25px'}}">
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ullamcorper nisl erat,
             vel convallis elit fermentum pellentesque. Sed mollis velit facilisis facilisis viverra.
         </div>
     </div>
 
-    <div id="register-form-wrapper" fusePerfectScrollbar>
+    <div id="register-form-wrapper" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',x:'100%'}}">
 
         <div id="register-form">
 
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.ts b/src/app/main/content/pages/authentication/register-2/register-2.component.ts
index 85bdec05..57e6db4a 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.ts
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-register-2',
     templateUrl: './register-2.component.html',
-    styleUrls  : ['./register-2.component.scss']
+    styleUrls  : ['./register-2.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseRegister2Component implements OnInit
 {
@@ -15,7 +17,8 @@ export class FuseRegister2Component implements OnInit
 
     constructor(
         private fuseConfig: FuseConfigService,
-        private formBuilder: FormBuilder)
+        private formBuilder: FormBuilder
+    )
     {
         this.fuseConfig.setSettings({
             layout: {
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
index ec5127f9..d38b333d 100644
--- a/src/app/main/content/pages/authentication/register/register.component.html
+++ b/src/app/main/content/pages/authentication/register/register.component.html
@@ -2,7 +2,7 @@
 
     <div id="register-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
-        <div id="register-form">
+        <div id="register-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
             <div class="logo md-accent-bg">
                 <span>F</span>
             </div>
diff --git a/src/app/main/content/pages/authentication/register/register.component.ts b/src/app/main/content/pages/authentication/register/register.component.ts
index 563a5efd..69b64353 100644
--- a/src/app/main/content/pages/authentication/register/register.component.ts
+++ b/src/app/main/content/pages/authentication/register/register.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-register',
     templateUrl: './register.component.html',
-    styleUrls  : ['./register.component.scss']
+    styleUrls  : ['./register.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseRegisterComponent implements OnInit
 {
@@ -15,7 +17,8 @@ export class FuseRegisterComponent implements OnInit
 
     constructor(
         private fuseConfig: FuseConfigService,
-        private formBuilder: FormBuilder)
+        private formBuilder: FormBuilder
+    )
     {
         this.fuseConfig.setSettings({
             layout: {
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
index 45527e9e..e9f2c27d 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
@@ -1,6 +1,7 @@
 <div id="reset-password" fxLayout="column" fusePerfectScrollbar>
 
-    <div id="reset-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
+    <div id="reset-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center"
+         *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
         <div id="reset-password-form">
 
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
index 268bcb62..f33643d9 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseConfigService } from '../../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-reset-password',
     templateUrl: './reset-password.component.html',
-    styleUrls  : ['./reset-password.component.scss']
+    styleUrls  : ['./reset-password.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseResetPasswordComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
index 447ad97e..fa19777e 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.html
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.html
@@ -2,7 +2,7 @@
 
     <div id="coming-soon-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
-        <div id="coming-soon-form">
+        <div id="coming-soon-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
             <div class="top">
 
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.ts b/src/app/main/content/pages/coming-soon/coming-soon.component.ts
index 4308505c..76b287f5 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.ts
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.ts
@@ -2,11 +2,13 @@ import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 import { FuseConfigService } from '../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector   : 'fuse-coming-soon',
     templateUrl: './coming-soon.component.html',
-    styleUrls  : ['./coming-soon.component.scss']
+    styleUrls  : ['./coming-soon.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseComingSoonComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
index 09b74843..7c383483 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.html
+++ b/src/app/main/content/pages/maintenance/maintenance.component.html
@@ -2,7 +2,7 @@
 
     <div id="maintenance-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
-        <div id="maintenance-form">
+        <div id="maintenance-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
             <div class="logo">
                 <span>F</span>
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.ts b/src/app/main/content/pages/maintenance/maintenance.component.ts
index ca814a9d..ae86b9bf 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.ts
+++ b/src/app/main/content/pages/maintenance/maintenance.component.ts
@@ -1,16 +1,18 @@
 import { Component, OnInit } from '@angular/core';
 
 import { FuseConfigService } from '../../../../core/services/config.service';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
     selector   : 'fuse-maintenance',
     templateUrl: './maintenance.component.html',
-    styleUrls  : ['./maintenance.component.scss']
+    styleUrls  : ['./maintenance.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseMaintenanceComponent implements OnInit
 {
     constructor(
-        private fuseConfig: FuseConfigService,
+        private fuseConfig: FuseConfigService
     )
     {
         this.fuseConfig.setSettings({
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html
index ce2c7f7d..907d1f79 100644
--- a/src/app/main/content/pages/profile/profile.component.html
+++ b/src/app/main/content/pages/profile/profile.component.html
@@ -6,11 +6,12 @@
 
         <div class="user-info" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
              fxLayoutAlign.gt-sm="start center">
-            <img class="profile-image avatar huge" src="assets/images/avatars/katherine.jpg">
-            <div class="name">Katherine Wilson</div>
+            <img class="profile-image avatar huge" src="assets/images/avatars/katherine.jpg"
+                 *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">
+            <div class="name" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">Katherine Wilson</div>
         </div>
 
-        <div class="actions" fxLayout="row" fxLayoutAlign="end center">
+        <div class="actions" fxLayout="row" fxLayoutAlign="end center" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms'}}">
             <button md-raised-button color="accent" aria-label="Follow">Follow</button>
             <button md-raised-button color="primary" aria-label="Send Message">Send Message</button>
         </div>
@@ -21,7 +22,7 @@
     <!-- CONTENT -->
     <div class="content">
 
-        <md-tab-group md-dynamic-height="true">
+        <md-tab-group dynamicHeight="true">
 
             <md-tab label="Timeline">
                 <fuse-profile-timeline></fuse-profile-timeline>
diff --git a/src/app/main/content/pages/profile/profile.component.scss b/src/app/main/content/pages/profile/profile.component.scss
index af51ba98..5fa913f9 100644
--- a/src/app/main/content/pages/profile/profile.component.scss
+++ b/src/app/main/content/pages/profile/profile.component.scss
@@ -1,43 +1,52 @@
 @import "../../../../core/scss/fuse";
 
-:host {
+#profile {
 
-    #profile {
+    .header {
+        height: 320px;
+        min-height: 320px;
+        max-height: 320px;
+        background: url('/assets/images/backgrounds/march.jpg') no-repeat 0 45%;
+        background-size: 100% auto;
 
-        .header {
-            height: 320px;
-            min-height: 320px;
-            max-height: 320px;
-            background: url('/assets/images/backgrounds/march.jpg') no-repeat 0 45%;
-            background-size: 100% auto;
+        .profile-image {
+            margin-right: 24px;
 
-            .profile-image {
-                margin-right: 24px;
-
-                @include media-breakpoint('sm') {
-                    margin: 0 0 16px 0;
-                }
+            @include media-breakpoint('sm') {
+                margin: 0 0 16px 0;
             }
+        }
 
-            .name {
-                font-size: 34px;
-                color: #FFFFFF;
+        .name {
+            font-size: 34px;
+            color: #FFFFFF;
 
-                @include media-breakpoint('sm') {
-                    margin-bottom: 32px;
-                }
+            @include media-breakpoint('sm') {
+                margin-bottom: 32px;
             }
+        }
 
-            .actions {
+        .actions {
 
-                button {
-                    text-transform: none;
-                    padding: 0 16px;
-                    height: 32px;
-                    line-height: 32px;
-                    margin: 0 0 0 8px;
-                }
+            button {
+                text-transform: none;
+                padding: 0 16px;
+                height: 32px;
+                line-height: 32px;
+                margin: 0 0 0 8px;
             }
         }
     }
-}
\ No newline at end of file
+
+    .content {
+        flex: 1;
+
+        md-tab-group {
+            height: 100%;
+
+            .mat-tab-body-wrapper {
+                flex-grow: 1;
+            }
+        }
+    }
+}
diff --git a/src/app/main/content/pages/profile/profile.component.ts b/src/app/main/content/pages/profile/profile.component.ts
index a14d43a4..3acea298 100644
--- a/src/app/main/content/pages/profile/profile.component.ts
+++ b/src/app/main/content/pages/profile/profile.component.ts
@@ -1,9 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { fuseAnimations } from '../../../../core/animations';
 
 @Component({
-    selector   : 'fuse-profile',
-    templateUrl: './profile.component.html',
-    styleUrls  : ['./profile.component.scss']
+    selector     : 'fuse-profile',
+    templateUrl  : './profile.component.html',
+    styleUrls    : ['./profile.component.scss'],
+    encapsulation: ViewEncapsulation.None,
+    animations   : fuseAnimations
 })
 export class FuseProfileComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.html b/src/app/main/content/pages/profile/tabs/about/about.component.html
index 7c9f7404..d9cda5a1 100644
--- a/src/app/main/content/pages/profile/tabs/about/about.component.html
+++ b/src/app/main/content/pages/profile/tabs/about/about.component.html
@@ -1,8 +1,10 @@
 <div id="about" class="p-24" fxLayout="row" fxLayoutWrap>
 
-    <div class="about-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxFlex.gt-md="65">
+    <div class="about-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxFlex.gt-md="65"
+         *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
-        <div class="profile-box info-box general" fxLayout="column">
+        <div class="profile-box info-box general" fxLayout="column"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header class="md-accent-bg">
                 <div class="title">General Information</div>
@@ -36,7 +38,8 @@
 
         </div>
 
-        <div class="profile-box info-box work" fxLayout="column">
+        <div class="profile-box info-box work" fxLayout="column"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header class="md-accent-bg">
                 <div class="title">Work</div>
@@ -65,7 +68,8 @@
             </div>
         </div>
 
-        <div class="profile-box info-box contact" fxLayout="column">
+        <div class="profile-box info-box contact" fxLayout="column"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header class="md-accent-bg">
                 <div class="title">Contact</div>
@@ -100,9 +104,11 @@
 
     </div>
 
-    <div class="about-sidebar" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxFlex.gt-md="35">
+    <div class="about-sidebar" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxFlex.gt-md="35"
+         *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
-        <div class="profile-box friends" fxLayout="column">
+        <div class="profile-box friends" fxLayout="column"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
                 <div class="title">Friends</div>
@@ -119,7 +125,8 @@
 
         </div>
 
-        <div class="profile-box groups" fxLayout="column">
+        <div class="profile-box groups" fxLayout="column"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
                 <div class="title">Joined Groups</div>
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.ts b/src/app/main/content/pages/profile/tabs/about/about.component.ts
index 0722a70c..7bfd816a 100644
--- a/src/app/main/content/pages/profile/tabs/about/about.component.ts
+++ b/src/app/main/content/pages/profile/tabs/about/about.component.ts
@@ -1,10 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { ProfileService } from '../../profile.service';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-profile-about',
     templateUrl: './about.component.html',
-    styleUrls  : ['./about.component.scss']
+    styleUrls  : ['./about.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseProfileAboutComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
index 59148e23..e491a242 100644
--- a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
+++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
@@ -1,12 +1,14 @@
-<div id="photos-videos" class="p-24">
+<div id="photos-videos" class="p-24" *fuseIfOnDom [@animateStagger]="{value:'50'}">
     <div class="period" *ngFor="let period of photosVideos">
+
         <div class="period-title">
             <span class="name">{{period.name}}</span>
             <span class="info">{{period.info}}</span>
         </div>
 
         <div class="period-media" fxLayout="row" fxLayoutWrap>
-            <div class="media" *ngFor="let media of period.media">
+            <div class="media" *ngFor="let media of period.media"
+                 [@animate]="{value:'*',params:{y:'100%'}}">
                 <img class="preview" [src]="media.preview" title="{{media.title}}">
                 <div class="title">{{media.title}}</div>
             </div>
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
index 1fc43f84..df1f26c2 100644
--- a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
+++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
@@ -1,11 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 
 import { ProfileService } from '../../profile.service';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-profile-photos-videos',
     templateUrl: './photos-videos.component.html',
-    styleUrls  : ['./photos-videos.component.scss']
+    styleUrls  : ['./photos-videos.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseProfilePhotosVideosComponent implements OnInit
 {
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
index 95060737..b717a0c5 100644
--- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
+++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
@@ -1,9 +1,11 @@
 <div id="timeline" class="p-24" fxLayout="row" fxLayoutWrap>
 
     <div class="timeline-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="55" fxFlex.gt-md="65" fxFlexOrder="2"
-         fxFlexOrder.gt-sm="1">
+         fxFlexOrder.gt-sm="1"
+         *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
-        <div class="profile-box add-post">
+        <div class="profile-box add-post"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <div class="form" fxFlex>
 
@@ -36,7 +38,8 @@
 
         <md-divider></md-divider>
 
-        <div class="timeline-item" *ngFor="let post of timeline.posts">
+        <div class="timeline-item" *ngFor="let post of timeline.posts"
+             [@animate]="{value:'*',params:{y:'100%'}}">
 
             <header fxLayout="row" fxLayoutAlign="space-between start">
                 <div class="user" fxLayout="row" fxLayoutAlign="start center">
@@ -135,7 +138,9 @@
     <div class="timeline-sidebar" fxLayout="column" fxFlex="100" fxFlex.gt-sm="45" fxFlex.gt-md="35" fxFlexOrder="1"
          fxFlexOrder.gt-sm="2">
 
-        <div class="profile-box latest-activity" fxLayout="column">
+        <div class="profile-box latest-activity" fxLayout="column"
+             *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'100%'}}">
+
             <header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
                 <div class="title">Latest Activity</div>
                 <div class="more secondary-text">See All</div>
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
index 9bb32d2d..69bffa7c 100644
--- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
+++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
@@ -1,10 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { ProfileService } from '../../profile.service';
+import { fuseAnimations } from '../../../../../../core/animations';
 
 @Component({
     selector   : 'fuse-profile-timeline',
     templateUrl: './timeline.component.html',
-    styleUrls  : ['./timeline.component.scss']
+    styleUrls  : ['./timeline.component.scss'],
+    animations : fuseAnimations
 })
 export class FuseProfileTimelineComponent implements OnInit
 {

From 098dacf2a5586c95f6695bdbb7cc2d4493e297e9 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 15:13:27 +0300
Subject: [PATCH 16/27] removed console warn

---
 src/app/core/components/navigation/navigation.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/core/components/navigation/navigation.component.ts b/src/app/core/components/navigation/navigation.component.ts
index 837363dc..a812cd0c 100644
--- a/src/app/core/components/navigation/navigation.component.ts
+++ b/src/app/core/components/navigation/navigation.component.ts
@@ -20,7 +20,6 @@ export class FuseNavigationComponent implements OnDestroy
         this.navigationModelChangeSubscription =
             this.fuseNavigationService.onNavigationModelChange
                 .subscribe((navigationModel) => {
-                    console.warn(navigationModel);
                     this.navigationModel = navigationModel;
                 });
     }

From e5cf4fdafb536dbb902505833ecb078bfa8382dd Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 15:54:11 +0300
Subject: [PATCH 17/27] demo component and service page updates

---
 .../components/navigation/navigation.service.ts   |  2 +-
 .../navigation/navigation.component.html          | 15 +++++++++++----
 .../content/services/config/config.component.html |  9 +++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/app/core/components/navigation/navigation.service.ts b/src/app/core/components/navigation/navigation.service.ts
index 8a8e06d0..b468ec37 100644
--- a/src/app/core/components/navigation/navigation.service.ts
+++ b/src/app/core/components/navigation/navigation.service.ts
@@ -49,7 +49,7 @@ export class FuseNavigationService
     {
         if ( !navigationItems )
         {
-            navigationItems = this.navigationModel;
+            navigationItems = this.navigationModel.model;
         }
 
         for ( const navItem of navigationItems )
diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/content/components/navigation/navigation.component.html
index 609ae677..a3cd935c 100644
--- a/src/app/main/content/components/navigation/navigation.component.html
+++ b/src/app/main/content/components/navigation/navigation.component.html
@@ -50,13 +50,20 @@
         </div>
 
         <div class="my-48">
-            <h3>Header</h3>
+            <h3>Grouping</h3>
             <p class="md-grey-200-bg py-8">
                 <fuse-hljs lang="json" class="source-code">
                     <textarea #source hidden="hidden">
                         {
                             'title': 'COMPONENTS',
-                            'type' : 'subheader'
+                            'type' : 'group',
+                            'children': [
+                                {
+                                    'title': 'ngx-datatable',
+                                    'type' : 'item',
+                                    'url'  : '/components/datatables/ngx-datatable'
+                                }
+                            ]
                         },
                     </textarea>
                 </fuse-hljs>
@@ -70,7 +77,7 @@
                     <textarea #source hidden="hidden">
                         {
                             'title'   : 'Datatables',
-                            'type'    : 'nav-collapse',
+                            'type'    : 'collapse',
                             'icon'    : 'border_all',
                             'children': [
                                 {
@@ -92,7 +99,7 @@
                     <textarea #source hidden="hidden">
                         {
                             'title': 'Countdown',
-                            'type' : 'nav-item',
+                            'type' : 'item',
                             'icon' : 'settings_input_component',
                             'url'  : '/components/countdown'
                         },
diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/content/services/config/config.component.html
index 485e9282..775cce06 100644
--- a/src/app/main/content/services/config/config.component.html
+++ b/src/app/main/content/services/config/config.component.html
@@ -45,14 +45,15 @@
                                 // Fully customizable surroundings for this particular component
                                 this.fuseConfig.setSettings({
                                     layout          : {
-                                        navigation: 'left',   // 'right', 'left', 'top', none
-                                        toolbar   : 'below',  // 'above', 'below', none
-                                        footer    : 'none'    // 'above', 'below', none
+                                        navigation: 'left',      // 'right', 'left', 'top', none
+                                        toolbar   : 'below',     // 'above', 'below', none
+                                        footer    : 'none'       // 'above', 'below', none
+                                        mode      : 'fullwidth'  // 'boxed', 'fullwidth'
                                     },
                                     colorClasses    : {
                                         toolbar: 'md-white-500-bg',
                                         navbar : 'md-fuse-dark-500-bg',
-                                        footer : 'md-fuse-dark-800-bg'
+                                        footer : 'md-fuse-dark-700-bg'
                                     },
                                     customScrollbars: true,
                                     routerAnimation : 'fadeIn'

From 19c85c964bdaa9e32d313c64a03779c19fc27aca Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 21 Sep 2017 15:54:25 +0300
Subject: [PATCH 18/27] updated the version number to 1.0.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 946b61a1..ec276783 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse2",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a54b30a8..abb7c72d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse2",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "license": "",
   "scripts": {
     "ng": "ng",

From 671287b55a0a572f799f415404caa3184e46ff3a Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Thu, 21 Sep 2017 19:03:19 +0300
Subject: [PATCH 19/27] Reverting the sidenav fixes..

---
 .../core/scss/partials/_angular-material-fix.scss | 15 +--------------
 src/app/core/scss/partials/_page-layouts.scss     |  4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/app/core/scss/partials/_angular-material-fix.scss b/src/app/core/scss/partials/_angular-material-fix.scss
index ca87b3c9..437fe6ac 100644
--- a/src/app/core/scss/partials/_angular-material-fix.scss
+++ b/src/app/core/scss/partials/_angular-material-fix.scss
@@ -8,11 +8,6 @@
 md-sidenav-container {
 
     md-sidenav {
-        order: 1;
-
-        &.md-is-locked-open {
-            position: relative !important;
-        }
 
         &.md-stop-transition {
             transition: none !important;
@@ -28,26 +23,18 @@ md-sidenav-container {
 
             &.mat-drawer-side {
 
-                &.md-is-locked-open {
-                    position: relative !important;
-                }
-
                 ~ .mat-sidenav-content,
                 ~ .mat-drawer-content {
                     transition: none !important;
-                    margin-left: 0 !important;
-                    margin-right: 0 !important;
                     transform: translate3d(0, 0, 0) !important;
                 }
             }
         }
 
         &.mat-drawer-end {
-            order: 3;
         }
     }
 
     .mat-drawer-content {
-        order: 2;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss
index 0ce92f09..5abc20e8 100644
--- a/src/app/core/scss/partials/_page-layouts.scss
+++ b/src/app/core/scss/partials/_page-layouts.scss
@@ -336,8 +336,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
 
             > md-sidenav-container {
                 display: flex;
-                // flex-direction: column;
-                flex-direction: row;
+                flex-direction: column;
+                //flex-direction: row;
                 flex: 1;
                 background: none;
                 z-index: 2;

From 236cf1eb063fb89d43b34ef9df705a21d732e2f2 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 11:32:08 +0300
Subject: [PATCH 20/27] renamed the HMR starting scripts + modified the build
 scripts to use more memory. If you are having `out of memory` issues while
 building, use these scripts

---
 package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index abb7c72d..b17493de 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,10 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "hmr": "ng serve --hmr -e=hmr -sm=false",
-    "hmrs": "ng serve --hmr -e=hmr",
-    "build": "ng build",
+    "start-hmr": "ng serve --hmr -e=hmr -sm=false",
+    "start-hmr-sourcemaps": "ng serve --hmr -e=hmr",
+    "build": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build",
+    "build-prod": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

From 678dde8c0e0c0f3226634eb87afc3ab90b64edf7 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 11:32:31 +0300
Subject: [PATCH 21/27] calendar, mail and todo tweaks

---
 .../apps/calendar/calendar.component.scss     |   8 +-
 .../mail-list-item.component.html             |  97 +++++++------
 .../mail-list-item.component.scss             | 133 +++++++++---------
 .../content/apps/mail/mail.component.html     |   2 +-
 .../content/apps/mail/mail.component.scss     |  12 ++
 .../todo/todo-list/todo-list.component.scss   |   6 -
 .../content/apps/todo/todo.component.html     |   4 +-
 .../content/apps/todo/todo.component.scss     |   9 ++
 8 files changed, 154 insertions(+), 117 deletions(-)

diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
index 626b6b85..a525f698 100644
--- a/src/app/main/content/apps/calendar/calendar.component.scss
+++ b/src/app/main/content/apps/calendar/calendar.component.scss
@@ -26,8 +26,8 @@
     }
 
     .cal-open-day-events {
-        background: whitesmoke;
-        box-shadow: inset 0 0 15px 0 rgba(0, 0, 0, 0.13);
+        background: #455A64;
+        box-shadow: inset 0 0 12px 0 rgba(0, 0, 0, 0.54);
         padding: 0;
         display: flex;
         flex-direction: column;
@@ -44,11 +44,11 @@
             transition: box-shadow 300ms ease;
 
             &:first-of-type {
-                margin-top: 24px;
+                margin-top: 16px;
             }
 
             &:last-of-type {
-                margin-bottom: 24px;
+                margin-bottom: 16px;
             }
 
             &:hover {
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
index 59a8858d..1f5b486e 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
+++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
@@ -1,52 +1,67 @@
 <div fxLayout="row" fxLayoutAlign="start center">
 
-    <md-checkbox [(ngModel)]="selected" (ngModelChange)="onSelectedChange()" (click)="$event.stopPropagation();"></md-checkbox>
+    <md-checkbox [(ngModel)]="selected" (ngModelChange)="onSelectedChange()"
+                 (click)="$event.stopPropagation();"></md-checkbox>
 
     <div class="info" fxFlex FlexLayout="column">
 
-        <div class="name" fxLayout="row" fxLayoutAlign="start center">
+        <div class="row-1" fxLayout="row" fxLayoutAlign="start center">
 
-            <img class="avatar" *ngIf="mail.from?.avatar" alt="{{mail.from?.name}}" src="{{mail.from?.avatar}}"/>
-
-            <div class="avatar" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
-
-            <span class="text-truncate" *ngIf="mail?.from">{{mail.from?.name}}</span>
-
-            <md-icon *ngIf="mail.hasAttachments">attachment</md-icon>
-        </div>
-
-        <div class="subject text-truncate">
-            {{mail.subject}}
-        </div>
-
-        <div class="message text-truncate" *ngIf="mail?.message">
-
-            {{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
-        </div>
-
-        <div class="labels" fxLayout="row" fxLayoutWrap>
-            <div class="label" *ngFor="let labelId of mail.labels"
-                 fxLayout="row" fxLayoutAlign="start center">
-                <div class="label-color" [ngStyle]="{'background-color': labels | getById:labelId:'color'}"></div>
-                <div class="label-title">{{labels | getById:labelId:'title'}}</div>
+            <div class="name" fxLayout="row" fxLayoutAlign="start center" fxFlex>
+                <img class="avatar" *ngIf="mail.from?.avatar" alt="{{mail.from?.name}}" src="{{mail.from?.avatar}}"/>
+                <div class="avatar" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
+                <span class="text-truncate" *ngIf="mail?.from">{{mail.from?.name}}</span>
+                <md-icon *ngIf="mail.hasAttachments">attachment</md-icon>
             </div>
+
+            <div fxLayout="row" fxLayoutAlign="start center">
+
+                <div class="time">{{mail.time}}</div>
+
+                <!--<div class="actions" fxLayout="row" fxLayoutAlign="start center" fxHide fxShow.gt-sm>
+
+                    <button md-button class="mat-icon-button" (click)="toggleStar($event)" aria-label="Toggle star">
+                        <md-icon *ngIf="mail.starred">star</md-icon>
+                        <md-icon *ngIf="!mail.starred">star_outline</md-icon>
+                    </button>
+
+                    <button md-button class="mat-icon-button" (click)="toggleImportant($event)"
+                            aria-label="Toggle important">
+                        <md-icon *ngIf="mail.important">label</md-icon>
+                        <md-icon *ngIf="!mail.important">label_outline</md-icon>
+                    </button>
+
+                </div>-->
+
+            </div>
+
         </div>
+
+        <div class="row-2" fxLayout="row" fxLayoutAlign="start center">
+
+            <div fxLayout="column" fxLayoutAlign="start start">
+
+                <div class="subject text-truncate">
+                    {{mail.subject}}
+                </div>
+
+                <div class="message text-truncate" *ngIf="mail?.message">
+                    {{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
+                </div>
+
+                <div class="labels" fxLayout="row" fxLayoutWrap fxHide fxShow.gt-sm>
+                    <div class="label" *ngFor="let labelId of mail.labels"
+                         fxLayout="row" fxLayoutAlign="start center">
+                        <div class="label-color"
+                             [ngStyle]="{'background-color': labels | getById:labelId:'color'}"></div>
+                        <div class="label-title">{{labels | getById:labelId:'title'}}</div>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+
     </div>
 
-    <div fxLayout="column" fxLayoutAlign="space-between end">
-
-        <div class="time">{{mail.time}}</div>
-
-        <div class="actions" fxLayout="row" fxLayoutAlign="start center">
-            <button md-button class="mat-icon-button" (click)="toggleStar($event)" aria-label="Toggle star">
-                <md-icon *ngIf="mail.starred">star</md-icon>
-                <md-icon *ngIf="!mail.starred">star_outline</md-icon>
-            </button>
-
-            <button md-button class="mat-icon-button" (click)="toggleImportant($event)" aria-label="Toggle important">
-                <md-icon *ngIf="mail.important">label</md-icon>
-                <md-icon *ngIf="!mail.important">label_outline</md-icon>
-            </button>
-        </div>
-    </div>
 </div>
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
index 0e58acde..45676aff 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
+++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
@@ -12,16 +12,19 @@
 
         .info {
 
-            .name,
-            .subject {
+            .name {
                 font-weight: 700;
             }
 
-            .message {
-            }
+            .row-2 {
 
-            .labels {
-                background: #FFFFFF;
+                .subject {
+                    font-weight: 700;
+                }
+
+                .labels {
+                    background: #FFFFFF;
+                }
             }
         }
     }
@@ -31,12 +34,11 @@
 
         .info {
 
-            .message {
+            .row-2 {
 
-            }
-
-            .labels {
-                background: #FFF8E1;
+                .labels {
+                    background: #FFF8E1;
+                }
             }
         }
     }
@@ -46,10 +48,11 @@
 
         .info {
 
-            .message {
-            }
-            .labels {
-                background: #E3F2FD;
+            .row-2 {
+
+                .labels {
+                    background: #E3F2FD;
+                }
             }
         }
     }
@@ -57,68 +60,70 @@
     .info {
         overflow: hidden;
         width: 0;
-        margin: 0 16px;
+        margin-left: 16px;
         position: relative;
 
-        .name {
-            font-size: 15px;
-            font-weight: 500;
-            padding-bottom: 8px;
+        .row-1 {
+            margin-bottom: 8px;
 
-            .avatar {
-                min-width: 32px;
-                width: 32px;
-                height: 32px;
-                line-height: 32px;
-                background-color: mat-color($accent);
+            .name {
+                font-size: 15px;
+                font-weight: 500;
+
+                .avatar {
+                    min-width: 32px;
+                    width: 32px;
+                    height: 32px;
+                    line-height: 32px;
+                    background-color: mat-color($accent);
+                }
+            }
+
+            .actions {
+                margin-left: 4px;
+
+                .mat-icon-button {
+                    width: 32px;
+                    height: 32px;
+                    line-height: 1;
+                }
             }
         }
 
-        .subject {
+        .row-2 {
 
-        }
+            .subject,
+            .message {
+                width: 100%;
+            }
 
-        .message {
-            position: relative;
-            color: rgba(0, 0, 0, 0.54);
-        }
+            .message {
+                position: relative;
+                color: rgba(0, 0, 0, 0.54);
+            }
 
-        .labels {
-            position: absolute;
-            background: #FAFAFA;
-            bottom: 0;
-            right: 0;
-            padding-left: 6px;
+            .labels {
+                position: absolute;
+                background: #FFFFFF;
+                bottom: 0;
+                right: 0;
+                padding-left: 6px;
 
-            .label {
-                font-size: 11px;
-                border-radius: 2px;
-                margin: 0 4px 0 0;
-                padding: 3px 8px;
-                background-color: rgba(0, 0, 0, 0.08);
+                .label {
+                    font-size: 11px;
+                    border-radius: 2px;
+                    margin: 0 4px 0 0;
+                    padding: 3px 8px;
+                    background-color: rgba(0, 0, 0, 0.08);
 
-                .label-color {
-                    width: 8px;
-                    height: 8px;
-                    margin-right: 8px;
-                    border-radius: 50%;
+                    .label-color {
+                        width: 8px;
+                        height: 8px;
+                        margin-right: 8px;
+                        border-radius: 50%;
+                    }
                 }
             }
         }
     }
-
-    .time {
-        margin: 0 8px 6px 8px;
-    }
-
-    .actions {
-
-        .md-icon-button {
-            margin: 0;
-            padding: 0;
-            width: 32px;
-            height: 32px;
-        }
-    }
-
 }
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index 1f516acd..fd95af52 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -42,7 +42,7 @@
                 <!-- CONTENT TOOLBAR -->
                 <div class="toolbar px-24 py-8">
 
-                    <div fxFlex="row" fxLayoutAlign="start center">
+                    <div class="mail-selection" fxFlex="row" fxLayoutAlign="start center">
                         <md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedMails"
                                      [indeterminate]="isIndeterminate"></md-checkbox>
 
diff --git a/src/app/main/content/apps/mail/mail.component.scss b/src/app/main/content/apps/mail/mail.component.scss
index b29cdab3..9a355577 100644
--- a/src/app/main/content/apps/mail/mail.component.scss
+++ b/src/app/main/content/apps/mail/mail.component.scss
@@ -40,6 +40,10 @@
 
             @include media-breakpoint(xs) {
 
+                fuse-mail-list {
+                    border-right: none;
+                }
+
                 fuse-mail-list,
                 fuse-mail-details {
                     flex: 1 0 100%;
@@ -51,6 +55,14 @@
 
                 &.current-mail-selected {
 
+                    .toolbar {
+                        padding-left: 16px !important;
+
+                        .mail-selection {
+                            display: none !important;
+                        }
+                    }
+
                     .content {
 
                         fuse-mail-list {
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.scss b/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
index 676c4aa9..8fb43255 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
+++ b/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
@@ -5,10 +5,4 @@
     overflow-y: auto;
     position: relative;
     padding: 0;
-    border-right: 1px solid rgba(0, 0, 0, .12);
 }
-
-.todo-list {
-
-}
-
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
index fd447bbc..d0526557 100644
--- a/src/app/main/content/apps/todo/todo.component.html
+++ b/src/app/main/content/apps/todo/todo.component.html
@@ -41,7 +41,8 @@
 
                 <!-- CONTENT TOOLBAR -->
                 <div class="toolbar px-24 py-8">
-                    <div fxFlex="row" fxLayoutAlign="start center">
+
+                    <div class="todo-selection" fxFlex="row" fxLayoutAlign="start center">
                         <md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedTodos"
                                      [indeterminate]="isIndeterminate"></md-checkbox>
 
@@ -76,6 +77,7 @@
                             <md-icon>arrow_back</md-icon>
                         </button>
                     </div>
+
                 </div>
                 <!-- / CONTENT TOOLBAR -->
 
diff --git a/src/app/main/content/apps/todo/todo.component.scss b/src/app/main/content/apps/todo/todo.component.scss
index 219ab321..903a75e5 100644
--- a/src/app/main/content/apps/todo/todo.component.scss
+++ b/src/app/main/content/apps/todo/todo.component.scss
@@ -36,6 +36,7 @@
         }
 
         .content-card {
+
             @include media-breakpoint-down(lg) {
 
                 fuse-todo-list,
@@ -49,6 +50,14 @@
 
                 &.current-todo-selected {
 
+                    .toolbar {
+                        padding-left: 16px !important;
+
+                        .todo-selection {
+                            display: none !important;
+                        }
+                    }
+
                     .content {
 
                         fuse-todo-list {

From 5ace09f78245fddf09dae1c688d7cd4d8cd228ba Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Fri, 22 Sep 2017 12:03:21 +0300
Subject: [PATCH 22/27] Calendar, Contacts, Mail, Scrumboard apps responsive
 refinements, + temporary fix for md-sidenav-locked transition

---
 .../md-sidenav-helper.directive.ts            |  16 +-
 .../scss/partials/_angular-material-fix.scss  |   3 +-
 .../apps/calendar/calendar.component.html     |   3 +-
 .../apps/calendar/calendar.component.scss     |  17 +-
 .../event-form/event-form.component.html      | 239 +++---
 .../event-form/event-form.component.scss      |  13 +-
 .../contact-form/contact-form.component.html  | 240 +++---
 .../contact-form/contact-form.component.scss  |  16 +-
 .../contact-list/contact-list.component.html  |   6 -
 .../contact-list/contact-list.component.scss  |   3 +-
 .../contact-list/contact-list.component.ts    |  24 +-
 .../apps/contacts/contacts.component.html     |  13 +-
 .../apps/contacts/contacts.component.scss     |   7 +
 .../apps/contacts/contacts.component.ts       |  32 +-
 .../dialogs/compose/compose.component.html    | 174 ++--
 .../dialogs/compose/compose.component.scss    |  13 +-
 .../board/dialogs/card/card.component.html    | 784 +++++++++---------
 .../board/dialogs/card/card.component.scss    |  11 +-
 18 files changed, 827 insertions(+), 787 deletions(-)

diff --git a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
index ca6fa6af..f0ad7ab4 100644
--- a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
+++ b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, Input, OnInit, HostListener, OnDestroy, HostBinding, AfterViewInit } from '@angular/core';
+import { Directive, Input, OnInit, HostListener, OnDestroy, HostBinding } from '@angular/core';
 import { MdSidenav } from '@angular/material';
 import { FuseMdSidenavHelperService } from 'app/core/directives/md-sidenav-helper/md-sidenav-helper.service';
 import { FuseMatchMedia } from '../../services/match-media.service';
@@ -8,7 +8,7 @@ import { Subscription } from 'rxjs/Subscription';
 @Directive({
     selector: '[fuseMdSidenavHelper]'
 })
-export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDestroy
+export class FuseMdSidenavHelperDirective implements OnInit, OnDestroy
 {
     matchMediaSubscription: Subscription;
 
@@ -38,6 +38,7 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
                 this.mdSidenav.mode = 'side';
                 this.mdSidenav.open();
             });
+            this.stopTransition = false;
         }
         else
         {
@@ -46,6 +47,10 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
                 this.mdSidenav.mode = 'over';
                 this.mdSidenav.close();
             });
+
+            setTimeout(() => {
+                this.stopTransition = false;
+            }, 3000);
         }
 
         this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => {
@@ -69,13 +74,6 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
 
     }
 
-    ngAfterViewInit()
-    {
-        setTimeout(() => {
-            this.stopTransition = false;
-        }, 300);
-    }
-
     ngOnDestroy()
     {
         this.matchMediaSubscription.unsubscribe();
diff --git a/src/app/core/scss/partials/_angular-material-fix.scss b/src/app/core/scss/partials/_angular-material-fix.scss
index 437fe6ac..5a4cb7df 100644
--- a/src/app/core/scss/partials/_angular-material-fix.scss
+++ b/src/app/core/scss/partials/_angular-material-fix.scss
@@ -9,9 +9,10 @@ md-sidenav-container {
 
     md-sidenav {
 
-        &.md-stop-transition {
+        &[md-is-locked-open].md-stop-transition {
             transition: none !important;
             transform: translate3d(0, 0, 0) !important;
+            opacity: 0;
 
             ~ .mat-sidenav-content,
             ~ .mat-drawer-content {
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index 6f7969e7..0e04352d 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,6 +1,7 @@
 <div id="calendar" class="page-layout simple fullwidth" fusePerfectScrollbar>
+
     <!-- HEADER -->
-    <div class="header" [ngClass]="viewDate | date:'MMM'">
+    <div class="header p-16 p-sm-24" [ngClass]="viewDate | date:'MMM'">
 
         <div class="header-content" fxLayout="column" fxLayoutAlign="space-between">
 
diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
index a525f698..4fc3c6a2 100644
--- a/src/app/main/content/apps/calendar/calendar.component.scss
+++ b/src/app/main/content/apps/calendar/calendar.component.scss
@@ -26,8 +26,8 @@
     }
 
     .cal-open-day-events {
-        background: #455A64;
-        box-shadow: inset 0 0 12px 0 rgba(0, 0, 0, 0.54);
+        background: whitesmoke;
+        box-shadow: inset 0 0 15px 0 rgba(0, 0, 0, 0.13);
         padding: 0;
         display: flex;
         flex-direction: column;
@@ -44,11 +44,11 @@
             transition: box-shadow 300ms ease;
 
             &:first-of-type {
-                margin-top: 16px;
+                margin-top: 24px;
             }
 
             &:last-of-type {
-                margin-bottom: 16px;
+                margin-bottom: 24px;
             }
 
             &:hover {
@@ -184,12 +184,13 @@
 
 #calendar {
     background: #FFFFFF;
+    overflow-x: hidden;
+    overflow-y: auto;
 
     .header {
         height: 200px;
         min-height: 200px;
         max-height: 200px;
-        padding: 24px;
         position: relative;
         background-size: 100% auto;
         background-position: 0 50%;
@@ -197,6 +198,12 @@
         background-color: #FAFAFA;
         color: #FFFFFF;
 
+        @include media-breakpoint(xs) {
+            height: 164px;
+            min-height: 164px;
+            max-height: 164px;
+        }
+
         &:before {
             content: '';
             position: absolute;
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
index 60270d72..3adb7c31 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html
@@ -1,95 +1,98 @@
-<md-toolbar md-dialog-title class="mat-accent m-0">
-    <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
-        <span class="title dialog-title">{{dialogTitle}}</span>
-        <button md-button class="mat-icon-button"
-                (click)="dialogRef.close()"
-                aria-label="Close dialog">
-            <md-icon>close</md-icon>
-        </button>
-    </div>
-</md-toolbar>
-
-<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
-
-    <form name="eventForm" [formGroup]="eventForm" class="event-form" fxLayout="column" fxFlex>
-
-        <md-input-container>
-            <input mdInput
-                   name="title"
-                   formControlName="title"
-                   placeholder="Title"
-                   required>
-        </md-input-container>
-
-        <div class="py-16" fxFlex="1 0 auto" fxLayout="row">
-            <md-slide-toggle
-                name="allDay"
-                formControlName="allDay"
-                class="mr-24"
-                aria-label="All day">
-                All Day
-            </md-slide-toggle>
+<div class="dialog-content-wrapper">
+    <md-toolbar md-dialog-title class="mat-accent m-0">
+        <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
+            <span class="title dialog-title">{{dialogTitle}}</span>
+            <button md-button class="mat-icon-button"
+                    (click)="dialogRef.close()"
+                    aria-label="Close dialog">
+                <md-icon>close</md-icon>
+            </button>
         </div>
+    </md-toolbar>
 
-        <div class="py-16" fxFlex="1 0 auto" fxLayout="row" formGroupName="color">
-            <md-input-container class="mr-24">
+    <div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
+
+        <form name="eventForm" [formGroup]="eventForm" class="event-form w-100-p" fxLayout="column" fxFlex>
+
+            <md-input-container class="w-100-p">
                 <input mdInput
-                       name="primary color"
-                       formControlName="primary"
-                       placeholder="Primary color"
-                       [(colorPicker)]="event.color.primary"
-                       cpWidth="290px"
-                       [cpPresetColors]="presetColors"
-                       [style.background]="event.color.primary"
-                       (colorPickerChange)="event.color.primary = $event; eventForm.patchValue({color:{primary:$event}})"/>
+                       name="title"
+                       formControlName="title"
+                       placeholder="Title"
+                       required>
             </md-input-container>
-            <md-input-container>
+
+            <div class="py-16" fxFlex="1 0 auto" fxLayout="row">
+                <md-slide-toggle
+                    name="allDay"
+                    formControlName="allDay"
+                    class="mr-24"
+                    aria-label="All day">
+                    All Day
+                </md-slide-toggle>
+            </div>
+
+            <div class="py-16" fxFlex="1 0 auto" fxLayout="row" formGroupName="color">
+                <md-input-container class="mr-24" fxFlex>
+                    <input mdInput
+                           name="primary color"
+                           formControlName="primary"
+                           placeholder="Primary color"
+                           [(colorPicker)]="event.color.primary"
+                           cpWidth="290px"
+                           [cpPresetColors]="presetColors"
+                           [style.background]="event.color.primary"
+                           (colorPickerChange)="event.color.primary = $event; eventForm.patchValue({color:{primary:$event}})"/>
+                </md-input-container>
+                <md-input-container fxFlex>
+                    <input mdInput
+                           name="secondary color"
+                           formControlName="secondary"
+                           placeholder="Secondary color"
+                           [(colorPicker)]="event.color.secondary"
+                           cpWidth="290px"
+                           [cpPresetColors]="presetColors"
+                           [style.background]="event.color.secondary"
+                           (colorPickerChange)="event.color.secondary = $event; eventForm.patchValue({color:{secondary:$event}})"/>
+                </md-input-container>
+            </div>
+
+            <div fxFlex="1 0 auto" fxLayout="row">
+
+                <md-form-field class="mr-24" fxFlex>
+                    <input mdInput [mdDatepicker]="startDatePicker" placeholder="Start Date">
+                    <md-datepicker-toggle mdSuffix [for]="startDatePicker"></md-datepicker-toggle>
+                    <md-datepicker #startDatePicker></md-datepicker>
+                </md-form-field>
+
+                <md-input-container class="no-errors-spacer" fxFlex md-no-float>
+                    <input mdInput ng-model="calendarEvent.startTime" placeholder="Start Time">
+                </md-input-container>
+
+            </div>
+
+            <div fxFlex="1 0 auto" fxLayout="row">
+
+                <md-form-field class="mr-24" fxFlex>
+                    <input mdInput [mdDatepicker]="endDatePicker" placeholder="End Date">
+                    <md-datepicker-toggle mdSuffix [for]="endDatePicker"></md-datepicker-toggle>
+                    <md-datepicker #endDatePicker></md-datepicker>
+                </md-form-field>
+
+                <md-input-container class="no-errors-spacer" fxFlex md-no-float>
+                    <input mdInput ng-model="calendarEvent.endTime" placeholder="End Time">
+                </md-input-container>
+
+            </div>
+
+            <md-input-container formGroupName="meta" class="w-100-p">
                 <input mdInput
-                       name="secondary color"
-                       formControlName="secondary"
-                       placeholder="Secondary color"
-                       [(colorPicker)]="event.color.secondary"
-                       cpWidth="290px"
-                       [cpPresetColors]="presetColors"
-                       [style.background]="event.color.secondary"
-                       (colorPickerChange)="event.color.secondary = $event; eventForm.patchValue({color:{secondary:$event}})"/>
-            </md-input-container>
-        </div>
-
-        <div fxFlex="1 0 auto" fxLayout="row">
-
-            <md-form-field class="mr-24">
-                <input mdInput [mdDatepicker]="startDatePicker" placeholder="Start Date">
-                <md-datepicker-toggle mdSuffix [for]="startDatePicker"></md-datepicker-toggle>
-                <md-datepicker #startDatePicker></md-datepicker>
-            </md-form-field>
-
-            <md-datepicker #startDatePicker></md-datepicker>
-
-        </div>
-
-        <div fxFlex="1 0 auto" fxLayout="row">
-
-            <md-form-field class="mr-24">
-                <input mdInput [mdDatepicker]="endDatePicker" placeholder="End Date">
-                <md-datepicker-toggle mdSuffix [for]="endDatePicker"></md-datepicker-toggle>
-                <md-datepicker #endDatePicker></md-datepicker>
-            </md-form-field>
-
-            <md-input-container class="no-errors-spacer" flex md-no-float>
-                <input mdInput ng-model="calendarEvent.endTime" placeholder="End Time">
+                       name="location"
+                       formControlName="location"
+                       placeholder="Location">
             </md-input-container>
 
-        </div>
-
-        <md-input-container formGroupName="meta">
-            <input mdInput
-                   name="location"
-                   formControlName="location"
-                   placeholder="Location">
-        </md-input-container>
-
-        <md-input-container formGroupName="meta">
+            <md-input-container formGroupName="meta" class="w-100-p">
 
             <textarea mdInput
                       formControlName="notes"
@@ -97,39 +100,39 @@
                       md-maxlength="250"
                       max-rows="4">
             </textarea>
-        </md-input-container>
+            </md-input-container>
 
-    </form>
-
-</div>
-
-<div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
-
-    <button *ngIf="action !=='edit'"
-            md-raised-button
-            (click)="dialogRef.close(eventForm)"
-            class="save-button mat-accent"
-            [disabled]="eventForm.invalid"
-            aria-label="SAVE">
-        SAVE
-    </button>
-
-    <button *ngIf="action ==='edit'"
-            md-raised-button
-            (click)="dialogRef.close(['save',eventForm])"
-            class="save-button mat-accent"
-            [disabled]="eventForm.invalid"
-            aria-label="SAVE">
-        SAVE
-    </button>
-
-    <button *ngIf="action ==='edit'"
-            md-button
-            class="mat-icon-button"
-            (click)="dialogRef.close(['delete',eventForm])"
-            aria-label="Delete"
-            md-tooltip="Delete">
-        <md-icon>delete</md-icon>
-    </button>
+        </form>
 
+    </div>
+
+    <div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
+
+        <button *ngIf="action !=='edit'"
+                md-raised-button
+                (click)="dialogRef.close(eventForm)"
+                class="save-button mat-accent"
+                [disabled]="eventForm.invalid"
+                aria-label="SAVE">
+            SAVE
+        </button>
+
+        <button *ngIf="action ==='edit'"
+                md-raised-button
+                (click)="dialogRef.close(['save',eventForm])"
+                class="save-button mat-accent"
+                [disabled]="eventForm.invalid"
+                aria-label="SAVE">
+            SAVE
+        </button>
+
+        <button *ngIf="action ==='edit'"
+                md-button
+                class="mat-icon-button"
+                (click)="dialogRef.close(['delete',eventForm])"
+                aria-label="Delete"
+                md-tooltip="Delete">
+            <md-icon>delete</md-icon>
+        </button>
+    </div>
 </div>
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.scss b/src/app/main/content/apps/calendar/event-form/event-form.component.scss
index b0e6b5e6..39481391 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.scss
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.scss
@@ -2,11 +2,12 @@
 
     .mat-dialog-container {
         padding: 0;
-        width: 720px;
+        width: 480px;
+    }
+
+    .dialog-content-wrapper {
+        max-height: 85vh;
+        display: flex;
+        flex-direction: column;
     }
 }
-
-:host {
-    display: flex;
-    flex-direction: column;
-}
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
index 3f5d83e7..66ba7464 100644
--- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
+++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
@@ -1,126 +1,128 @@
-<md-toolbar md-dialog-title class="mat-accent m-0">
-    <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
-        <span class="title dialog-title">{{dialogTitle}}</span>
-        <button md-button class="mat-icon-button"
-                (click)="dialogRef.close()"
-                aria-label="Close dialog">
-            <md-icon>close</md-icon>
-        </button>
+<div class="dialog-content-wrapper">
+    <md-toolbar md-dialog-title class="mat-accent m-0">
+        <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
+            <span class="title dialog-title">{{dialogTitle}}</span>
+            <button md-button class="mat-icon-button"
+                    (click)="dialogRef.close()"
+                    aria-label="Close dialog">
+                <md-icon>close</md-icon>
+            </button>
+        </div>
+
+        <md-toolbar-row class="toolbar-bottom py-8 py-sm-16" fxLayout="column" fxLayoutAlign="center center">
+            <img [src]="contact.avatar" class=" avatar contact-avatar huge"
+                 [alt]="contact.name"/>
+            <div class="contact-name">{{contact.name}}</div>
+        </md-toolbar-row>
+    </md-toolbar>
+
+    <div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
+
+        <form [formGroup]="contactForm">
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">account_circle</md-icon>
+                <md-input-container fxFlex>
+                    <input name="name" formControlName="name" placeholder="Name" mdInput required>
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12"></md-icon>
+                <md-input-container fxFlex>
+                    <input name="lastName" formControlName="lastName" placeholder="Lastname" mdInput>
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">star</md-icon>
+                <md-input-container fxFlex>
+                    <input name="nickname" formControlName="nickname" mdInput placeholder="Nickname">
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">phone</md-icon>
+                <md-input-container fxFlex>
+                    <input formControlName="phone" mdInput placeholder="Phone number">
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">email</md-icon>
+                <md-input-container fxFlex>
+                    <input name="email" formControlName="email" mdInput type="email" placeholder="Email">
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">domain</md-icon>
+                <md-input-container fxFlex>
+                    <input name="company" formControlName="company" mdInput placeholder="Company">
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">work</md-icon>
+                <md-input-container fxFlex>
+                    <input name="jobTitle" formControlName="jobTitle" mdInput placeholder="Job title">
+                </md-input-container>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-form-field class="mr-24" fxFlex>
+                    <input mdInput [mdDatepicker]="birthdayDatePicker" placeholder="Birthday">
+                    <md-datepicker-toggle mdSuffix [for]="birthdayDatePicker"></md-datepicker-toggle>
+                    <md-datepicker #birthdayDatePicker></md-datepicker>
+                </md-form-field>
+            </div>
+
+            <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">home</md-icon>
+                <md-input-container fxFlex>
+                    <input name="address" formControlName="address" mdInput placeholder="Address">
+                </md-input-container>
+            </div>
+
+            <div fxLayout="row" class="textarea-wrapper" fxLayoutAlign="start start">
+                <md-icon class="mr-12 mt-12">note</md-icon>
+                <md-input-container fxFlex>
+                    <textarea name="notes" formControlName="notes" placeholder="Notes" mdInput type="text" max-rows="4"></textarea>
+                </md-input-container>
+            </div>
+
+        </form>
+
     </div>
 
-    <md-toolbar-row class="toolbar-bottom" fxLayout="column" fxLayoutAlign="center center">
-        <img [src]="contact.avatar" class=" avatar contact-avatar huge"
-             [alt]="contact.name"/>
-        <div class="contact-name">{{contact.name}}</div>
-    </md-toolbar-row>
-</md-toolbar>
+    <div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
 
-<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
+        <button *ngIf="action !=='edit'"
+                md-raised-button
+                (click)="dialogRef.close(contactForm)"
+                class="save-button mat-accent"
+                [disabled]="contactForm.invalid"
+                aria-label="SAVE">
+            SAVE
+        </button>
 
-    <form [formGroup]="contactForm">
+        <button *ngIf="action ==='edit'"
+                md-raised-button
+                (click)="dialogRef.close(['save',contactForm])"
+                class="save-button mat-accent"
+                [disabled]="contactForm.invalid"
+                aria-label="SAVE">
+            SAVE
+        </button>
 
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">account_circle</md-icon>
-            <md-input-container fxFlex>
-                <input name="name" formControlName="name" placeholder="Name" mdInput required>
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12"></md-icon>
-            <md-input-container fxFlex>
-                <input name="lastName" formControlName="lastName" placeholder="Lastname" mdInput>
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">star</md-icon>
-            <md-input-container fxFlex>
-                <input name="nickname" formControlName="nickname" mdInput placeholder="Nickname">
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">phone</md-icon>
-            <md-input-container fxFlex>
-                <input formControlName="phone" mdInput placeholder="Phone number">
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">email</md-icon>
-            <md-input-container fxFlex>
-                <input name="email" formControlName="email" mdInput type="email" placeholder="Email">
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">domain</md-icon>
-            <md-input-container fxFlex>
-                <input name="company" formControlName="company" mdInput placeholder="Company">
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">work</md-icon>
-            <md-input-container fxFlex>
-                <input name="jobTitle" formControlName="jobTitle" mdInput placeholder="Job title">
-            </md-input-container>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-form-field class="mr-24" fxFlex>
-                <input mdInput [mdDatepicker]="birthdayDatePicker" placeholder="Birthday">
-                <md-datepicker-toggle mdSuffix [for]="birthdayDatePicker"></md-datepicker-toggle>
-                <md-datepicker #birthdayDatePicker></md-datepicker>
-            </md-form-field>
-        </div>
-
-        <div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">home</md-icon>
-            <md-input-container fxFlex>
-                <input name="address" formControlName="address" mdInput placeholder="Address">
-            </md-input-container>
-        </div>
-
-        <div fxLayout="row" class="textarea-wrapper" fxLayoutAlign="start start">
-            <md-icon class="mr-12 mt-12">note</md-icon>
-            <md-input-container fxFlex>
-                <textarea name="notes" formControlName="notes" placeholder="Notes" mdInput type="text" max-rows="4"></textarea>
-            </md-input-container>
-        </div>
-
-    </form>
-
-</div>
-
-<div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
-
-    <button *ngIf="action !=='edit'"
-            md-raised-button
-            (click)="dialogRef.close(contactForm)"
-            class="save-button mat-accent"
-            [disabled]="contactForm.invalid"
-            aria-label="SAVE">
-        SAVE
-    </button>
-
-    <button *ngIf="action ==='edit'"
-            md-raised-button
-            (click)="dialogRef.close(['save',contactForm])"
-            class="save-button mat-accent"
-            [disabled]="contactForm.invalid"
-            aria-label="SAVE">
-        SAVE
-    </button>
-
-    <button *ngIf="action ==='edit'"
-            md-button
-            class="mat-icon-button"
-            (click)="dialogRef.close(['delete',contactForm])"
-            aria-label="Delete"
-            md-tooltip="Delete">
-        <md-icon>delete</md-icon>
-    </button>
+        <button *ngIf="action ==='edit'"
+                md-button
+                class="mat-icon-button"
+                (click)="dialogRef.close(['delete',contactForm])"
+                aria-label="Delete"
+                md-tooltip="Delete">
+            <md-icon>delete</md-icon>
+        </button>
 
+    </div>
 </div>
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss b/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss
index 9ad953f9..c54abb3b 100644
--- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss
+++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss
@@ -3,14 +3,20 @@
     .mat-dialog-container {
         padding: 0;
         width: 400px;
+        overflow: hidden;
+
+        .mat-toolbar {
+            min-height: initial;
+        }
 
         .toolbar-bottom {
-            height: 200px;
+            height: auto;
         }
     }
-}
 
-:host {
-    display: flex;
-    flex-direction: column;
+    .dialog-content-wrapper {
+        max-height: 85vh;
+        display: flex;
+        flex-direction: column;
+    }
 }
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.html b/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
index 5e43e571..efc084d0 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
@@ -104,9 +104,3 @@
 </md-table>
 
 
-<!-- ADD CONTACT BUTTON -->
-<button md-fab class="md-accent-bg" id="add-contact-button" (click)="newContact()" aria-label="add contact"
-        *fuseIfOnDom [@animate]="{value:'*', params:{delay:'300ms',scale:'.2'}}">
-    <md-icon>person_add</md-icon>
-</button>
-<!-- / ADD CONTACT BUTTON -->
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
index 78fd80ee..69281698 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
@@ -8,7 +8,7 @@
         box-shadow: none;
 
         .mat-column-checkbox {
-            flex: 0 1 64px;
+            flex: 0 1 48px;
         }
 
         .mat-column-avatar {
@@ -22,6 +22,7 @@
         .mat-row {
             position: relative;
             cursor: pointer;
+            padding-right: 8px;
 
             .mat-cell {
                 min-width: 0;
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
index cc0e8287..671554a7 100644
--- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
+++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
@@ -12,7 +12,7 @@ import { fuseAnimations } from '../../../../../core/animations';
     selector   : 'fuse-contacts-contact-list',
     templateUrl: './contact-list.component.html',
     styleUrls  : ['./contact-list.component.scss'],
-    animations   : fuseAnimations
+    animations : fuseAnimations
 })
 export class FuseContactsContactListComponent implements OnInit
 {
@@ -63,28 +63,6 @@ export class FuseContactsContactListComponent implements OnInit
         this.dataSource = new FilesDataSource(this.contactsService);
     }
 
-    newContact()
-    {
-        this.dialogRef = this.dialog.open(FuseContactsContactFormDialogComponent, {
-            panelClass: 'contact-form-dialog',
-            data      : {
-                action: 'new'
-            }
-        });
-
-        this.dialogRef.afterClosed()
-            .subscribe((response: FormGroup) => {
-                if ( !response )
-                {
-                    return;
-                }
-
-                this.contactsService.updateContact(response.getRawValue());
-
-            });
-
-    }
-
     editContact(contact)
     {
         this.dialogRef = this.dialog.open(FuseContactsContactFormDialogComponent, {
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 4df1bda9..070a1272 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -1,7 +1,7 @@
-<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" fusePerfectScrollbar>
+<div id="contacts" class="page-layout simple left-sidenav inner-sidenav">
 
     <!-- HEADER -->
-    <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="start start"
+    <div class="header md-accent-bg p-16 p-sm-24" fxLayout="column" fxLayoutAlign="start start"
          fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
 
         <!-- APP TITLE -->
@@ -51,7 +51,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24 pr-sm-92" fusePerfectScrollbar>
+        <div class="center p-24 pb-56 pr-sm-92" fusePerfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content md-white-bg mat-elevation-z4">
@@ -67,3 +67,10 @@
     </md-sidenav-container>
 
 </div>
+
+<!-- ADD CONTACT BUTTON -->
+<button md-fab class="md-accent-bg" id="add-contact-button" (click)="newContact()" aria-label="add contact"
+        *fuseIfOnDom [@animate]="{value:'*', params:{delay:'300ms',scale:'.2'}}">
+    <md-icon>person_add</md-icon>
+</button>
+<!-- / ADD CONTACT BUTTON -->
diff --git a/src/app/main/content/apps/contacts/contacts.component.scss b/src/app/main/content/apps/contacts/contacts.component.scss
index f191fe58..4662a5d2 100644
--- a/src/app/main/content/apps/contacts/contacts.component.scss
+++ b/src/app/main/content/apps/contacts/contacts.component.scss
@@ -4,3 +4,10 @@
         overflow: hidden;
     }
 }
+#add-contact-button {
+    position: absolute;
+    bottom: 12px;
+    right: 12px;
+    padding: 0;
+    z-index: 99;
+}
\ No newline at end of file
diff --git a/src/app/main/content/apps/contacts/contacts.component.ts b/src/app/main/content/apps/contacts/contacts.component.ts
index 68c708a1..381bc742 100644
--- a/src/app/main/content/apps/contacts/contacts.component.ts
+++ b/src/app/main/content/apps/contacts/contacts.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ContactsService } from './contacts.service';
 import { fuseAnimations } from '../../../../core/animations';
-import { FormControl } from '@angular/forms';
+import { FormControl, FormGroup } from '@angular/forms';
+import { FuseContactsContactFormDialogComponent } from './contact-form/contact-form.component';
+import { MdDialog } from '@angular/material';
 
 @Component({
     selector     : 'fuse-contacts',
@@ -14,12 +16,38 @@ export class FuseContactsComponent implements OnInit
 {
     hasSelectedContacts: boolean;
     searchInput: FormControl;
+    dialogRef: any;
 
-    constructor(private contactsService: ContactsService)
+    constructor(
+        private contactsService: ContactsService,
+        public dialog: MdDialog
+    )
     {
         this.searchInput = new FormControl('');
     }
 
+    newContact()
+    {
+        this.dialogRef = this.dialog.open(FuseContactsContactFormDialogComponent, {
+            panelClass: 'contact-form-dialog',
+            data      : {
+                action: 'new'
+            }
+        });
+
+        this.dialogRef.afterClosed()
+            .subscribe((response: FormGroup) => {
+                if ( !response )
+                {
+                    return;
+                }
+
+                this.contactsService.updateContact(response.getRawValue());
+
+            });
+
+    }
+
     ngOnInit()
     {
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index 4f44c51e..aecdd630 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -1,109 +1,111 @@
-<md-toolbar md-dialog-title class="mat-accent m-0">
-    <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
-        <span class="title dialog-title">New Message</span>
-        <button md-button class="mat-icon-button"
-                (click)="dialogRef.close()"
-                aria-label="Close dialog">
-            <md-icon>close</md-icon>
-        </button>
-    </div>
-</md-toolbar>
+<div class="dialog-content-wrapper">
+    <md-toolbar md-dialog-title class="mat-accent m-0">
+        <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
+            <span class="title dialog-title">New Message</span>
+            <button md-button class="mat-icon-button"
+                    (click)="dialogRef.close()"
+                    aria-label="Close dialog">
+                <md-icon>close</md-icon>
+            </button>
+        </div>
+    </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
+    <div md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
 
-    <form name="composeForm" [formGroup]="composeForm" class="compose-form" fxLayout="column" fxFlex>
+        <form name="composeForm" [formGroup]="composeForm" class="compose-form" fxLayout="column" fxFlex>
 
-        <md-input-container>
-            <input mdInput name="from"
-                   placeholder="From"
-                   formControlName="from"
-                   type="email">
-        </md-input-container>
+            <md-input-container>
+                <input mdInput name="from"
+                       placeholder="From"
+                       formControlName="from"
+                       type="email">
+            </md-input-container>
 
-        <md-input-container ng-class="{'hidden-cc': vm.hiddenCC, 'hidden-bcc': vm.hiddenBCC}">
-            <input mdInput name="to"
-                   placeholder="To"
-                   formControlName="to"
-                   type="email" required>
-        </md-input-container>
+            <md-input-container ng-class="{'hidden-cc': vm.hiddenCC, 'hidden-bcc': vm.hiddenBCC}">
+                <input mdInput name="to"
+                       placeholder="To"
+                       formControlName="to"
+                       type="email" required>
+            </md-input-container>
 
-        <md-input-container>
-            <input mdInput
-                   name="cc"
-                   placeholder="Cc"
-                   formControlName="cc"
-                   type="email">
-        </md-input-container>
+            <md-input-container>
+                <input mdInput
+                       name="cc"
+                       placeholder="Cc"
+                       formControlName="cc"
+                       type="email">
+            </md-input-container>
 
-        <md-input-container>
-            <input mdInput
-                   name="bcc"
-                   placeholder="Bcc"
-                   formControlName="bcc"
-                   type="email">
-        </md-input-container>
+            <md-input-container>
+                <input mdInput
+                       name="bcc"
+                       placeholder="Bcc"
+                       formControlName="bcc"
+                       type="email">
+            </md-input-container>
 
-        <md-input-container>
-            <input mdInput name="subject"
-                   placeholder="Subject"
-                   formControlName="subject">
-        </md-input-container>
+            <md-input-container>
+                <input mdInput name="subject"
+                       placeholder="Subject"
+                       formControlName="subject">
+            </md-input-container>
 
-        <md-input-container>
+            <md-input-container>
             <textarea mdInput name="message"
                       placeholder="Message"
                       formControlName="message"
                       rows="6">
             </textarea>
-        </md-input-container>
+            </md-input-container>
 
-        <div class="attachment-list">
+            <div class="attachment-list">
 
-            <div class="attachment" fxLayout="row" fxLayoutAlign="space-between center">
-                <div>
-                    <span class="filename">attachment-2.doc</span>
-                    <span class="size">(12 Kb)</span>
+                <div class="attachment" fxLayout="row" fxLayoutAlign="space-between center">
+                    <div>
+                        <span class="filename">attachment-2.doc</span>
+                        <span class="size">(12 Kb)</span>
+                    </div>
+
+                    <button md-icon-button aria-label="Delete attachment">
+                        <md-icon class="s-16">close</md-icon>
+                    </button>
                 </div>
 
-                <button md-icon-button aria-label="Delete attachment">
-                    <md-icon class="s-16">close</md-icon>
-                </button>
-            </div>
+                <div class="attachment" fxLayout="row" fxLayoutAlign="space-between center">
+                    <div>
+                        <span class="filename">attachment-1.jpg</span>
+                        <span class="size">(350 Kb)</span>
+                    </div>
 
-            <div class="attachment" fxLayout="row" fxLayoutAlign="space-between center">
-                <div>
-                    <span class="filename">attachment-1.jpg</span>
-                    <span class="size">(350 Kb)</span>
+                    <button md-icon-button aria-label="Delete attachment">
+                        <md-icon class="s-16">close</md-icon>
+                    </button>
                 </div>
-
-                <button md-icon-button aria-label="Delete attachment">
-                    <md-icon class="s-16">close</md-icon>
-                </button>
             </div>
-        </div>
-    </form>
-</div>
-
-<div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
-    <div>
-        <button md-raised-button
-                (click)="dialogRef.close(['send',composeForm])"
-                class="save-button mat-accent"
-                [disabled]="composeForm.invalid"
-                aria-label="SAVE">
-            SEND
-        </button>
-
-        <button md-icon-button md-tooltip="Attach a file">
-            <md-icon>attach_file</md-icon>
-        </button>
+        </form>
     </div>
 
-    <button md-button
-            class="mat-icon-button"
-            (click)="dialogRef.close(['delete',composeForm])"
-            aria-label="Delete"
-            md-tooltip="Delete">
-        <md-icon>delete</md-icon>
-    </button>
+    <div md-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
+        <div>
+            <button md-raised-button
+                    (click)="dialogRef.close(['send',composeForm])"
+                    class="save-button mat-accent"
+                    [disabled]="composeForm.invalid"
+                    aria-label="SAVE">
+                SEND
+            </button>
+
+            <button md-icon-button md-tooltip="Attach a file">
+                <md-icon>attach_file</md-icon>
+            </button>
+        </div>
+
+        <button md-button
+                class="mat-icon-button"
+                (click)="dialogRef.close(['delete',composeForm])"
+                aria-label="Delete"
+                md-tooltip="Delete">
+            <md-icon>delete</md-icon>
+        </button>
+    </div>
 </div>
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
index 595dfc75..c9487a7e 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
@@ -1,15 +1,10 @@
-:host {
-    display: flex;
-    flex-direction: column;
-}
-
 .mail-compose-dialog {
     .mat-dialog-container {
         padding: 0;
         width: 720px;
 
         .compose-form {
-            
+
             .mat-input-container {
                 width: 100%;
             }
@@ -36,4 +31,10 @@
             }
         }
     }
+
+    .dialog-content-wrapper {
+        max-height: 85vh;
+        display: flex;
+        flex-direction: column;
+    }
 }
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index 8218cd59..75e65ef5 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -1,452 +1,454 @@
-<md-toolbar *ngIf="card" md-dialog-title class="md-accent-bg m-0">
+<div class="dialog-content-wrapper">
+    <md-toolbar *ngIf="card" md-dialog-title class="md-accent-bg m-0">
 
-    <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
+        <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
 
-        <div fxFlex fxLayout="row" fxLayoutAlign="start center">
+            <div fxFlex fxLayout="row" fxLayoutAlign="start center">
+
+                <!-- DUE DATE -->
+                <div class="due-date" fxFlex="0 1 auto">
+
+                    <button *ngIf="card.due" md-icon-button class="" [mdMenuTriggerFor]="dueDateMenu">
+                        <md-icon>today</md-icon>
+                    </button>
+
+                    <md-menu #dueDateMenu="mdMenu" [overlapTrigger]="false">
+                        <button md-menu-item (click)="removeDueDate()">Remove Due Date</button>
+                    </md-menu>
+
+                    <md2-datepicker *ngIf="!card.due" [(ngModel)]="card.due" openOnFocus="true" placeholder="Set Date/Time" type="datetime"></md2-datepicker>
+                </div>
+                <!-- / DUE DATE -->
+
+                <!-- LABELS -->
+                <div class="labels" fxFlex="0 1 auto">
+
+                    <button md-icon-button [mdMenuTriggerFor]="labelsMenu">
+                        <md-icon>label</md-icon>
+                    </button>
+
+                    <md-menu #labelsMenu="mdMenu" [overlapTrigger]="false" class="scrumboard-labels-menu">
+
+                        <fuse-scrumboard-label-selector [card]="card" (onCardLabelsChange)="updateCard()"></fuse-scrumboard-label-selector>
+
+                    </md-menu>
+                </div>
+                <!-- / LABELS -->
+
+                <!-- MEMBERS -->
+                <div class="members" fxFlex="0 1 auto">
+
+                    <button md-icon-button class="" [mdMenuTriggerFor]="membersMenu">
+                        <md-icon>account_circle</md-icon>
+                    </button>
+
+                    <md-menu #membersMenu="mdMenu" [overlapTrigger]="false">
+                        <div fxFlex fxLayout="column" class="scrumboard-members-menu" (click)="$event.stopPropagation()">
+                            <md-checkbox class="member px-12" [checked]="card.idMembers.indexOf(member.id) > -1"
+                                         *ngFor="let member of board.members"
+                                         (change)="toggleInArray(member.id, card.idMembers);updateCard()">
+                                <div fxLayout="row" fxLayoutAlign="start center">
+                                    <img [alt]="member.name" [src]=" member.avatar" class="avatar"/>
+                                    <p class="member-name">{{ member.name }}</p>
+                                </div>
+                            </md-checkbox>
+                        </div>
+                    </md-menu>
+                </div>
+                <!-- / MEMBERS -->
+
+                <!-- ATTACHMENT -->
+                <button md-icon-button aria-label="Attachment">
+                    <md-icon>attachment</md-icon>
+                </button>
+                <!-- / ATTACHMENT -->
+
+                <!-- CHECKLIST -->
+                <div class="due-date " fxFlex="0 1 auto">
+
+                    <button md-icon-button class="" [mdMenuTriggerFor]="checklistMenu" #checklistMenuTrigger="mdMenuTrigger" (onMenuOpen)="onChecklistMenuOpen()">
+                        <md-icon>check_box</md-icon>
+                    </button>
+
+                    <md-menu #checklistMenu="mdMenu" [overlapTrigger]="false">
+
+                        <form class="px-16 py-8" #newChecklistForm="ngForm" (submit)="addChecklist(newChecklistForm)" (click)="$event.stopPropagation()"
+                              fxLayout="column" fxLayoutAlign="start end">
+
+                            <md-input-container floatPlaceholder="never" (click)="$event.stopPropagation()" fxFlex>
+                                <input #newCheckListTitleField mdInput ngModel #checklistTitle="ngModel" name="checklistTitle" placeholder="Checklist title" required>
+                            </md-input-container>
+
+                            <button md-raised-button class="mat-accent" aria-label="Add Checklist" [disabled]="!newChecklistForm.valid">Add Checklist</button>
+                        </form>
+
+                    </md-menu>
+                </div>
+                <!-- / CHECKLIST -->
+
+                <!-- SUBSCRIBE -->
+                <div class="subscribe " fxFlex="0 1 auto">
+                    <button md-icon-button class="" [mdMenuTriggerFor]="subscribeMenu">
+                        <md-icon>remove_red_eye</md-icon>
+                    </button>
+                    <md-menu #subscribeMenu="mdMenu" [overlapTrigger]="false">
+                        <button *ngIf="card.subscribed" md-menu-item (click)="toggleSubscribe()">
+                            Unsubscribe
+                        </button>
+                        <button *ngIf="!card.subscribed" md-menu-item (click)="toggleSubscribe()">
+                            Subscribe
+                        </button>
+                    </md-menu>
+                </div>
+                <!-- / SUBSCRIBE -->
+
+                <!-- OPTIONS -->
+                <div class="options " fxFlex="0 1 auto">
+                    <button md-icon-button class="" [mdMenuTriggerFor]="optionsMenu">
+                        <md-icon>more_horiz</md-icon>
+                    </button>
+                    <md-menu #optionsMenu="mdMenu" [overlapTrigger]="false">
+                        <button md-menu-item (click)="removeCard()">
+                            Remove Card
+                        </button>
+                    </md-menu>
+                </div>
+                <!-- / OPTIONS -->
+            </div>
+
+            <!-- CLOSE DIALOG BUTTON -->
+            <button md-icon-button (click)="dialogRef.close()" aria-label="Close Dialog">
+                <md-icon>close</md-icon>
+            </button>
+            <!-- / CLOSE DIALOG BUTTON -->
+        </div>
+    </md-toolbar>
+
+    <div *ngIf="card" md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
+
+        <div fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"
+             fxLayout.xs="column" fxLayoutAlign="center center">
+
+            <!-- BREADCRUMB -->
+            <div class="card-breadcrumb mb-16 mb-sm-0" fxLayout="row" fxLayoutAlign="start center">
+                <span>{{board.name}}</span>
+                <md-icon class="s-20">chevron_right</md-icon>
+                <span>{{list.name}}</span>
+            </div>
+            <!-- / BREADCRUMB -->
 
             <!-- DUE DATE -->
-            <div class="due-date" fxFlex="0 1 auto">
+            <div *ngIf="card.due" class="due-date" fxLayout="row" fxLayoutAlign="start center">
 
-                <button *ngIf="card.due" md-icon-button class="" [mdMenuTriggerFor]="dueDateMenu">
-                    <md-icon>today</md-icon>
+                <md2-datepicker class="picker ml-8" [(ngModel)]="card.due" openOnFocus="true" type="datetime" format="dd/MM/y H:mm"></md2-datepicker>
+
+                <button md-icon-button class="remove-due-date" (click)="removeDueDate()">
+                    <md-icon class="s-16">close</md-icon>
                 </button>
-
-                <md-menu #dueDateMenu="mdMenu" [overlapTrigger]="false">
-                    <button md-menu-item (click)="removeDueDate()">Remove Due Date</button>
-                </md-menu>
-
-                <md2-datepicker *ngIf="!card.due" [(ngModel)]="card.due" openOnFocus="true" placeholder="Set Date/Time" type="datetime"></md2-datepicker>
             </div>
             <!-- / DUE DATE -->
 
-            <!-- LABELS -->
-            <div class="labels" fxFlex="0 1 auto">
-
-                <button md-icon-button [mdMenuTriggerFor]="labelsMenu">
-                    <md-icon>label</md-icon>
-                </button>
-
-                <md-menu #labelsMenu="mdMenu" [overlapTrigger]="false" class="scrumboard-labels-menu">
-
-                    <fuse-scrumboard-label-selector [card]="card" (onCardLabelsChange)="updateCard()"></fuse-scrumboard-label-selector>
-
-                </md-menu>
-            </div>
-            <!-- / LABELS -->
-
-            <!-- MEMBERS -->
-            <div class="members" fxFlex="0 1 auto">
-
-                <button md-icon-button class="" [mdMenuTriggerFor]="membersMenu">
-                    <md-icon>account_circle</md-icon>
-                </button>
-
-                <md-menu #membersMenu="mdMenu" [overlapTrigger]="false">
-                    <div fxFlex fxLayout="column" class="scrumboard-members-menu" (click)="$event.stopPropagation()">
-                        <md-checkbox class="member px-12" [checked]="card.idMembers.indexOf(member.id) > -1"
-                                     *ngFor="let member of board.members"
-                                     (change)="toggleInArray(member.id, card.idMembers);updateCard()">
-                            <div fxLayout="row" fxLayoutAlign="start center">
-                                <img [alt]="member.name" [src]=" member.avatar" class="avatar"/>
-                                <p class="member-name">{{ member.name }}</p>
-                            </div>
-                        </md-checkbox>
-                    </div>
-                </md-menu>
-            </div>
-            <!-- / MEMBERS -->
-
-            <!-- ATTACHMENT -->
-            <button md-icon-button aria-label="Attachment">
-                <md-icon>attachment</md-icon>
-            </button>
-            <!-- / ATTACHMENT -->
-
-            <!-- CHECKLIST -->
-            <div class="due-date " fxFlex="0 1 auto">
-
-                <button md-icon-button class="" [mdMenuTriggerFor]="checklistMenu" #checklistMenuTrigger="mdMenuTrigger" (onMenuOpen)="onChecklistMenuOpen()">
-                    <md-icon>check_box</md-icon>
-                </button>
-
-                <md-menu #checklistMenu="mdMenu" [overlapTrigger]="false">
-
-                    <form class="px-16 py-8" #newChecklistForm="ngForm" (submit)="addChecklist(newChecklistForm)" (click)="$event.stopPropagation()"
-                          fxLayout="column" fxLayoutAlign="start end">
-
-                        <md-input-container floatPlaceholder="never" (click)="$event.stopPropagation()" fxFlex>
-                            <input #newCheckListTitleField mdInput ngModel #checklistTitle="ngModel" name="checklistTitle" placeholder="Checklist title" required>
-                        </md-input-container>
-
-                        <button md-raised-button class="mat-accent" aria-label="Add Checklist" [disabled]="!newChecklistForm.valid">Add Checklist</button>
-                    </form>
-
-                </md-menu>
-            </div>
-            <!-- / CHECKLIST -->
-
-            <!-- SUBSCRIBE -->
-            <div class="subscribe " fxFlex="0 1 auto">
-                <button md-icon-button class="" [mdMenuTriggerFor]="subscribeMenu">
-                    <md-icon>remove_red_eye</md-icon>
-                </button>
-                <md-menu #subscribeMenu="mdMenu" [overlapTrigger]="false">
-                    <button *ngIf="card.subscribed" md-menu-item (click)="toggleSubscribe()">
-                        Unsubscribe
-                    </button>
-                    <button *ngIf="!card.subscribed" md-menu-item (click)="toggleSubscribe()">
-                        Subscribe
-                    </button>
-                </md-menu>
-            </div>
-            <!-- / SUBSCRIBE -->
-
-            <!-- OPTIONS -->
-            <div class="options " fxFlex="0 1 auto">
-                <button md-icon-button class="" [mdMenuTriggerFor]="optionsMenu">
-                    <md-icon>more_horiz</md-icon>
-                </button>
-                <md-menu #optionsMenu="mdMenu" [overlapTrigger]="false">
-                    <button md-menu-item (click)="removeCard()">
-                        Remove Card
-                    </button>
-                </md-menu>
-            </div>
-            <!-- / OPTIONS -->
         </div>
 
-        <!-- CLOSE DIALOG BUTTON -->
-        <button md-icon-button (click)="dialogRef.close()" aria-label="Close Dialog">
-            <md-icon>close</md-icon>
-        </button>
-        <!-- / CLOSE DIALOG BUTTON -->
-    </div>
-</md-toolbar>
-
-<div *ngIf="card" md-dialog-content class="p-24 m-0" fusePerfectScrollbar>
-
-    <div fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"
-         fxLayout.xs="column" fxLayoutAlign="center center">
-
-        <!-- BREADCRUMB -->
-        <div class="card-breadcrumb mb-16 mb-sm-0" fxLayout="row" fxLayoutAlign="start center">
-            <span>{{board.name}}</span>
-            <md-icon class="s-20">chevron_right</md-icon>
-            <span>{{list.name}}</span>
+        <!-- NAME -->
+        <div fxLayout="row" fxLayoutAlign="start center">
+            <md-icon *ngIf="card.subscribed" class="card-subscribe s-20 mr-12">remove_red_eye</md-icon>
+            <div class="card-name">
+                <md-input-container floatPlaceholder="never" fxFlex>
+                    <input mdInput [(ngModel)]="card.name" placeholder="Title" required (change)="updateCard()">
+                </md-input-container>
+            </div>
         </div>
-        <!-- / BREADCRUMB -->
+        <!-- / NAME -->
 
-        <!-- DUE DATE -->
-        <div *ngIf="card.due" class="due-date" fxLayout="row" fxLayoutAlign="start center">
-
-            <md2-datepicker class="picker ml-8" [(ngModel)]="card.due" openOnFocus="true" type="datetime" format="dd/MM/y H:mm"></md2-datepicker>
-
-            <button md-icon-button class="remove-due-date" (click)="removeDueDate()">
-                <md-icon class="s-16">close</md-icon>
-            </button>
-        </div>
-        <!-- / DUE DATE -->
-
-    </div>
-
-    <!-- NAME -->
-    <div fxLayout="row" fxLayoutAlign="start center">
-        <md-icon *ngIf="card.subscribed" class="card-subscribe s-20 mr-12">remove_red_eye</md-icon>
-        <div class="card-name">
-            <md-input-container floatPlaceholder="never" fxFlex>
-                <input mdInput [(ngModel)]="card.name" placeholder="Title" required (change)="updateCard()">
+        <!-- DESCRIPTION -->
+        <div class="description">
+            <md-input-container fxFlex>
+                <textarea mdInput [(ngModel)]="card.description" placeholder="Description" columns="1" md-maxlength="150" max-rows="4" (change)="updateCard()"></textarea>
             </md-input-container>
         </div>
-    </div>
-    <!-- / NAME -->
+        <!-- / DESCRIPTION -->
 
-    <!-- DESCRIPTION -->
-    <div class="description">
-        <md-input-container fxFlex>
-            <textarea mdInput [(ngModel)]="card.description" placeholder="Description" columns="1" md-maxlength="150" max-rows="4" (change)="updateCard()"></textarea>
-        </md-input-container>
-    </div>
-    <!-- / DESCRIPTION -->
+        <!-- SECTIONS -->
+        <div class="sections">
 
-    <!-- SECTIONS -->
-    <div class="sections">
+            <!-- LABELS SECTION -->
+            <div *ngIf="card.idLabels[0] || card.idMembers[0]" class="section"
+                 fxLayout="column" fxLayout.gt-xs="row">
 
-        <!-- LABELS SECTION -->
-        <div *ngIf="card.idLabels[0] || card.idMembers[0]" class="section"
-             fxLayout="column" fxLayout.gt-xs="row">
-
-            <div *ngIf="card.idLabels[0]" fxFlex class="labels">
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-                    <md-icon class="s-20">label</md-icon>
-                    <span class="section-title">Labels</span>
+                <div *ngIf="card.idLabels[0]" fxFlex class="labels">
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+                        <md-icon class="s-20">label</md-icon>
+                        <span class="section-title">Labels</span>
+                    </div>
+                    <div class="section-content">
+                        <md-chip-list class="label-chips">
+                            <md-chip class="label-chip mb-4"
+                                     *ngFor="let labelId of card.idLabels"
+                                     [class]="board.labels | getById:labelId:'color'"
+                                     fxLayout="row" fxLayoutAlign="start center">
+                                <span>{{board.labels|getById:labelId:'name'}}</span>
+                                <md-icon class="ml-8 s-16 chip-remove" (click)="toggleInArray(labelId, card.idLabels);updateCard()">close</md-icon>
+                            </md-chip>
+                        </md-chip-list>
+                    </div>
                 </div>
-                <div class="section-content">
-                    <md-chip-list class="label-chips">
-                        <md-chip class="label-chip mb-4"
-                                 *ngFor="let labelId of card.idLabels"
-                                 [class]="board.labels | getById:labelId:'color'"
-                                 fxLayout="row" fxLayoutAlign="start center">
-                            <span>{{board.labels|getById:labelId:'name'}}</span>
-                            <md-icon class="ml-8 s-16 chip-remove" (click)="toggleInArray(labelId, card.idLabels);updateCard()">close</md-icon>
-                        </md-chip>
-                    </md-chip-list>
+
+                <div *ngIf="card.idMembers[0]" fxFlex class="members">
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+                        <md-icon class="s-20">supervisor_account</md-icon>
+                        <span class="section-title">Members</span>
+                    </div>
+                    <div class="section-content">
+                        <md-chip-list class="member-chips">
+                            <md-chip class="member-chip mb-4" *ngFor="let memberId of card.idMembers"
+                                     fxLayout="row" fxLayoutAlign="start center">
+                                <img class="member-chip-avatar" [src]="board.members | getById:memberId:'avatar'"
+                                     [md-tooltip]="board.members | getById:memberId:'name'">
+                                <md-icon class="ml-8 s-16 chip-remove" (click)="toggleInArray(memberId, card.idMembers);updateCard()">close</md-icon>
+                            </md-chip>
+                        </md-chip-list>
+                    </div>
                 </div>
             </div>
+            <!-- / LABELS SECTION -->
 
-            <div *ngIf="card.idMembers[0]" fxFlex class="members">
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-                    <md-icon class="s-20">supervisor_account</md-icon>
-                    <span class="section-title">Members</span>
-                </div>
-                <div class="section-content">
-                    <md-chip-list class="member-chips">
-                        <md-chip class="member-chip mb-4" *ngFor="let memberId of card.idMembers"
-                                 fxLayout="row" fxLayoutAlign="start center">
-                            <img class="member-chip-avatar" [src]="board.members | getById:memberId:'avatar'"
-                                 [md-tooltip]="board.members | getById:memberId:'name'">
-                            <md-icon class="ml-8 s-16 chip-remove" (click)="toggleInArray(memberId, card.idMembers);updateCard()">close</md-icon>
-                        </md-chip>
-                    </md-chip-list>
-                </div>
-            </div>
-        </div>
-        <!-- / LABELS SECTION -->
+            <!-- ATTACHMENTS SECTION -->
+            <div *ngIf="card.attachments[0]" class="section">
 
-        <!-- ATTACHMENTS SECTION -->
-        <div *ngIf="card.attachments[0]" class="section">
+                <div class="attachments">
 
-            <div class="attachments">
-
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-                    <md-icon class="s-20">attachment</md-icon>
-                    <span class="section-title">Attachments</span>
-                </div>
-
-                <div class="section-content">
-
-                    <div class="attachment" *ngFor="let item of card.attachments" [ngSwitch]="item.type">
-
-                        <div *ngSwitchCase="'image'"
-                             fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="start center"
-                             fxLayout="column" fxLayoutAlign="center start">
-
-                            <div class="attachment-preview mat-elevation-z2"
-                                 [ngStyle]="{'background-image': 'url('+item.src+')'}">
-                            </div>
-
-                            <div class="attachment-content" fxLayout="column">
-
-                                <div fxLayout="row" fxLayoutAlign="start center">
-                                    <span class="attachment-name">{{item.name}}</span>
-                                    <md-icon *ngIf="card.idAttachmentCover === item.id"
-                                             class="yellow-700-fg attachment-is-cover s-20">star
-                                    </md-icon>
-                                </div>
-
-                                <span class="attachment-time">{{item.time}}</span>
-
-                                <div>
-                                    <button md-raised-button class="attachment-actions-button" [mdMenuTriggerFor]="attachmentActionsMenu">
-                                        <span fxLayout="row" fxLayoutAlign="center center">
-                                            <span>Actions</span>
-                                            <md-icon class="s-20">arrow_drop_down</md-icon>
-                                        </span>
-                                    </button>
-                                    <md-menu #attachmentActionsMenu="mdMenu">
-                                        <button md-menu-item (click)="toggleCoverImage(item.id)">
-                                            <span *ngIf="card.idAttachmentCover !== item.id">Make Cover</span>
-                                            <span *ngIf="card.idAttachmentCover === item.id">Remove Cover</span>
-                                        </button>
-                                        <button md-menu-item (click)="removeAttachment(item)">
-                                            Remove Attachment
-                                        </button>
-                                    </md-menu>
-                                </div>
-
-                            </div>
-                        </div>
-
-                        <div *ngSwitchCase="'link'" fxLayout="row">
-                            <div class="attachment-preview mat-elevation-z2" fxLayout="column"
-                                 fxLayoutAlign="center center">
-                                <span>LINK</span>
-                            </div>
-                            <div class="attachment-content" fxLayout="column">
-                                <span class="attachment-url">{{item.url}}</span>
-                                <span class="attachment-time">{{item.time}}</span>
-                            </div>
-                        </div>
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+                        <md-icon class="s-20">attachment</md-icon>
+                        <span class="section-title">Attachments</span>
                     </div>
 
-                    <button md-button class="add-attachment-button" aria-label="add attachment">
-                        <div fxLayout="row" fxLayoutAlign="start center">
-                            <md-icon class="s-20">add</md-icon>
-                            <span>Add an attachment</span>
+                    <div class="section-content">
+
+                        <div class="attachment" *ngFor="let item of card.attachments" [ngSwitch]="item.type">
+
+                            <div *ngSwitchCase="'image'"
+                                 fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="start center"
+                                 fxLayout="column" fxLayoutAlign="center start">
+
+                                <div class="attachment-preview mat-elevation-z2"
+                                     [ngStyle]="{'background-image': 'url('+item.src+')'}">
+                                </div>
+
+                                <div class="attachment-content" fxLayout="column">
+
+                                    <div fxLayout="row" fxLayoutAlign="start center">
+                                        <span class="attachment-name">{{item.name}}</span>
+                                        <md-icon *ngIf="card.idAttachmentCover === item.id"
+                                                 class="yellow-700-fg attachment-is-cover s-20">star
+                                        </md-icon>
+                                    </div>
+
+                                    <span class="attachment-time">{{item.time}}</span>
+
+                                    <div>
+                                        <button md-raised-button class="attachment-actions-button" [mdMenuTriggerFor]="attachmentActionsMenu">
+                                            <span fxLayout="row" fxLayoutAlign="center center">
+                                                <span>Actions</span>
+                                                <md-icon class="s-20">arrow_drop_down</md-icon>
+                                            </span>
+                                        </button>
+                                        <md-menu #attachmentActionsMenu="mdMenu">
+                                            <button md-menu-item (click)="toggleCoverImage(item.id)">
+                                                <span *ngIf="card.idAttachmentCover !== item.id">Make Cover</span>
+                                                <span *ngIf="card.idAttachmentCover === item.id">Remove Cover</span>
+                                            </button>
+                                            <button md-menu-item (click)="removeAttachment(item)">
+                                                Remove Attachment
+                                            </button>
+                                        </md-menu>
+                                    </div>
+
+                                </div>
+                            </div>
+
+                            <div *ngSwitchCase="'link'" fxLayout="row">
+                                <div class="attachment-preview mat-elevation-z2" fxLayout="column"
+                                     fxLayoutAlign="center center">
+                                    <span>LINK</span>
+                                </div>
+                                <div class="attachment-content" fxLayout="column">
+                                    <span class="attachment-url">{{item.url}}</span>
+                                    <span class="attachment-time">{{item.time}}</span>
+                                </div>
+                            </div>
                         </div>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <!-- / ATTACHMENTS SECTION -->
 
-        <!-- CHECKLISTS SECTION -->
-        <div class="section" *ngFor="let checklist of card.checklists">
-
-            <div class="checklist">
-
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-
-                    <md-icon class="s-20">check_box</md-icon>
-
-                    <span fxFlex class="section-title">{{checklist.name}}</span>
-
-
-                    <div>
-                        <button md-icon-button class="checklist-actions-button" [mdMenuTriggerFor]="checklistActionsMenu">
-                            <md-icon class="s-20">more_vert</md-icon>
+                        <button md-button class="add-attachment-button" aria-label="add attachment">
+                            <div fxLayout="row" fxLayoutAlign="start center">
+                                <md-icon class="s-20">add</md-icon>
+                                <span>Add an attachment</span>
+                            </div>
                         </button>
-                        <md-menu #checklistActionsMenu="mdMenu">
-                            <button md-menu-item (click)="removeChecklist(checklist)">
-                                <md-icon>delete</md-icon>
-                                <span>Remove Checklist</span>
-                            </button>
-                        </md-menu>
                     </div>
-
                 </div>
+            </div>
+            <!-- / ATTACHMENTS SECTION -->
 
-                <div class="section-content">
+            <!-- CHECKLISTS SECTION -->
+            <div class="section" *ngFor="let checklist of card.checklists">
 
-                    <div class="checklist-progress" fxLayout="row" fxLayoutAlign="start center">
+                <div class="checklist">
 
-                        <span class="checklist-progress-value">
-                            {{checklist.checkItemsChecked}} / {{checklist.checkItems.length}}
-                        </span>
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+
+                        <md-icon class="s-20">check_box</md-icon>
+
+                        <span fxFlex class="section-title">{{checklist.name}}</span>
+
+
+                        <div>
+                            <button md-icon-button class="checklist-actions-button" [mdMenuTriggerFor]="checklistActionsMenu">
+                                <md-icon class="s-20">more_vert</md-icon>
+                            </button>
+                            <md-menu #checklistActionsMenu="mdMenu">
+                                <button md-menu-item (click)="removeChecklist(checklist)">
+                                    <md-icon>delete</md-icon>
+                                    <span>Remove Checklist</span>
+                                </button>
+                            </md-menu>
+                        </div>
 
-                        <md-progress-bar class="mat-accent checklist-progressbar" mode="determinate"
-                                         value="{{100 * checklist.checkItemsChecked / checklist.checkItems.length}}">
-                        </md-progress-bar>
                     </div>
 
-                    <div class="check-items">
+                    <div class="section-content">
 
-                        <div class="check-item" *ngFor="let checkItem of checklist.checkItems" fxLayout="row" fxLayoutAlign="space-between center">
+                        <div class="checklist-progress" fxLayout="row" fxLayoutAlign="start center">
 
-                            <div fxFlex fxLayout="row" fxLayoutAlign="start center">
-                                <md-checkbox [(ngModel)]="checkItem.checked"
-                                             (change)="updateCheckedCount(checklist)"
-                                             aria-label="{{checkItem.name}}">
-                                </md-checkbox>
-                                <md-input-container fxFlex class="mx-12">
-                                    <input mdInput [(ngModel)]="checkItem.name">
+                            <span class="checklist-progress-value">
+                                {{checklist.checkItemsChecked}} / {{checklist.checkItems.length}}
+                            </span>
+
+                            <md-progress-bar class="mat-accent checklist-progressbar" mode="determinate"
+                                             value="{{100 * checklist.checkItemsChecked / checklist.checkItems.length}}">
+                            </md-progress-bar>
+                        </div>
+
+                        <div class="check-items">
+
+                            <div class="check-item" *ngFor="let checkItem of checklist.checkItems" fxLayout="row" fxLayoutAlign="space-between center">
+
+                                <div fxFlex fxLayout="row" fxLayoutAlign="start center">
+                                    <md-checkbox [(ngModel)]="checkItem.checked"
+                                                 (change)="updateCheckedCount(checklist)"
+                                                 aria-label="{{checkItem.name}}">
+                                    </md-checkbox>
+                                    <md-input-container fxFlex class="mx-12">
+                                        <input mdInput [(ngModel)]="checkItem.name">
+                                    </md-input-container>
+                                </div>
+
+                                <button md-icon-button class="checklist-actions-button" (click)="removeChecklistItem(checkItem, checklist)">
+                                    <md-icon class="s-20">delete</md-icon>
+                                </button>
+
+                            </div>
+                        </div>
+
+                        <form #newCheckItemForm="ngForm" (submit)="addCheckItem(newCheckItemForm,checklist)" name="newCheckItemForm" class="new-check-item-form"
+                              fxLayout="row" fxLayoutAlign="start center">
+
+                            <div fxLayout="row" fxLayoutAlign="start center" fxFlex>
+                                <md-icon class="s-20">add</md-icon>
+
+                                <md-input-container class="no-errors-spacer mx-12" fxFlex>
+                                    <input mdInput ngModel #checkItem="ngModel" name="checkItem" placeholder="Add an item" autocomplete="off">
                                 </md-input-container>
                             </div>
 
-                            <button md-icon-button class="checklist-actions-button" (click)="removeChecklistItem(checkItem, checklist)">
-                                <md-icon class="s-20">delete</md-icon>
-                            </button>
-
-                        </div>
-                    </div>
-
-                    <form #newCheckItemForm="ngForm" (submit)="addCheckItem(newCheckItemForm,checklist)" name="newCheckItemForm" class="new-check-item-form"
-                          fxLayout="row" fxLayoutAlign="start center">
-
-                        <div fxLayout="row" fxLayoutAlign="start center" fxFlex>
-                            <md-icon class="s-20">add</md-icon>
-
-                            <md-input-container class="no-errors-spacer mx-12" fxFlex>
-                                <input mdInput ngModel #checkItem="ngModel" name="checkItem" placeholder="Add an item" autocomplete="off">
-                            </md-input-container>
-                        </div>
-
-                        <button md-raised-button
-                                [disabled]="!newCheckItemForm.valid || newCheckItemForm.pristine"
-                                class="mat-accent" aria-label="Add">
-                            <span>Add</span>
-                        </button>
-                    </form>
-
-                </div>
-            </div>
-        </div>
-        <!-- / CHECKLISTS SECTION -->
-
-        <!-- COMMENTS SECTION -->
-        <div class="section">
-
-            <div class="comments">
-
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-                    <md-icon class="s-20">comment</md-icon>
-                    <span class="section-title">Comments</span>
-                </div>
-
-                <div class="section-content">
-                    <form name="cardCommentForm"
-                          #newCommentForm="ngForm" (submit)="addNewComment(newCommentForm)"
-                          ng-submit="vm.addNewComment(vm.newCommentText); vm.newCommentText =''"
-                          class="comment new-comment" fxLayout="column" fxLayoutAlign="start" no-validate>
-
-                        <div fxLayout="row">
-                            <img class="comment-member-avatar" src="assets/images/avatars/profile.jpg">
-                            <md-input-container fxFlex>
-                                <input mdInput name="newComment" ngModel #newComment="ngModel"
-                                       placeholder="Write a comment.." required>
-                            </md-input-container>
-                        </div>
-
-                        <div fxLayout="row" fxLayoutAlign="end center">
-                            <button md-raised-button class="mat-accent"
-                                    [disabled]="!newCommentForm.valid || newCommentForm.pristine"
-                                    aria-label="Add">
+                            <button md-raised-button
+                                    [disabled]="!newCheckItemForm.valid || newCheckItemForm.pristine"
+                                    class="mat-accent" aria-label="Add">
                                 <span>Add</span>
                             </button>
-                        </div>
-                    </form>
+                        </form>
 
-                    <div class="comment" fxLayout="row" *ngFor="let comment of card.comments">
+                    </div>
+                </div>
+            </div>
+            <!-- / CHECKLISTS SECTION -->
 
-                        <img class="comment-member-avatar"
-                             [src]="board.members | getById: comment.idMember:'avatar'">
+            <!-- COMMENTS SECTION -->
+            <div class="section">
 
-                        <div fxLayout="column">
-                            <div class="comment-member-name">
-                                {{board.members | getById: comment.idMember:'name'}}
+                <div class="comments">
+
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+                        <md-icon class="s-20">comment</md-icon>
+                        <span class="section-title">Comments</span>
+                    </div>
+
+                    <div class="section-content">
+                        <form name="cardCommentForm"
+                              #newCommentForm="ngForm" (submit)="addNewComment(newCommentForm)"
+                              ng-submit="vm.addNewComment(vm.newCommentText); vm.newCommentText =''"
+                              class="comment new-comment" fxLayout="column" fxLayoutAlign="start" no-validate>
+
+                            <div fxLayout="row">
+                                <img class="comment-member-avatar" src="assets/images/avatars/profile.jpg">
+                                <md-input-container fxFlex>
+                                    <input mdInput name="newComment" ngModel #newComment="ngModel"
+                                           placeholder="Write a comment.." required>
+                                </md-input-container>
+                            </div>
+
+                            <div fxLayout="row" fxLayoutAlign="end center">
+                                <button md-raised-button class="mat-accent"
+                                        [disabled]="!newCommentForm.valid || newCommentForm.pristine"
+                                        aria-label="Add">
+                                    <span>Add</span>
+                                </button>
+                            </div>
+                        </form>
+
+                        <div class="comment" fxLayout="row" *ngFor="let comment of card.comments">
+
+                            <img class="comment-member-avatar"
+                                 [src]="board.members | getById: comment.idMember:'avatar'">
+
+                            <div fxLayout="column">
+                                <div class="comment-member-name">
+                                    {{board.members | getById: comment.idMember:'name'}}
+                                </div>
+                                <div class="comment-bubble">{{comment.message}}</div>
+                                <div class="comment-time secondary-text">{{comment.time}}</div>
                             </div>
-                            <div class="comment-bubble">{{comment.message}}</div>
-                            <div class="comment-time secondary-text">{{comment.time}}</div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <!-- / COMMENTS SECTION -->
+            <!-- / COMMENTS SECTION -->
 
-        <!-- ACTIVITIES SECTION -->
-        <div *ngIf="card.activities[0]" class="section">
+            <!-- ACTIVITIES SECTION -->
+            <div *ngIf="card.activities[0]" class="section">
 
-            <div class="activities">
+                <div class="activities">
 
-                <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
-                    <md-icon class="s-20">list</md-icon>
-                    <span class="section-title">Activity</span>
-                </div>
-
-                <div class="section-content">
-                    <div class="activity" fxLayout="row" fxLayoutAlign="start center" *ngFor="let activity of card.activities">
-                        <img class="activity-member-avatar"
-                             [src]="board.members| getById:activity.idMember:'avatar'">
-                        <div class="activity-member-name">{{board.members| getById:activity.idMember:'name'}}</div>
-                        <div class="activity-message">{{activity.message}}</div>
-                        <div class="activity-time secondary-text">{{activity.time}}</div>
+                    <div class="section-header" fxLayout="row" fxLayoutAlign="start center">
+                        <md-icon class="s-20">list</md-icon>
+                        <span class="section-title">Activity</span>
                     </div>
+
+                    <div class="section-content">
+                        <div class="activity" fxLayout="row" fxLayoutAlign="start center" *ngFor="let activity of card.activities">
+                            <img class="activity-member-avatar"
+                                 [src]="board.members| getById:activity.idMember:'avatar'">
+                            <div class="activity-member-name">{{board.members| getById:activity.idMember:'name'}}</div>
+                            <div class="activity-message">{{activity.message}}</div>
+                            <div class="activity-time secondary-text">{{activity.time}}</div>
+                        </div>
+                    </div>
+
                 </div>
-
             </div>
-        </div>
-        <!-- / ACTIVITIES SECTION -->
+            <!-- / ACTIVITIES SECTION -->
 
+        </div>
+        <!-- / SECTIONS -->
     </div>
-    <!-- / SECTIONS -->
 </div>
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
index 4bf9dae0..e8333209 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
@@ -1,10 +1,5 @@
 @import "src/app/core/scss/fuse";
 
-:host {
-    display: flex;
-    flex-direction: column;
-}
-
 .scrumboard-card-dialog {
 
     .mat-dialog-container {
@@ -387,6 +382,12 @@
         }
 
     }
+
+    .dialog-content-wrapper {
+        max-height: 85vh;
+        display: flex;
+        flex-direction: column;
+    }
 }
 
 .scrumboard-members-menu {

From cb2b544526ae01cf1939a3487d16b00cd3bd8d15 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 12:11:21 +0300
Subject: [PATCH 23/27] chat, todo & theme options tweaks

---
 .../theme-options.component.html              | 126 ++++++++----------
 .../theme-options.component.scss              |  28 +++-
 .../content/apps/chat/chat.component.scss     |   2 +-
 .../todo-details/todo-details.component.html  |  51 ++++---
 .../todo-details/todo-details.component.scss  |  72 +---------
 5 files changed, 119 insertions(+), 160 deletions(-)

diff --git a/src/app/core/components/theme-options/theme-options.component.html b/src/app/core/components/theme-options/theme-options.component.html
index bae52a49..e49e995b 100644
--- a/src/app/core/components/theme-options/theme-options.component.html
+++ b/src/app/core/components/theme-options/theme-options.component.html
@@ -4,107 +4,95 @@
 
 <div class="theme-options-panel-overlay" #overlay [fxHide]="barClosed" [@fadeInOut]="!barClosed"></div>
 
-<div #panel class="theme-options-panel md-white-bg mat-elevation-z8 p-16">
+<div #panel class="theme-options-panel md-white-bg mat-elevation-z8">
 
     <button md-icon-button class="close-button" (click)="closeBar()">
         <md-icon>close</md-icon>
     </button>
 
-    <md-list>
-        <h3 md-subheader>Navigation:</h3>
-        <md-list-item>
-            <md-radio-group [(ngModel)]="fuseSettings.layout.navigation" (ngModelChange)="onSettingsChange()"
-                            fxLayout="row" fxLayoutAlign="start center" fxLayoutWrap>
-                <md-radio-button class="mr-8 mb-8" value="top">Top</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="left">Left</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="right">Right</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
-            </md-radio-group>
-        </md-list-item>
+    <div class="theme-options-panel-inner" fxLayout="column" fxLayoutAlign="start start">
 
-        <h3 md-subheader>Toolbar:</h3>
-        <md-list-item>
-            <md-radio-group [(ngModel)]="fuseSettings.layout.toolbar" (ngModelChange)="onSettingsChange()">
-                <md-radio-button class="mr-8 mb-8" value="below">Below</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="above">Above</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
-            </md-radio-group>
-        </md-list-item>
+        <h3>Navigation:</h3>
+        <md-radio-group [(ngModel)]="fuseSettings.layout.navigation" (ngModelChange)="onSettingsChange()"
+                        fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
+            <md-radio-button class="mr-8 mb-8" value="top">Top</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="left">Left</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="right">Right</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
+        </md-radio-group>
 
-        <h3 md-subheader>Footer:</h3>
-        <md-list-item>
-            <md-radio-group [(ngModel)]="fuseSettings.layout.footer" (ngModelChange)="onSettingsChange()">
-                <md-radio-button class="mr-8 mb-8" value="below">Below</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="above">Above</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
-            </md-radio-group>
-        </md-list-item>
+        <h3 class="mt-24">Toolbar:</h3>
+        <md-radio-group [(ngModel)]="fuseSettings.layout.toolbar" (ngModelChange)="onSettingsChange()"
+                        fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
+            <md-radio-button class="mr-8 mb-8" value="below">Below</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="above">Above</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
+        </md-radio-group>
 
-        <h3 md-subheader>Layout Mode:</h3>
-        <md-list-item>
-            <md-radio-group [(ngModel)]="fuseSettings.layout.mode" (ngModelChange)="onSettingsChange()">
-                <md-radio-button class="mr-8 mb-8" value="boxed">Boxed</md-radio-button>
-                <md-radio-button class="mr-8 mb-8" value="fullwidth">Fullwidth</md-radio-button>
-            </md-radio-group>
-        </md-list-item>
+        <h3 class="mt-24">Footer:</h3>
+        <md-radio-group [(ngModel)]="fuseSettings.layout.footer" (ngModelChange)="onSettingsChange()"
+                        fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
+            <md-radio-button class="mr-8 mb-8" value="below">Below</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="above">Above</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="none">None</md-radio-button>
+        </md-radio-group>
+
+        <h3 class="mt-24">Layout Mode:</h3>
+        <md-radio-group [(ngModel)]="fuseSettings.layout.mode" (ngModelChange)="onSettingsChange()"
+                        fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
+            <md-radio-button class="mr-8 mb-8" value="boxed">Boxed</md-radio-button>
+            <md-radio-button class="mr-8 mb-8" value="fullwidth">Fullwidth</md-radio-button>
+        </md-radio-group>
 
         <md-divider></md-divider>
 
-        <h3 md-subheader>Colors:</h3>
+        <h3>Colors:</h3>
+        <div class="colors">
 
-        <md-list-item class="mb-8">
             <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                 <h4 class="mr-8">Toolbar Color</h4>
                 <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.toolbar"
                                             (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
             </div>
-        </md-list-item>
 
-        <md-list-item class="mb-8">
             <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                 <h4 class="mr-8">Navigation Bar Color</h4>
                 <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.navbar"
                                             (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
             </div>
-        </md-list-item>
 
-        <md-list-item class="mb-8">
             <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                 <h4 class="mr-8">Footer Color</h4>
                 <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.footer"
                                             (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
             </div>
-        </md-list-item>
+
+        </div>
 
         <md-divider></md-divider>
 
-        <h3 md-subheader>Animation:</h3>
+        <h3>Router Animation:</h3>
+        <md-select class="p-0" [(ngModel)]="fuseSettings.routerAnimation">
+            <md-option value="none">
+                None
+            </md-option>
+            <md-option value="slideUp">
+                Slide up
+            </md-option>
+            <md-option value="slideDown">
+                Slide down
+            </md-option>
+            <md-option value="slideRight">
+                Slide right
+            </md-option>
+            <md-option value="slideLeft">
+                Slide left
+            </md-option>
+            <md-option value="fadeIn">
+                Fade in
+            </md-option>
+        </md-select>
 
-        <md-list-item>
-            <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
-                <h4>Router Animation</h4>
-                <md-select class="p-0" [(ngModel)]="fuseSettings.routerAnimation">
-                    <md-option value="none">
-                        None
-                    </md-option>
-                    <md-option value="slideUp">
-                        Slide up
-                    </md-option>
-                    <md-option value="slideDown">
-                        Slide down
-                    </md-option>
-                    <md-option value="slideRight">
-                        Slide right
-                    </md-option>
-                    <md-option value="slideLeft">
-                        Slide left
-                    </md-option>
-                    <md-option value="fadeIn">
-                        Fade in
-                    </md-option>
-                </md-select>
-            </div>
-        </md-list-item>
+    </div>
 
-    </md-list>
 </div>
diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/app/core/components/theme-options/theme-options.component.scss
index f2670861..950c472c 100644
--- a/src/app/core/components/theme-options/theme-options.component.scss
+++ b/src/app/core/components/theme-options/theme-options.component.scss
@@ -26,11 +26,14 @@
         width: 360px;
         transform: translate3d(100%, 0, 0);
         z-index: 999;
-        max-width: 80vw;
-        max-height: calc(100vh - 180px);
+        max-height: calc(100vh - 200px);
+        padding: 24px;
         overflow: auto;
 
         @include media-breakpoint-down('xs') {
+            top: -120px;
+            max-height: calc(100vh - 60px);
+            width: 90vw;
         }
 
         .close-button {
@@ -38,6 +41,23 @@
             top: 8px;
             right: 8px;
         }
+
+        h3 {
+            font-size: 14px;
+            font-weight: 500;
+            color: rgba(0, 0, 0, 0.54);
+        }
+
+        .mat-divider{
+            display: block !important;
+            width: 100%;
+            margin: 24px 0 16px 0;
+        }
+
+        .colors {
+            display: block !important;
+            width: 100%;
+        }
     }
 
     .theme-options-panel-overlay {
@@ -50,6 +70,10 @@
         bottom: 0;
         z-index: 998;
 
+        @include media-breakpoint-down('sm') {
+            background: rgba(0, 0, 0, 0.37);
+        }
+
         &.hidden {
             display: none;
         }
diff --git a/src/app/main/content/apps/chat/chat.component.scss b/src/app/main/content/apps/chat/chat.component.scss
index c7b2e19f..2d483473 100644
--- a/src/app/main/content/apps/chat/chat.component.scss
+++ b/src/app/main/content/apps/chat/chat.component.scss
@@ -28,7 +28,7 @@
                 > .mat-sidenav-content,
                 > .mat-drawer-content {
                     display: flex;
-                    flex: 1 0 auto;
+                    flex: 1 1 auto;
                     min-height: 100%;
                     height: auto;
                 }
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.html b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
index 9884527d..b16980c6 100644
--- a/src/app/main/content/apps/todo/todo-details/todo-details.component.html
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
@@ -1,16 +1,21 @@
 <div *ngIf="!todo" fxLayout="column" fxLayoutAlign="center center" fxFlex>
-    <md-icon class="s-120 mb-12 select-todo-icon" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">check_box</md-icon>
-    <span class="hint-text mat-h1 select-todo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">Select a todo</span>
+    <md-icon class="s-120 mb-12 select-todo-icon" *fuseIfOnDom
+             [@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">check_box
+    </md-icon>
+    <span class="hint-text mat-h1 select-todo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">Select
+        a todo
+    </span>
 </div>
 
 <div *ngIf="todo">
 
     <div class="todo-header" fxLayout="row" fxLayoutAlign="space-between center">
 
-        <button md-button class="mat-icon-button toggle-complete-button" (click)="toggleCompleted($event)"
+        <button md-button class="toggle-complete-button p-0" (click)="toggleCompleted($event)"
                 aria-label="Toggle completed" fxFlex="0 1 auto">
             <md-icon *ngIf="todo.completed">check_box</md-icon>
             <md-icon *ngIf="!todo.completed">check_box_outline_blank</md-icon>
+            <span>Mark as Done</span>
         </button>
 
         <div class="actions" fxLayout="row" fxLayoutAlign="start center">
@@ -49,14 +54,16 @@
         <form [formGroup]="todoForm" (submit)="addTodo()">
 
             <md-input-container class="title mt-8" floatPlaceholder="never" fxFill>
-                    <textarea mdInput
-                              #titleInput
-                              name="title"
-                              formControlName="title"
-                              placeholder="Title"
-                              mdTextareaAutosize
-                              required>
-                    </textarea>
+                <textarea mdInput
+                          #titleInput
+                          name="title"
+                          formControlName="title"
+                          placeholder="Title"
+                          mdTextareaAutosize
+                          mdAutosizeMinRows="1"
+                          mdAutosizeMaxRows="2"
+                          required>
+                </textarea>
             </md-input-container>
 
             <div class="tags mb-24" fxFlexFill fxLayout="row" fxLayoutWrap>
@@ -68,9 +75,9 @@
                 </div>
             </div>
 
-            <div fxFlexFill fxLayout="row">
+            <div class="dates" fxFlexFill fxLayout="column" fxLayout.gt-xs="row">
 
-                <md-form-field class="mr-24" fxFlex>
+                <md-form-field class="mr-sm-24" fxFlex>
                     <input mdInput [mdDatepicker]="startDatePicker" placeholder="Start Date">
                     <md-datepicker-toggle mdSuffix [for]="startDatePicker"></md-datepicker-toggle>
                     <md-datepicker #startDatePicker></md-datepicker>
@@ -85,14 +92,16 @@
             </div>
 
             <md-input-container class="" fxFill>
-                 <textarea mdInput
-                           name="notes"
-                           formControlName="notes"
-                           placeholder="Notes"
-                           md-maxlength="500"
-                           mdTextareaAutosize
-                           mdAutosizeMinRows="6">
-                 </textarea>
+                <textarea mdInput #notes
+                          name="notes"
+                          formControlName="notes"
+                          placeholder="Notes"
+                          maxlength="500"
+                          mdTextareaAutosize
+                          mdAutosizeMinRows="1"
+                          mdAutosizeMaxRows="6">
+                </textarea>
+                <md-hint align="end">{{notes.value.length}} / 500</md-hint>
             </md-input-container>
 
             <button *ngIf="formType === 'new'"
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.scss b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss
index 503982d1..d0162789 100644
--- a/src/app/main/content/apps/todo/todo-details/todo-details.component.scss
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss
@@ -8,6 +8,8 @@
     padding: 24px;
 
     .todo-header {
+        padding-bottom: 24px;
+        margin-bottom: 8px;
         border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 
         .actions {
@@ -38,74 +40,10 @@
             }
         }
 
-        .to {
-            color: rgba(0, 0, 0, 0.54);
+        .dates {
 
-            .to-text {
-                margin-right: 4px;
-                text-transform: lowercase;
-            }
-        }
-
-        .info {
-            padding-bottom: 16px;
-
-            .avatar {
-                margin-right: 16px;
-                background-color: mat-color($accent);
-            }
-
-            .name {
-                margin-right: 8px;
-                font-weight: 500;
-            }
-
-            .toggle-details {
-                user-select: none;
-                text-decoration: underline;
-                padding-top: 16px;
-                cursor: pointer;
-                font-weight: 500;
-            }
-
-            .details {
-                padding-top: 8px;
-
-                .title {
-                    font-weight: 500;
-                    margin-right: 6px;
-                }
-
-                .detail {
-                    color: rgba(0, 0, 0, 0.54);
-                }
-            }
-
-        }
-    }
-
-    .todo-attachments {
-        padding: 24px 0;
-        border-top: 1px solid rgba(0, 0, 0, 0.12);
-
-        .title {
-            margin-bottom: 16px;
-            font-weight: 500;
-        }
-
-        .attachment {
-
-            .preview {
-                width: 100px;
-                margin: 0 16px 8px 0;
-            }
-
-            .link {
-                margin-bottom: 2px;
-            }
-
-            .size {
-                font-size: 11px;
+            .mat-form-field {
+                width: auto !important;
             }
         }
     }

From e6ee5d017e7024ec099d0bb309c415f7d2e10a22 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 15:02:07 +0300
Subject: [PATCH 24/27] small tweaks and ng-* cleanups + Fixed: todo item
 action buttons shouldn't trigger "view todo" action + Fixed: contacts
 selected bar mobile issues

---
 .../theme-options.component.scss              |  2 +-
 .../apps/calendar/calendar.component.scss     |  8 ++++----
 .../event-form/event-form.component.html      |  4 ++--
 .../sidenavs/left/chats/chats.component.html  |  1 -
 .../apps/contacts/contacts.component.html     |  2 +-
 .../selected-bar/selected-bar.component.html  |  4 ++--
 .../sidenavs/main/main.component.scss         |  4 ++--
 .../dashboards/project/project.component.html | 12 +++++++----
 .../dialogs/compose/compose.component.html    |  2 +-
 .../mail-details/mail-details.component.html  |  2 +-
 .../board/dialogs/card/card.component.html    |  1 -
 .../todo-list-item.component.html             | 20 ++++++++-----------
 .../todo-list-item.component.ts               |  6 ------
 .../todo/todo-list/todo-list.component.scss   |  1 +
 .../content/apps/todo/todo.component.scss     |  4 ++++
 .../main/content/apps/todo/todo.service.ts    |  2 --
 .../components/widget/widget.component.html   |  4 ++--
 17 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/app/core/components/theme-options/theme-options.component.scss
index 950c472c..f01c54f4 100644
--- a/src/app/core/components/theme-options/theme-options.component.scss
+++ b/src/app/core/components/theme-options/theme-options.component.scss
@@ -32,7 +32,7 @@
 
         @include media-breakpoint-down('xs') {
             top: -120px;
-            max-height: calc(100vh - 60px);
+            max-height: calc(100vh - 100px);
             width: 90vw;
         }
 
diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
index 4fc3c6a2..19500ca3 100644
--- a/src/app/main/content/apps/calendar/calendar.component.scss
+++ b/src/app/main/content/apps/calendar/calendar.component.scss
@@ -26,8 +26,8 @@
     }
 
     .cal-open-day-events {
-        background: whitesmoke;
-        box-shadow: inset 0 0 15px 0 rgba(0, 0, 0, 0.13);
+        background: #455A64;
+        box-shadow: inset 0 0 12px 0 rgba(0, 0, 0, 0.54);
         padding: 0;
         display: flex;
         flex-direction: column;
@@ -44,11 +44,11 @@
             transition: box-shadow 300ms ease;
 
             &:first-of-type {
-                margin-top: 24px;
+                margin-top: 16px;
             }
 
             &:last-of-type {
-                margin-bottom: 24px;
+                margin-bottom: 16px;
             }
 
             &:hover {
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
index 3adb7c31..2bdc588a 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html
@@ -66,7 +66,7 @@
                 </md-form-field>
 
                 <md-input-container class="no-errors-spacer" fxFlex md-no-float>
-                    <input mdInput ng-model="calendarEvent.startTime" placeholder="Start Time">
+                    <input mdInput placeholder="Start Time">
                 </md-input-container>
 
             </div>
@@ -80,7 +80,7 @@
                 </md-form-field>
 
                 <md-input-container class="no-errors-spacer" fxFlex md-no-float>
-                    <input mdInput ng-model="calendarEvent.endTime" placeholder="End Time">
+                    <input mdInput placeholder="End Time">
                 </md-input-container>
 
             </div>
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
index a2df3ca7..c788af9e 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
@@ -151,7 +151,6 @@
             </div>
 
             <button md-button class="contact"
-                    ng-show="chatSearch"
                     *ngFor="let contact of contacts| filter: searchText"
                     (click)="getChat(contact.id)"
                     [@animate]="{value:'*',params:{y:'100%'}}">
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 070a1272..7dbf22c5 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -43,7 +43,7 @@
 
         <!-- SIDENAV -->
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
-                    fuseMdSidenavHelper="contacts-main-sidenav" md-is-locked-open="gt-md">
+                    fuseMdSidenavHelper="contacts-main-sidenav" md-is-locked-open="gt-sm">
 
             <fuse-contacts-main-sidenav *fuseIfOnDom [@animate]="{value:'*'}"></fuse-contacts-main-sidenav>
 
diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html
index 9f396060..4087740d 100644
--- a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html
+++ b/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html
@@ -1,13 +1,13 @@
 <div fxFlex fxLayout="row" fxLayoutAlign="start center" class="p-24">
 
-    <div class="close-button-wrapper" fxFlex="220px" (click)="deselectAll()">
+    <div class="close-button-wrapper" fxFlex="0 1 auto" fxFlex.gt-sm="220px" (click)="deselectAll()">
         <button class="p-8" md-button fxLayout="row" fxLayoutAlign="start center">
             <md-icon class="mr-8">arrow_back</md-icon>
             <span class="text-uppercase">Back</span>
         </button>
     </div>
 
-    <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
+    <div fxFlex fxLayout="row" fxLayoutAlign="end center" fxLayoutAlign.gt-sm="space-between center">
 
         <div>
             <span class="selected-contacts-count">
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss b/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
index 5c6b97f8..c239a34f 100644
--- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
+++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
@@ -11,7 +11,7 @@
         flex-direction: column;
         padding: 0;
 
-        @include media-breakpoint(gt-md) {
+        @include media-breakpoint(gt-sm) {
             padding: 24px 4px 24px 24px;
         }
 
@@ -21,7 +21,7 @@
             flex: 0 1 auto;
             padding: 0;
 
-            @include media-breakpoint(gt-md) {
+            @include media-breakpoint(gt-sm) {
                 @include mat-elevation(4);
             }
 
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index 7d785fe9..6dc003d4 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -79,7 +79,8 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
+                                            aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -121,7 +122,8 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
+                                            aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -163,7 +165,8 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
+                                            aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
@@ -204,7 +207,8 @@
 
                                 <!-- Back -->
                                 <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
-                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button" ng-click="flipWidget()" aria-label="Flip widget">
+                                    <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
+                                            aria-label="Flip widget">
                                         <md-icon class="s-16">close</md-icon>
                                     </button>
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index aecdd630..ac423a74 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -21,7 +21,7 @@
                        type="email">
             </md-input-container>
 
-            <md-input-container ng-class="{'hidden-cc': vm.hiddenCC, 'hidden-bcc': vm.hiddenBCC}">
+            <md-input-container>
                 <input mdInput name="to"
                        placeholder="To"
                        formControlName="to"
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.html b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
index 42df8292..ee29da61 100644
--- a/src/app/main/content/apps/mail/mail-details/mail-details.component.html
+++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
@@ -85,7 +85,7 @@
             </div>
 
             <button md-button [mdMenuTriggerFor]="moreMenu" aria-label="More" class="mat-icon-button"
-                    ng-click="$mdOpenMenu($event)">
+                    (click)="$event.stopPropagation()">
                 <md-icon>more_vert</md-icon>
             </button>
 
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index 75e65ef5..2b7ca5d4 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -386,7 +386,6 @@
                     <div class="section-content">
                         <form name="cardCommentForm"
                               #newCommentForm="ngForm" (submit)="addNewComment(newCommentForm)"
-                              ng-submit="vm.addNewComment(vm.newCommentText); vm.newCommentText =''"
                               class="comment new-comment" fxLayout="column" fxLayoutAlign="start" no-validate>
 
                             <div fxLayout="row">
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
index 3782a525..aaecb99b 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
+++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
@@ -1,18 +1,16 @@
 <div fxLayout="row" fxLayoutAlign="start center">
 
-    <md-icon class="handle mr-16" ngxDragHandle (click)="$event.stopPropagation()" fxFlex="0 1 auto" fxHide.xs>
+    <md-icon class="handle mr-16" ngxDragHandle fxFlex="0 1 auto" fxHide.xs>
         drag_handle
     </md-icon>
 
     <md-checkbox [(ngModel)]="selected" (ngModelChange)="onSelectedChange()"
-                 (click)="$event.stopPropagation()"
-                 class="mr-16"
-                 fxFlex="0 1 auto">
+                 class="mr-16" fxFlex="0 1 auto">
     </md-checkbox>
 
     <div fxLayout="row" fxLayoutAlign="start center" fxFlex>
 
-        <div class="info" fxFlex FlexLayout="column">
+        <div class="info" fxFlex fxFlexLayout="column">
 
             <div class="title">
                 {{todo.title}}
@@ -25,9 +23,7 @@
             <div class="tags" fxLayout="row" fxLayoutAlign="start center" fxLayoutWrap>
 
                 <div class="tag" fxLayout="row" fxLayoutAlign="start center" *ngFor="let tagId of todo.tags">
-
                     <div class="tag-color" [ngStyle]="{'background-color': tags | getById:tagId:'color'}"></div>
-
                     <div class="tag-label">{{tags | getById:tagId:'title'}}</div>
                 </div>
 
@@ -37,20 +33,20 @@
 
         <div class="actions" fxLayout="row" fxLayoutAlign="start center">
 
-            <button md-button class="mat-icon-button" (click)="toggleImportant($event)" aria-label="Toggle important"
-                    fxHide.xs>
+            <button md-button class="mat-icon-button" (click)="toggleImportant($event)"
+                    aria-label="Toggle important" fxHide.xs>
                 <md-icon *ngIf="todo.important">error</md-icon>
                 <md-icon *ngIf="!todo.important">error_outline</md-icon>
             </button>
 
-            <button md-button class="mat-icon-button" (click)="toggleStar($event)" aria-label="Toggle star"
-                    fxHide.xs>
+            <button md-button class="mat-icon-button" (click)="toggleStar($event)"
+                    aria-label="Toggle star" fxHide.xs>
                 <md-icon *ngIf="todo.starred">star</md-icon>
                 <md-icon *ngIf="!todo.starred">star_outline</md-icon>
             </button>
 
             <button md-button [mdMenuTriggerFor]="moreMenu" aria-label="More" class="mat-icon-button"
-                    ng-click="$mdOpenMenu($event)" fxHide.xs>
+                    (click)="$event.stopPropagation();" fxHide.xs>
                 <md-icon>more_vert</md-icon>
             </button>
 
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
index 5a4c2c76..765db6ca 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
+++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
@@ -78,40 +78,34 @@ export class FuseTodoListItemComponent implements OnInit, OnDestroy
 
     /**
      * Toggle star
-     * @param event
      */
     toggleStar(event)
     {
         event.stopPropagation();
 
         this.todo.toggleStar();
-
         this.todoService.updateTodo(this.todo);
     }
 
     /**
      * Toggle Important
-     * @param event
      */
     toggleImportant(event)
     {
         event.stopPropagation();
 
         this.todo.toggleImportant();
-
         this.todoService.updateTodo(this.todo);
     }
 
     /**
      * Toggle Completed
-     * @param event
      */
     toggleCompleted(event)
     {
         event.stopPropagation();
 
         this.todo.toggleCompleted();
-
         this.todoService.updateTodo(this.todo);
     }
 }
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.scss b/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
index 8fb43255..6c063deb 100644
--- a/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
+++ b/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
@@ -5,4 +5,5 @@
     overflow-y: auto;
     position: relative;
     padding: 0;
+    border-right: 1px solid rgba(0, 0, 0, .12);
 }
diff --git a/src/app/main/content/apps/todo/todo.component.scss b/src/app/main/content/apps/todo/todo.component.scss
index 903a75e5..b702ba18 100644
--- a/src/app/main/content/apps/todo/todo.component.scss
+++ b/src/app/main/content/apps/todo/todo.component.scss
@@ -39,6 +39,10 @@
 
             @include media-breakpoint-down(lg) {
 
+                fuse-todo-list {
+                    border-right: 0;
+                }
+
                 fuse-todo-list,
                 fuse-todo-details {
                     flex: 1 0 100%;
diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts
index e91d84f1..bae4a873 100644
--- a/src/app/main/content/apps/todo/todo.service.ts
+++ b/src/app/main/content/apps/todo/todo.service.ts
@@ -381,8 +381,6 @@ export class TodoService implements Resolve<any>
 
                     this.getTodos().then(todos => {
 
-                        this.setCurrentTodo(todo.id);
-
                         resolve(todos);
 
                     }, reject);
diff --git a/src/app/main/content/components/widget/widget.component.html b/src/app/main/content/components/widget/widget.component.html
index bf6dc57b..46717337 100644
--- a/src/app/main/content/components/widget/widget.component.html
+++ b/src/app/main/content/components/widget/widget.component.html
@@ -45,7 +45,7 @@
                     <!-- Back -->
                     <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
                         <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
-                                ng-click="flipWidget()" aria-label="Flip widget">
+                                aria-label="Flip widget">
                             <md-icon class="s-16">close</md-icon>
                         </button>
 
@@ -86,7 +86,7 @@
                             <!-- Back -->
                             <div class="fuse-widget-back p-16 pt-32 md-white-bg mat-elevation-z2">
                                 <button md-icon-button fuseWidgetToggle class="fuse-widget-flip-button"
-                                        ng-click="flipWidget()" aria-label="Flip widget">
+                                        aria-label="Flip widget">
                                     <md-icon class="s-16">close</md-icon>
                                 </button>
 

From 67476107717699c331def24aea4aa15166e36102 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 16:04:59 +0300
Subject: [PATCH 25/27] Fixed: Fullwidth simple page layout doesn't scroll +
 Added: New logo to the various pages + Fixed: Mobile zoom is not disabled +
 Fixed: Profile timeline mobile order is not correct + Fixed: Quickpanel
 focusses to the form elements causing it to scroll on mobile devices when
 opened + Various demo page mobile fixes

---
 src/app/core/scss/partials/_page-layouts.scss     |  5 ++++-
 .../apps/scrumboard/scrumboard.component.scss     |  1 +
 .../forgot-password.component.html                |  2 +-
 .../forgot-password.component.scss                |  7 -------
 .../authentication/login-2/login-2.component.html |  4 +++-
 .../authentication/login-2/login-2.component.scss |  8 --------
 .../authentication/login/login.component.html     |  8 ++++++--
 .../authentication/login/login.component.scss     |  7 -------
 .../register-2/register-2.component.html          |  4 +++-
 .../register-2/register-2.component.scss          |  8 --------
 .../register/register.component.html              |  8 ++++++--
 .../register/register.component.scss              |  7 -------
 .../reset-password/reset-password.component.html  |  2 +-
 .../reset-password/reset-password.component.scss  |  7 -------
 .../pages/coming-soon/coming-soon.component.html  |  4 ++--
 .../pages/coming-soon/coming-soon.component.scss  |  7 -------
 .../pages/invoices/compact/compact.component.html |  8 ++++----
 .../pages/invoices/compact/compact.component.scss |  9 +--------
 .../pages/invoices/modern/modern.component.html   |  9 +++++----
 .../pages/invoices/modern/modern.component.scss   |  9 ---------
 .../pages/maintenance/maintenance.component.html  |  2 +-
 .../pages/maintenance/maintenance.component.scss  |  9 +--------
 .../profile/tabs/timeline/timeline.component.html |  6 ++----
 .../profile/tabs/timeline/timeline.component.scss |  2 +-
 .../main/content/ui/forms/forms.component.scss    |  1 +
 .../main/quick-panel/quick-panel.component.html   | 15 +++++++++------
 src/index.html                                    |  2 +-
 27 files changed, 53 insertions(+), 108 deletions(-)

diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss
index 5abc20e8..51595b0a 100644
--- a/src/app/core/scss/partials/_page-layouts.scss
+++ b/src/app/core/scss/partials/_page-layouts.scss
@@ -273,6 +273,10 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
         }
 
         // Fullwidth
+        &.fullwidth {
+            overflow: auto;
+        }
+
         &.fullwidth,
         &.inner-sidenav {
             min-height: 100%;
@@ -445,7 +449,6 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
         &.simple {
 
             &.fullwidth {
-                overflow: visible;
 
                 > .content {
                     flex: 1 0 auto;
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.scss b/src/app/main/content/apps/scrumboard/scrumboard.component.scss
index 23b5efdd..067b0ea0 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.scss
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.scss
@@ -5,6 +5,7 @@
 
     #boards {
         width: 100%;
+        overflow: auto;
 
         .board-list {
             padding: 32px 0;
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
index 1eb104b1..2e7cc32f 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
@@ -5,7 +5,7 @@
         <div id="forgot-password-form">
 
             <div class="logo">
-                <span>F</span>
+                <img src="assets/images/logos/fuse.svg">
             </div>
 
             <div class="title">RECOVER YOUR PASSWORD</div>
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
index 12c789e0..f9038d5c 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
@@ -31,14 +31,7 @@
 
                 .logo {
                     width: 128px;
-                    height: 128px;
-                    line-height: 128px;
-                    font-size: 86px;
-                    font-weight: 500;
                     margin: 32px auto;
-                    color: #FFFFFF;
-                    border-radius: 2px;
-                    background: mat-color($accent);
                 }
 
                 .title {
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
index 8177b1bc..eb52f550 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.html
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html
@@ -1,8 +1,9 @@
 <div id="login" fxLayout="row" fxLayoutAlign="start">
 
     <div id="login-intro" fxFlex fxHide fxShow.gt-xs>
+
         <div class="logo" *fuseIfOnDom [@animate]="{value:'*',params:{scale:'0.2'}}">
-            <span>F</span>
+            <img src="assets/images/logos/fuse.svg">
         </div>
 
         <div class="title" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',y:'25px'}}">
@@ -13,6 +14,7 @@
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ullamcorper nisl erat,
             vel convallis elit fermentum pellentesque. Sed mollis velit facilisis facilisis viverra.
         </div>
+
     </div>
 
     <div id="login-form-wrapper" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',x:'100%'}}">
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.scss b/src/app/main/content/pages/authentication/login-2/login-2.component.scss
index f63666af..5753222d 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.scss
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.scss
@@ -17,15 +17,7 @@
 
             .logo {
                 width: 128px;
-                height: 128px;
-                line-height: 128px;
-                font-size: 86px;
-                font-weight: 500;
                 margin-bottom: 32px;
-                color: #FFFFFF;
-                border-radius: 2px;
-                text-align: center;
-                background: mat-color($accent);
             }
 
             .title {
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
index 4221ec98..e44e36a3 100644
--- a/src/app/main/content/pages/authentication/login/login.component.html
+++ b/src/app/main/content/pages/authentication/login/login.component.html
@@ -3,8 +3,9 @@
     <div id="login-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
         <div id="login-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
-            <div class="logo md-accent-bg">
-                <span>F</span>
+
+            <div class="logo">
+                <img src="assets/images/logos/fuse.svg">
             </div>
 
             <div class="title">LOGIN TO YOUR ACCOUNT</div>
@@ -62,6 +63,9 @@
                 <span class="text">Don't have an account?</span>
                 <a class="link" [routerLink]="'/pages/auth/register'">Create an account</a>
             </div>
+
         </div>
+
     </div>
+
 </div>
\ No newline at end of file
diff --git a/src/app/main/content/pages/authentication/login/login.component.scss b/src/app/main/content/pages/authentication/login/login.component.scss
index aab0e1dd..c02feb61 100644
--- a/src/app/main/content/pages/authentication/login/login.component.scss
+++ b/src/app/main/content/pages/authentication/login/login.component.scss
@@ -31,14 +31,7 @@
 
                 .logo {
                     width: 128px;
-                    height: 128px;
-                    line-height: 128px;
-                    font-size: 86px;
-                    font-weight: 500;
                     margin: 32px auto;
-                    color: #FFFFFF;
-                    border-radius: 2px;
-                    background: mat-color($accent);
                 }
 
                 .title {
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
index 5092e6fe..4418defe 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.html
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html
@@ -1,8 +1,9 @@
 <div id="register" fxLayout="row" fxLayoutAlign="start">
 
     <div id="register-intro" fxFlex fxHide fxShow.gt-xs>
+
         <div class="logo" *fuseIfOnDom [@animate]="{value:'*',params:{scale:'0.2'}}">
-            <span>F</span>
+            <img src="assets/images/logos/fuse.svg">
         </div>
 
         <div class="title" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',y:'25px'}}">
@@ -13,6 +14,7 @@
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ullamcorper nisl erat,
             vel convallis elit fermentum pellentesque. Sed mollis velit facilisis facilisis viverra.
         </div>
+
     </div>
 
     <div id="register-form-wrapper" fusePerfectScrollbar *fuseIfOnDom [@animate]="{value:'*',params:{delay:'300ms',x:'100%'}}">
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.scss b/src/app/main/content/pages/authentication/register-2/register-2.component.scss
index e583e60c..9d8943da 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.scss
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.scss
@@ -17,15 +17,7 @@
 
             .logo {
                 width: 128px;
-                height: 128px;
-                line-height: 128px;
-                font-size: 86px;
-                font-weight: 500;
                 margin-bottom: 32px;
-                color: #FFFFFF;
-                border-radius: 2px;
-                text-align: center;
-                background: mat-color($accent);
             }
 
             .title {
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
index d38b333d..7f1a9f34 100644
--- a/src/app/main/content/pages/authentication/register/register.component.html
+++ b/src/app/main/content/pages/authentication/register/register.component.html
@@ -3,8 +3,9 @@
     <div id="register-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
         <div id="register-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
-            <div class="logo md-accent-bg">
-                <span>F</span>
+
+            <div class="logo">
+                <img src="assets/images/logos/fuse.svg">
             </div>
 
             <div class="title">CREATE AN ACCOUNT</div>
@@ -60,6 +61,9 @@
                 <span class="text">Already have an account?</span>
                 <a class="link" [routerLink]="'/pages/auth/login'">Login</a>
             </div>
+
         </div>
+
     </div>
+
 </div>
\ No newline at end of file
diff --git a/src/app/main/content/pages/authentication/register/register.component.scss b/src/app/main/content/pages/authentication/register/register.component.scss
index 4c170672..9527db41 100644
--- a/src/app/main/content/pages/authentication/register/register.component.scss
+++ b/src/app/main/content/pages/authentication/register/register.component.scss
@@ -31,14 +31,7 @@
 
                 .logo {
                     width: 128px;
-                    height: 128px;
-                    line-height: 128px;
-                    font-size: 86px;
-                    font-weight: 500;
                     margin: 32px auto;
-                    color: #FFFFFF;
-                    border-radius: 2px;
-                    background: mat-color($accent);
                 }
 
                 .title {
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
index e9f2c27d..d0d118dc 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
@@ -6,7 +6,7 @@
         <div id="reset-password-form">
 
             <div class="logo">
-                <span>F</span>
+                <img src="assets/images/logos/fuse.svg">
             </div>
 
             <div class="title">RESET YOUR PASSWORD</div>
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
index 1bdee4f1..68beef6a 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
@@ -31,14 +31,7 @@
 
                 .logo {
                     width: 128px;
-                    height: 128px;
-                    line-height: 128px;
-                    font-size: 86px;
-                    font-weight: 500;
                     margin: 32px auto;
-                    color: #FFFFFF;
-                    border-radius: 2px;
-                    background: mat-color($accent);
                 }
 
                 .title {
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
index fa19777e..06e7e5e4 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.html
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.html
@@ -6,8 +6,8 @@
 
             <div class="top">
 
-                <div class="logo md-accent-bg">
-                    <span>F</span>
+                <div class="logo">
+                    <img src="assets/images/logos/fuse.svg">
                 </div>
 
                 <div class="title">Hey! Thank you for checking out our app.</div>
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.scss b/src/app/main/content/pages/coming-soon/coming-soon.component.scss
index 5f0b2533..a32f0ba2 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.scss
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.scss
@@ -37,14 +37,7 @@
 
                     .logo {
                         width: 128px;
-                        height: 128px;
-                        line-height: 128px;
-                        font-size: 86px;
-                        font-weight: 500;
                         margin: 32px auto;
-                        color: #FFFFFF;
-                        border-radius: 2px;
-                        background: mat-color($accent);
                     }
 
                     .title {
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.html b/src/app/main/content/pages/invoices/compact/compact.component.html
index 526ecfa6..7aa864df 100644
--- a/src/app/main/content/pages/invoices/compact/compact.component.html
+++ b/src/app/main/content/pages/invoices/compact/compact.component.html
@@ -30,8 +30,8 @@
                     </div>
 
                     <div class="issuer md-accent-bg" fxLayout="row" fxLayoutAlign="start center">
-                        <div class="logo" fxLayout="row" fxLayoutAlign="center center">
-                            <span>F</span>
+                        <div class="logo">
+                            <img src="assets/images/logos/fuse.svg">
                         </div>
 
                         <div class="info">
@@ -124,8 +124,8 @@
             <div class="footer">
                 <div class="note">Please pay within 15 days. Thank you for your business.</div>
                 <div fxLayout="row" fxLayoutAlign="start start">
-                    <div class="logo md-accent-bg" fxLayout="row" fxLayoutAlign="center center">
-                        <div>F</div>
+                    <div class="logo">
+                        <img src="assets/images/logos/fuse.svg">
                     </div>
                     <div class="small-note">
                         In condimentum malesuada efficitur. Mauris volutpat placerat auctor. Ut ac congue dolor. Quisque
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.scss b/src/app/main/content/pages/invoices/compact/compact.component.scss
index e3743eb4..39ee0b4a 100644
--- a/src/app/main/content/pages/invoices/compact/compact.component.scss
+++ b/src/app/main/content/pages/invoices/compact/compact.component.scss
@@ -68,8 +68,7 @@
 
                             .logo {
                                 width: 96px;
-                                height: 96px;
-                                font-size: 72px;
+                                padding: 0 8px;
                                 border-right: 1px solid rgba(255, 255, 255, 0.7);
                             }
 
@@ -186,12 +185,7 @@
                         .logo {
                             width: 32px;
                             min-width: 32px;
-                            height: 32px;
-                            font-size: 17px;
-                            font-weight: 500;
                             margin-right: 24px;
-                            border-radius: 2px;
-                            overflow: hidden;
                         }
 
                         .small-note {
@@ -341,7 +335,6 @@
                             }
 
                             .logo {
-                                font-size: 14pt;
                                 margin-right: 8pt;
                             }
 
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.html b/src/app/main/content/pages/invoices/modern/modern.component.html
index 5f20ecc5..4e903924 100644
--- a/src/app/main/content/pages/invoices/modern/modern.component.html
+++ b/src/app/main/content/pages/invoices/modern/modern.component.html
@@ -10,8 +10,9 @@
                 <div class="ids" fxLayout="column">
 
                     <div fxLayout="row" class="seller" fxLayoutAlign="start center">
-                        <div class="logo md-accent-bg" fxLayout="row" fxLayoutAlign="center center">
-                            <div>F</div>
+
+                        <div class="logo">
+                            <img src="assets/images/logos/fuse.svg">
                         </div>
 
                         <div class="divider"></div>
@@ -145,8 +146,8 @@
             <div class="footer">
                 <div class="note">Please pay within 15 days. Thank you for your business.</div>
                 <div fxLayout="row" fxLayoutAlign="start start">
-                    <div class="logo md-accent-bg" fxLayout="row" fxLayoutAlign="center center">
-                        <div>F</div>
+                    <div class="logo">
+                        <img src="assets/images/logos/fuse.svg">
                     </div>
                     <div class="small-note">
                         In condimentum malesuada efficitur. Mauris volutpat placerat auctor. Ut ac congue dolor. Quisque
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.scss b/src/app/main/content/pages/invoices/modern/modern.component.scss
index 2d8c84b6..473ebf19 100644
--- a/src/app/main/content/pages/invoices/modern/modern.component.scss
+++ b/src/app/main/content/pages/invoices/modern/modern.component.scss
@@ -35,8 +35,6 @@
 
                                 .logo {
                                     width: 156px;
-                                    height: 156px;
-                                    font-size: 115px;
                                 }
                             }
 
@@ -154,12 +152,7 @@
                         .logo {
                             width: 32px;
                             min-width: 32px;
-                            height: 32px;
-                            font-size: 17px;
-                            font-weight: 500;
                             margin-right: 24px;
-                            border-radius: 2px;
-                            overflow: hidden;
                         }
 
                         .small-note {
@@ -205,8 +198,6 @@
 
                                     .logo {
                                         width: 60pt;
-                                        height: 60pt;
-                                        font-size: 40pt;
                                     }
                                 }
 
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
index 7c383483..4706e03e 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.html
+++ b/src/app/main/content/pages/maintenance/maintenance.component.html
@@ -5,7 +5,7 @@
         <div id="maintenance-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
             <div class="logo">
-                <span>F</span>
+                <img src="assets/images/logos/fuse.svg">
             </div>
 
             <div class="title">Closed for scheduled maintenance!</div>
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.scss b/src/app/main/content/pages/maintenance/maintenance.component.scss
index 5878d40c..7dc78ae5 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.scss
+++ b/src/app/main/content/pages/maintenance/maintenance.component.scss
@@ -18,7 +18,7 @@
 
             #maintenance-form {
                 max-width: 384px;
-                padding: 32px;
+                padding: 48px;
                 background: #FFFFFF;
                 text-align: center;
                 @include mat-elevation(7);
@@ -30,14 +30,7 @@
 
                 .logo {
                     width: 128px;
-                    height: 128px;
-                    line-height: 128px;
-                    font-size: 86px;
-                    font-weight: 500;
                     margin: 32px auto;
-                    color: rgba(255, 255, 255, 1);
-                    border-radius: 2px;
-                    background: mat-color($accent);
                 }
 
                 .title {
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
index b717a0c5..ef796515 100644
--- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
+++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
@@ -1,7 +1,6 @@
 <div id="timeline" class="p-24" fxLayout="row" fxLayoutWrap>
 
-    <div class="timeline-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="55" fxFlex.gt-md="65" fxFlexOrder="2"
-         fxFlexOrder.gt-sm="1"
+    <div class="timeline-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="55" fxFlex.gt-md="65"
          *fuseIfOnDom [@animateStagger]="{value:'50'}">
 
         <div class="profile-box add-post"
@@ -135,8 +134,7 @@
         </div>
     </div>
 
-    <div class="timeline-sidebar" fxLayout="column" fxFlex="100" fxFlex.gt-sm="45" fxFlex.gt-md="35" fxFlexOrder="1"
-         fxFlexOrder.gt-sm="2">
+    <div class="timeline-sidebar" fxLayout="column" fxFlex="100" fxFlex.gt-sm="45" fxFlex.gt-md="35">
 
         <div class="profile-box latest-activity" fxLayout="column"
              *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'100%'}}">
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
index f247e378..107f66c5 100644
--- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
+++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
@@ -219,7 +219,7 @@
             padding-left: 32px;
 
             @include media-breakpoint-down('sm') {
-                padding: 0;
+                padding: 32px 0 0 0;
             }
 
             .latest-activity {
diff --git a/src/app/main/content/ui/forms/forms.component.scss b/src/app/main/content/ui/forms/forms.component.scss
index 33c43ccd..63daaf10 100644
--- a/src/app/main/content/ui/forms/forms.component.scss
+++ b/src/app/main/content/ui/forms/forms.component.scss
@@ -3,6 +3,7 @@
     .content {
 
         form {
+            width: 100%;
             max-width: 800px !important;
         }
 
diff --git a/src/app/main/quick-panel/quick-panel.component.html b/src/app/main/quick-panel/quick-panel.component.html
index 96ca90ec..f0133fd0 100644
--- a/src/app/main/quick-panel/quick-panel.component.html
+++ b/src/app/main/quick-panel/quick-panel.component.html
@@ -1,6 +1,6 @@
-<md-list class="date">
+<md-list class="date" cdk-focus-region-start>
 
-    <h3 md-subheader>
+    <h3 md-subheader cdk-focus-init>
         <span>Today</span>
     </h3>
 
@@ -16,7 +16,7 @@
     </div>
 </md-list>
 
-<md-divider></md-divider>
+<md-divider cdk-focus-region-end></md-divider>
 
 <md-list>
     <h3 md-subheader>
@@ -50,19 +50,22 @@
     </h3>
 
     <md-list-item>
-        <md-slide-toggle fxFlex class="mat-primary" [(ngModel)]="settings.notify" aria-label="Notifications" labelPosition="before">
+        <md-slide-toggle fxFlex class="mat-primary" [(ngModel)]="settings.notify" aria-label="Notifications"
+                         labelPosition="before">
             <h3>Notifications</h3>
         </md-slide-toggle>
     </md-list-item>
 
     <md-list-item>
-        <md-slide-toggle fxFlex class="mat-accent" [(ngModel)]="settings.cloud" aria-label="Cloud" labelPosition="before">
+        <md-slide-toggle fxFlex class="mat-accent" [(ngModel)]="settings.cloud" aria-label="Cloud"
+                         labelPosition="before">
             <h3>Cloud Sync</h3>
         </md-slide-toggle>
     </md-list-item>
 
     <md-list-item>
-        <md-slide-toggle fxFlex class="mat-warn" [(ngModel)]="settings.retro" aria-label="Retro Thrusters" labelPosition="before">
+        <md-slide-toggle fxFlex class="mat-warn" [(ngModel)]="settings.retro" aria-label="Retro Thrusters"
+                         labelPosition="before">
             <h3>Retro Thrusters</h3>
         </md-slide-toggle>
     </md-list-item>
diff --git a/src/index.html b/src/index.html
index 3ad6af95..a06b2cec 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,7 +10,7 @@
         <meta name="description" content="Material design admin template with pre-built apps and pages">
         <meta name="keywords" content="HTML,CSS,AngularJS,Angular,Angular 4,Angular 5,Angular 6, Material">
         <meta name="author" content="Withinpixels">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
         <link rel="icon" type="image/x-icon" href="favicon.ico">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

From dcff423943e3d928ccee0212ab68663dc91ddb14 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Fri, 22 Sep 2017 16:07:05 +0300
Subject: [PATCH 26/27] Updated version to 1.1.0 since we have couple breaking
 changes!

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ec276783..9af9e849 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse2",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b17493de..d1f7c5d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse2",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "license": "",
   "scripts": {
     "ng": "ng",

From 5e2e2b7d53e68494cfdf45e6235e4d4b0c587160 Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Fri, 22 Sep 2017 16:18:05 +0300
Subject: [PATCH 27/27] Backdrop added to FuseNavBar for mobile

---
 .../vertical/navbar-vertical.component.scss   | 11 +++
 .../vertical/navbar-vertical.component.ts     | 74 ++++++++++++++++---
 2 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.scss b/src/app/main/navbar/vertical/navbar-vertical.component.scss
index c047c2a6..400efd78 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.scss
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.scss
@@ -138,3 +138,14 @@ fuse-navbar-vertical {
         flex: 1;
     }
 }
+
+.fuse-navbar-backdrop {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 3;
+    background-color: rgba(0, 0, 0, 0.6);
+    opacity: 0;
+}
\ No newline at end of file
diff --git a/src/app/main/navbar/vertical/navbar-vertical.component.ts b/src/app/main/navbar/vertical/navbar-vertical.component.ts
index ec7b23a0..71c7b8bf 100644
--- a/src/app/main/navbar/vertical/navbar-vertical.component.ts
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostBinding, HostListener, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, ElementRef, HostBinding, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
 import { FuseMatchMedia } from '../../../core/services/match-media.service';
 import { FuseNavbarVerticalService } from './navbar-vertical.service';
@@ -7,6 +7,7 @@ import { FuseMainComponent } from '../../main.component';
 import { NavigationEnd, Router } from '@angular/router';
 import { FuseNavigationService } from '../../../core/components/navigation/navigation.service';
 import { FusePerfectScrollbarDirective } from '../../../core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
+import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
 
 @Component({
     selector     : 'fuse-navbar-vertical',
@@ -16,6 +17,7 @@ import { FusePerfectScrollbarDirective } from '../../../core/directives/fuse-per
 })
 export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
 {
+    private _backdropElement: HTMLElement | null = null;
     @HostBinding('class.close') isClosed: boolean;
     @HostBinding('class.folded') isFoldedActive: boolean;
     @HostBinding('class.folded-open') isFoldedOpen: boolean;
@@ -25,13 +27,18 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
 
     matchMediaWatcher: Subscription;
 
+    player: AnimationPlayer;
+
     constructor(
-        private fuseMainComponentEl: FuseMainComponent,
+        private fuseMainComponent: FuseMainComponent,
         private fuseMatchMedia: FuseMatchMedia,
         private fuseNavigationService: FuseNavigationService,
         private navBarService: FuseNavbarVerticalService,
         public media: ObservableMedia,
-        private router: Router
+        private router: Router,
+        private _renderer: Renderer2,
+        private _elementRef: ElementRef,
+        private animationBuilder: AnimationBuilder
     )
     {
         navBarService.setNavBar(this);
@@ -56,6 +63,7 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
                         else
                         {
                             this.openBar();
+                            this._detachBackdrop();
                         }
                     });
                 });
@@ -109,12 +117,17 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
     {
         this.isClosed = false;
         this.updateCssClasses();
+        if ( this.media.isActive('lt-lg') )
+        {
+            this._attachBackdrop();
+        }
     }
 
     closeBar()
     {
         this.isClosed = true;
         this.updateCssClasses();
+        this._detachBackdrop();
     }
 
     toggleBar()
@@ -144,14 +157,14 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
     activateFolded()
     {
         this.isFoldedActive = true;
-        this.fuseMainComponentEl.addClass('fuse-nav-bar-folded');
+        this.fuseMainComponent.addClass('fuse-nav-bar-folded');
         this.isFoldedOpen = false;
     }
 
     deActivateFolded()
     {
         this.isFoldedActive = false;
-        this.fuseMainComponentEl.removeClass('fuse-nav-bar-folded');
+        this.fuseMainComponent.removeClass('fuse-nav-bar-folded');
         this.isFoldedOpen = false;
     }
 
@@ -171,13 +184,56 @@ export class FuseNavbarVerticalComponent implements OnInit, OnDestroy
     {
         if ( this.isClosed )
         {
-            this.fuseMainComponentEl.addClass('fuse-nav-bar-opened');
-            this.fuseMainComponentEl.removeClass('fuse-nav-bar-closed');
+            this.fuseMainComponent.addClass('fuse-nav-bar-opened');
+            this.fuseMainComponent.removeClass('fuse-nav-bar-closed');
         }
         else
         {
-            this.fuseMainComponentEl.addClass('fuse-nav-bar-closed');
-            this.fuseMainComponentEl.removeClass('fuse-nav-bar-opened');
+            this.fuseMainComponent.addClass('fuse-nav-bar-closed');
+            this.fuseMainComponent.removeClass('fuse-nav-bar-opened');
+        }
+    }
+
+    private _attachBackdrop()
+    {
+        this._backdropElement = this._renderer.createElement('div');
+        this._backdropElement.classList.add('fuse-navbar-backdrop');
+
+        this._renderer.appendChild(this._elementRef.nativeElement.parentElement, this._backdropElement);
+
+        this.player =
+            this.animationBuilder
+                .build([
+                    animate('400ms ease', style({opacity: 1}))
+                ]).create(this._backdropElement);
+
+        this.player.play();
+
+        this._backdropElement.addEventListener('click', () => {
+                this.closeBar();
+            }
+        );
+    }
+
+    private _detachBackdrop()
+    {
+        if ( this._backdropElement )
+        {
+            this.player =
+                this.animationBuilder
+                    .build([
+                        animate('400ms cubic-bezier(.25,.8,.25,1)', style({opacity: 0}))
+                    ]).create(this._backdropElement);
+
+            this.player.play();
+
+            this.player.onDone(() => {
+                if ( this._backdropElement )
+                {
+                    this._backdropElement.parentNode.removeChild(this._backdropElement);
+                    this._backdropElement = null;
+                }
+            });
         }
     }