update: global layout

2020-07-02 18:03:56 +02:00
parent 67ab0a68a3
commit 6b390c975a
9 changed files with 224 additions and 167 deletions
--- a/client.sample.happy-dev.css
+++ b/client.sample.happy-dev.css
@ -1,6 +1,6 @@
 :root {
-  --color-primary: #FFB700;
-  --color-secondary: #3C3F57;
+  --color-primary: pink;
+  --color-secondary: green;
  --color-complementary: #6259E5;
  --color-complementary-darken: #36383B;
  --color-white: #FFFFFF;
@ -36,7 +36,7 @@
  --color-user-panel-list-border: #E4E8ED;

  /* Left menu */
-  --color-menu-highlight-primary: #FFD759;
+  --color-menu-highlight-primary: #000c42;
  --color-menu-background: var(--color-secondary);
  --color-menu-text: var(--color-white);
  --color-menu-text-active: var(--color-secondary);
--- a/client.sample.etuc.scss
+++ b/client.sample.etuc.scss
@ -0,0 +1,169 @@
+:root {
+  --color-primary: #063B5C;
+  --color-secondary: #3A3A3A;
+  --color-complementary: #C4262E;
+  --color-complementary-darken: #36383B;
+  --color-white: #FFFFFF;
+
+  --color-black-h: 216;
+  --color-black-s: 4%;
+  --color-black-l: 22%;
+
+  --color-main-background: var(--color-grey-13);
+  --color-main-text: #7A7F85;
+  --color-highlight-primary: var(--color-primary);
+  --color-user-panel: var(--color-black);
+  --color-bell: var(--color-secondary);
+  --color-avatar-background: #E4E8ED;
+  --color-title: #36383B;
+  --color-h1: var(--color-title);
+  --color-h2: var(--color-title);
+
+  /* Depreciated */
+  --color-tag-group-text: #9BA0A7;
+  --color-tag-group-border: var(--color-primary);
+  --color-label-dark: var(--color-grey-6);
+
+  /* Header's elements */
+  --color-header-background: var(--color-white);
+  --color-bell: var(--color-complementary-darken);
+  --color-user-panel-header-text: var(--color-complementary-darken);
+  --color-user-panel-header-background: var(--color-white);
+  --color-user-panel-header-text-open: var(--color-white);
+  --color-user-panel-header-background-open: var(--color-secondary);
+  --color-user-panel-list-background: var(--color-white);
+  --color-user-panel-list-text-hover: var(--color-complementary);
+  --color-user-panel-list-border: #E4E8ED;
+
+  /* Left menu */
+  --color-menu-highlight-primary:var(--color-white);
+  --color-menu-background: var(--color-secondary);
+  --color-menu-text: var(--color-white);
+  --color-menu-text-active: var(--color-complementary);
+  --color-menu-background-active: var(--color-menu-highlight-primary);
+  --color-menu-badge-background: var(--color-menu-highlight-primary);
+  --color-menu-badge-text-active: var(--color-menu-highlight-primary);
+  --color-menu-badge-background-active: var(--color-secondary);
+  --color-menu-icon-background-active: var(--color-secondary);
+
+  /* Right menu */
+  --color-right-menu-background: #e8e8ee;
+  --color-right-menu-text: #3c3F57;
+  --color-right-menu-link-border: #BDC2D7;
+  --color-right-menu-active-text: var(--color-white);
+  --color-right-menu-active-background: var(--color-complementary);
+  --color-right-menu-active-icon: var(--color-primary);
+
+  /* Scrollbar */
+  --color-scrollbar-right-background: var(--color-white);
+  --color-scrollbar-right-track: var(--color-grey-6);
+  --color-scrollbar-left-background: var(--color-secondary);
+  --color-scrollbar-left-track: var(--color-grey-11);
+
+  /* Tags */
+  --color-tag-admin-text: var(--color-complementary);
+  --color-tag-admin-border: var(--color-complementary);
+
+  /* Form elements */
+  --color-button-white: var(--color-white);
+  --color-button-primary: var(--color-primary);
+  --color-button-secondary: var(--color-complementary);
+  --color-button-complementary: var(--color-secondary);
+
+  --color-input-background: #EDF1FA;
+  --color-input-text: var(--color-secondary);
+  --color-input-icon: var(--color-complementary);
+  --color-input-active: var(--color-complementary);
+  --color-fieldset: var(--color-title);
+  --color-fieldset-border: #DAE2F3;
+  --color-button-modal: var(--color-title);
+  --color-select-list: var(--color-secondary);
+  --color-select-add-button: var(--color-button-secondary);
+  --color-select-add-button-background: var(--color-button-white);
+
+  --color-label-light: var(--color-grey-6);
+
+  /* Skill */
+  --color-skill-background: var(--color-primary);
+  --color-skill-text: var(--color-white);
+
+  /* Icon */
+  --color-icon: var(--color-primary);
+
+  /* Table */
+  --color-table-header-background: #BDC2D7;
+  --color-table-header-text: var(--color-white);
+  --color-table-border: #BDC2D7;
+
+  /* User thumb */
+  --color-user-thumb-name: #7A7F85;
+
+  --color-backlink: var(--color-secondary);
+  --color-content-header: #DAE2F3;
+
+  /* Chat */
+  --color-chat-white: var(--color-white);
+  --color-chat-primary: var(--color-primary);
+  --color-chat-complementary: var(--color-complementary);
+  --color-chat-secondary: var(--color-secondary);
+  --color-chat-complementary-darken: var(--color-complementary-darken);
+  --color-chat-grey-1: var(--color-grey-4);
+  --color-chat-grey-2: var(--color-grey-6);
+  --color-chat-grey-3: var(--color-grey-10);
+
+  /* Directory */
+  --color-directory-grey-4: #7A7F85;
+  --color-directory-grey-5: #F0F3F6;
+
+  --color-directory-avatar-background: #E4E8ED;
+  --color-directory-back-link: #36383B;
+  --color-directory-border: #DAE2F3;
+  --color-directory-content-header-border: #DAE2F3;
+  --color-directory-h1: var(--color-complementary-darken);
+  --color-directory-list-icon: var(--color-primary);
+  --color-directory-text: var(--color-directory-grey-4);
+
+  --color-directory-form-input: #EDF1FA;
+  --color-directory-form-input-text: var(--color-directory-grey-4);
+  --color-directory-form-input-active: var(--color-complementary);
+  --color-directory-form-select-icon: var(--color-complementary);
+}
+
+#main__menu {
+    font-family: "RefrigeratorDelxW01Bold";
+}
+#main__menu .menu {
+    font-size: 2rem;
+}
+#main__menu .menu[active=""] {
+    color: var(--color-complementary);
+}
+#main__menu .sub-menu.menu-notification {
+    font-family: Facit;
+}
+#viewport .content-box {
+    font-family: Facit;
+}
+#viewport #circle .content-box__header sib-display div {
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+}
+#viewport #circle .content-box__header .h1-like {
+    font-family: "RefrigeratorDelxW01Bold";
+    font-size: 3.2rem;
+    color: var(--color-primary);
+}
+#viewport #circle .content-box__header sib-display div .h1-aside {
+    font-family: Facit;
+    margin: 10px 0;
+}
+#viewport #circle .content-box__header sib-display div .h1-aside:not(:empty)::before {
+    content: none;
+}
+#viewport .with-sidebar nav > sib-router > ul > sib-route[active] {
+    color: var(--color-right-menu-active-text);
+}
+#viewport .with-sidebar nav > sib-router {
+    color: #3C3F57;
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -587,20 +587,17 @@
    "arr-diff": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "optional": true
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
    },
    "arr-flatten": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "optional": true
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
    },
    "arr-union": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "optional": true
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
    },
    "array-find-index": {
      "version": "1.0.2",
@ -610,8 +607,7 @@
    "array-unique": {
      "version": "0.3.2",
      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "optional": true
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
    },
    "asap": {
      "version": "2.0.6",
@ -634,8 +630,7 @@
    "assign-symbols": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "optional": true
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
    },
    "async": {
      "version": "3.2.0",
@ -662,8 +657,7 @@
    "atob": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "optional": true
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
    },
    "aws-sign2": {
      "version": "0.7.0",
@ -716,7 +710,6 @@
      "version": "0.11.2",
      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "optional": true,
      "requires": {
        "cache-base": "^1.0.1",
        "class-utils": "^0.3.5",
@ -731,7 +724,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^1.0.0"
          }
@ -740,7 +732,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -749,7 +740,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -758,7 +748,6 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "optional": true,
          "requires": {
            "is-accessor-descriptor": "^1.0.0",
            "is-data-descriptor": "^1.0.0",
@ -817,7 +806,6 @@
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "optional": true,
      "requires": {
        "arr-flatten": "^1.1.0",
        "array-unique": "^0.3.2",
@ -835,7 +823,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -863,7 +850,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "optional": true,
      "requires": {
        "collection-visit": "^1.0.0",
        "component-emitter": "^1.2.1",
@ -964,7 +950,6 @@
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "optional": true,
      "requires": {
        "arr-union": "^3.1.0",
        "define-property": "^0.2.5",
@ -976,7 +961,6 @@
          "version": "0.2.5",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^0.1.0"
          }
@ -1080,7 +1064,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "optional": true,
      "requires": {
        "map-visit": "^1.0.0",
        "object-visit": "^1.0.0"
@ -1128,8 +1111,7 @@
    "component-emitter": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "optional": true
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
    },
    "compressible": {
      "version": "2.0.18",
@ -1218,8 +1200,7 @@
    "copy-descriptor": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "optional": true
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
    },
    "copyfiles": {
      "version": "2.2.0",
@ -1560,8 +1541,7 @@
    "decode-uri-component": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "optional": true
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
    },
    "define-properties": {
      "version": "1.1.3",
@ -1575,7 +1555,6 @@
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "optional": true,
      "requires": {
        "is-descriptor": "^1.0.2",
        "isobject": "^3.0.1"
@ -1585,7 +1564,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -1594,7 +1572,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -1603,7 +1580,6 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "optional": true,
          "requires": {
            "is-accessor-descriptor": "^1.0.0",
            "is-data-descriptor": "^1.0.0",
@ -1797,7 +1773,6 @@
      "version": "2.1.4",
      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "optional": true,
      "requires": {
        "debug": "^2.3.3",
        "define-property": "^0.2.5",
@ -1812,7 +1787,6 @@
          "version": "0.2.5",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^0.1.0"
          }
@ -1821,7 +1795,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -1837,7 +1810,6 @@
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "optional": true,
      "requires": {
        "assign-symbols": "^1.0.0",
        "is-extendable": "^1.0.1"
@ -1847,7 +1819,6 @@
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "optional": true,
          "requires": {
            "is-plain-object": "^2.0.4"
          }
@ -1858,7 +1829,6 @@
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "optional": true,
      "requires": {
        "array-unique": "^0.3.2",
        "define-property": "^1.0.0",
@ -1874,7 +1844,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^1.0.0"
          }
@ -1883,7 +1852,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -1892,7 +1860,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -1901,7 +1868,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -1910,7 +1876,6 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "optional": true,
          "requires": {
            "is-accessor-descriptor": "^1.0.0",
            "is-data-descriptor": "^1.0.0",
@ -1992,7 +1957,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "optional": true,
      "requires": {
        "extend-shallow": "^2.0.1",
        "is-number": "^3.0.0",
@ -2004,7 +1968,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -2037,8 +2000,7 @@
    "for-in": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "optional": true
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
    },
    "forever-agent": {
      "version": "0.6.1",
@ -2059,7 +2021,6 @@
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "optional": true,
      "requires": {
        "map-cache": "^0.2.2"
      }
@ -2116,8 +2077,7 @@
        },
        "ansi-regex": {
          "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "aproba": {
          "version": "1.2.0",
@ -2154,8 +2114,7 @@
        },
        "code-point-at": {
          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "concat-map": {
          "version": "0.0.1",
@ -2164,8 +2123,7 @@
        },
        "console-control-strings": {
          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -2268,8 +2226,7 @@
        },
        "inherits": {
          "version": "2.0.4",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "ini": {
          "version": "1.3.5",
@ -2279,7 +2236,6 @@
        "is-fullwidth-code-point": {
          "version": "1.0.0",
          "bundled": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -2292,20 +2248,17 @@
        "minimatch": {
          "version": "3.0.4",
          "bundled": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
        },
        "minimist": {
          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "minipass": {
          "version": "2.9.0",
          "bundled": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@ -2322,7 +2275,6 @@
        "mkdirp": {
          "version": "0.5.1",
          "bundled": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -2403,8 +2355,7 @@
        },
        "number-is-nan": {
          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -2414,7 +2365,6 @@
        "once": {
          "version": "1.4.0",
          "bundled": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -2490,8 +2440,7 @@
        },
        "safe-buffer": {
          "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@ -2521,7 +2470,6 @@
        "string-width": {
          "version": "1.0.2",
          "bundled": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -2539,7 +2487,6 @@
        "strip-ansi": {
          "version": "3.0.1",
          "bundled": true,
-          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -2578,13 +2525,11 @@
        },
        "wrappy": {
          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        },
        "yallist": {
          "version": "3.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
        }
      }
    },
@ -2654,8 +2599,7 @@
    "get-value": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "optional": true
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
    },
    "getos": {
      "version": "3.1.4",
@ -2786,7 +2730,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "optional": true,
      "requires": {
        "get-value": "^2.0.6",
        "has-values": "^1.0.0",
@ -2797,7 +2740,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "optional": true,
      "requires": {
        "is-number": "^3.0.0",
        "kind-of": "^4.0.0"
@ -2807,7 +2749,6 @@
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -2894,7 +2835,6 @@
      "version": "0.1.6",
      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "optional": true,
      "requires": {
        "kind-of": "^3.0.2"
      },
@ -2903,7 +2843,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -2947,7 +2886,6 @@
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "optional": true,
      "requires": {
        "kind-of": "^3.0.2"
      },
@ -2956,7 +2894,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -2972,7 +2909,6 @@
      "version": "0.1.6",
      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "optional": true,
      "requires": {
        "is-accessor-descriptor": "^0.1.6",
        "is-data-descriptor": "^0.1.4",
@ -2982,8 +2918,7 @@
        "kind-of": {
          "version": "5.1.0",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "optional": true
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
        }
      }
    },
@ -3006,14 +2941,12 @@
    "is-extendable": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "optional": true
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
    },
    "is-extglob": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "optional": true
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
    },
    "is-finite": {
      "version": "1.1.0",
@ -3051,7 +2984,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "optional": true,
      "requires": {
        "kind-of": "^3.0.2"
      },
@ -3060,7 +2992,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -3089,7 +3020,6 @@
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "optional": true,
      "requires": {
        "isobject": "^3.0.1"
      }
@ -3134,8 +3064,7 @@
    "is-windows": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "optional": true
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
    },
    "isarray": {
      "version": "1.0.0",
@ -3150,8 +3079,7 @@
    "isobject": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "optional": true
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
    },
    "isstream": {
      "version": "0.1.2",
@ -3250,8 +3178,7 @@
    "kind-of": {
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "optional": true
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
    },
    "lazy-ass": {
      "version": "1.6.0",
@ -3581,8 +3508,7 @@
    "map-cache": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "optional": true
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
    },
    "map-obj": {
      "version": "1.0.1",
@ -3593,7 +3519,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "optional": true,
      "requires": {
        "object-visit": "^1.0.0"
      }
@ -3637,7 +3562,6 @@
      "version": "3.1.10",
      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "optional": true,
      "requires": {
        "arr-diff": "^4.0.0",
        "array-unique": "^0.3.2",
@ -3695,7 +3619,6 @@
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "optional": true,
      "requires": {
        "for-in": "^1.0.2",
        "is-extendable": "^1.0.1"
@ -3705,7 +3628,6 @@
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "optional": true,
          "requires": {
            "is-plain-object": "^2.0.4"
          }
@ -3740,7 +3662,6 @@
      "version": "1.2.13",
      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "optional": true,
      "requires": {
        "arr-diff": "^4.0.0",
        "array-unique": "^0.3.2",
@ -4028,7 +3949,6 @@
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "optional": true,
      "requires": {
        "copy-descriptor": "^0.1.0",
        "define-property": "^0.2.5",
@ -4039,7 +3959,6 @@
          "version": "0.2.5",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^0.1.0"
          }
@ -4048,7 +3967,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -4069,7 +3987,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "optional": true,
      "requires": {
        "isobject": "^3.0.0"
      }
@ -4089,7 +4006,6 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "optional": true,
      "requires": {
        "isobject": "^3.0.1"
      }
@ -4203,8 +4119,7 @@
    "pascalcase": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "optional": true
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
    },
    "path-dirname": {
      "version": "1.0.2",
@ -4288,8 +4203,7 @@
    "posix-character-classes": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "optional": true
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
    },
    "pretty-bytes": {
      "version": "5.3.0",
@ -4587,7 +4501,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "optional": true,
      "requires": {
        "extend-shallow": "^3.0.2",
        "safe-regex": "^1.1.0"
@ -4602,8 +4515,7 @@
    "repeat-element": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "optional": true
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
    },
    "repeat-string": {
      "version": "1.6.1",
@ -4675,8 +4587,7 @@
    "resolve-url": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "optional": true
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
    },
    "restore-cursor": {
      "version": "1.0.1",
@ -4691,8 +4602,7 @@
    "ret": {
      "version": "0.1.15",
      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "optional": true
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
    },
    "right-align": {
      "version": "0.1.3",
@ -4728,7 +4638,6 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "optional": true,
      "requires": {
        "ret": "~0.1.10"
      }
@ -4825,7 +4734,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "optional": true,
      "requires": {
        "extend-shallow": "^2.0.1",
        "is-extendable": "^0.1.1",
@ -4837,7 +4745,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -4887,7 +4794,6 @@
      "version": "0.8.2",
      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "optional": true,
      "requires": {
        "base": "^0.11.1",
        "debug": "^2.2.0",
@ -4903,7 +4809,6 @@
          "version": "0.2.5",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^0.1.0"
          }
@ -4912,7 +4817,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
          "requires": {
            "is-extendable": "^0.1.0"
          }
@ -4923,7 +4827,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "optional": true,
      "requires": {
        "define-property": "^1.0.0",
        "isobject": "^3.0.0",
@ -4934,7 +4837,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^1.0.0"
          }
@ -4943,7 +4845,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -4952,7 +4853,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "optional": true,
          "requires": {
            "kind-of": "^6.0.0"
          }
@ -4961,7 +4861,6 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "optional": true,
          "requires": {
            "is-accessor-descriptor": "^1.0.0",
            "is-data-descriptor": "^1.0.0",
@ -4974,7 +4873,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "optional": true,
      "requires": {
        "kind-of": "^3.2.0"
      },
@ -4983,7 +4881,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -4999,7 +4896,6 @@
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "optional": true,
      "requires": {
        "atob": "^2.1.1",
        "decode-uri-component": "^0.2.0",
@ -5011,8 +4907,7 @@
    "source-map-url": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "optional": true
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
    },
    "spdx-correct": {
      "version": "3.1.0",
@ -5046,7 +4941,6 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "optional": true,
      "requires": {
        "extend-shallow": "^3.0.0"
      }
@ -5071,7 +4965,6 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "optional": true,
      "requires": {
        "define-property": "^0.2.5",
        "object-copy": "^0.1.0"
@ -5081,7 +4974,6 @@
          "version": "0.2.5",
          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "optional": true,
          "requires": {
            "is-descriptor": "^0.1.0"
          }
@ -5233,7 +5125,6 @@
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "optional": true,
      "requires": {
        "kind-of": "^3.0.2"
      },
@ -5242,7 +5133,6 @@
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -5253,7 +5143,6 @@
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "optional": true,
      "requires": {
        "define-property": "^2.0.2",
        "extend-shallow": "^3.0.2",
@ -5265,7 +5154,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "optional": true,
      "requires": {
        "is-number": "^3.0.0",
        "repeat-string": "^1.6.1"
@ -5371,7 +5259,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "optional": true,
      "requires": {
        "arr-union": "^3.1.0",
        "get-value": "^2.0.6",
@ -5394,7 +5281,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "optional": true,
      "requires": {
        "has-value": "^0.3.1",
        "isobject": "^3.0.0"
@ -5404,7 +5290,6 @@
          "version": "0.3.1",
          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "optional": true,
          "requires": {
            "get-value": "^2.0.3",
            "has-values": "^0.1.4",
@ -5415,7 +5300,6 @@
              "version": "2.1.0",
              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "optional": true,
              "requires": {
                "isarray": "1.0.0"
              }
@ -5425,8 +5309,7 @@
        "has-values": {
          "version": "0.1.4",
          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "optional": true
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
        }
      }
    },
@ -5453,8 +5336,7 @@
    "urix": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "optional": true
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
    },
    "url": {
      "version": "0.11.0",
@ -5477,8 +5359,7 @@
    "use": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "optional": true
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
    },
    "util-deprecate": {
      "version": "1.0.2",
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@ -14,12 +14,12 @@ script(type="module" src="https://unpkg.com/@startinblox/component-notifications
    //- script(type="module" src="/lib/sib-notifications/index.js" defer)

 if endpoints.events || (endpoints.get && endpoints.get.events)
-    script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1" defer)
-    //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer)
+    //- script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1" defer)
+    script(type="module" src="/lib/sib-event-component/sib-event.js" defer)

 if endpoints.resources || (endpoints.get && endpoints.get.resources)
-    script(type="module" src="https://unpkg.com/@startinblox/component-resource" defer)
-    //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
+    //- script(type="module" src="https://unpkg.com/@startinblox/component-resource" defer)
+    script(type="module" src="/lib/sib-resource/sib-resource.js" defer)

 if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
    script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3" defer)
--- a/src/styles/abstracts/_fonts.scss
+++ b/src/styles/abstracts/_fonts.scss
@ -11,7 +11,6 @@
    font-family: 'Facit';
    src: url('../fonts/FacitRegular.eot');
    src: url('../fonts/FacitRegular.eot') format('embedded-opentype'),
-         url('../fonts/FacitRegular.woff2') format('woff2'),
         url('../fonts/FacitRegular.woff') format('woff'),
         url('../fonts/FacitRegular.ttf') format('truetype'),
         url('../fonts/FacitRegular.svg#FacitRegular') format('svg');
@ -21,7 +20,6 @@
    font-family: 'Facit';
    src: url('../fonts/FacitBold.eot');
    src: url('../fonts/FacitBold.eot') format('embedded-opentype'),
-         url('../fonts/FacitBold.woff2') format('woff2'),
         url('../fonts/FacitBold.woff') format('woff'),
         url('../fonts/FacitBold.ttf') format('truetype'),
         url('../fonts/FacitBold.svg#FacitBold') format('svg');
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@ -20,6 +20,8 @@
    @import 'layout/members/index';
    @import 'layout/job-offers/index';
    @import 'layout/user/index';
-    @import 'layout/events/index';
+    @import 'layout/events/index';    
+    @import 'layout/resources/index';
    @import 'layout/dashboard/index';
-}
+}
+@import '../../client.sample.etuc.scss';
--- a/src/styles/layout/events/events.scss
+++ b/src/styles/layout/events/events.scss
@ -2,7 +2,7 @@
    width: 100%;
    font-family: "Facit";
    font-weight: 400;
-    color: $color-0-0-22;
+    color: #7A7F85;
    sib-event {
        .red-button,
        .event-type {
--- a/src/styles/layout/resources/_index.scss
+++ b/src/styles/layout/resources/_index.scss
@ -0,0 +1 @@
+@import 'resources.scss';
--- a/src/styles/layout/resources/resources.scss
+++ b/src/styles/layout/resources/resources.scss
@ -0,0 +1,6 @@
+#resources{
+    width: 100%;
+    font-family: "Facit";
+    font-weight: 400;
+    color: $color-0-0-22;
+}