diff --git a/app/images/panel/right-left-moon.svg b/app/images/panel/right-left-moon.svg index 1982c7eb3..ba198ffec 100644 --- a/app/images/panel/right-left-moon.svg +++ b/app/images/panel/right-left-moon.svg @@ -1,13 +1 @@ - - - - right-left-moon - Created with Sketch. - - - - - - - - + \ No newline at end of file diff --git a/app/images/panel/right-right-moon.svg b/app/images/panel/right-right-moon.svg index 96028e576..a47d8259f 100644 --- a/app/images/panel/right-right-moon.svg +++ b/app/images/panel/right-right-moon.svg @@ -1,13 +1 @@ - - - - right-right-moon - Created with Sketch. - - - - - - - - + \ No newline at end of file diff --git a/app/scss/panel.scss b/app/scss/panel.scss index 47a14536a..d176c9bf6 100644 --- a/app/scss/panel.scss +++ b/app/scss/panel.scss @@ -26,6 +26,11 @@ html body { } *:focus {outline: none;} +// Function helper with color variables +@function url-friendly-colour($colour) { + @return '%23' + str-slice('#{$colour}', 2, -1) +} + // Foundation Helpers .collapse-left {padding-left: 0;} .collapse-right {padding-right: 0;} diff --git a/app/scss/partials/_cliqz_features.scss b/app/scss/partials/_cliqz_features.scss index 9b214379d..c9da5dcb4 100644 --- a/app/scss/partials/_cliqz_features.scss +++ b/app/scss/partials/_cliqz_features.scss @@ -12,19 +12,19 @@ */ @function buildIconAntiTracking($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2250%22%20height%3D%2250%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cg%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%222%22%20fill%3D%22none%22%3E%3Ccircle%20cx%3D%2225%22%20cy%3D%2225%22%20r%3D%2223%22/%3E%3Cpath%20d%3D%22M25.213%2015.032a.721.721%200%200%200-.426%200l-9.149%202.427a.82.82%200%200%200-.638.809c.043%206.514%203.532%2012.56%209.532%2016.604A.859.859%200%200%200%2025%2035c.17%200%20.34-.043.468-.128%206-4.045%209.49-10.09%209.532-16.604a.82.82%200%200%200-.638-.81l-9.15-2.426z%22/%3E%3C/g%3E%3C/svg%3E'); } @function buildIconAdBlocking($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2250%22%20height%3D%2250%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cg%3E%3Ccircle%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%222%22%20fill%3D%22none%22%20cx%3D%2225%22%20cy%3D%2225%22%20r%3D%2223%22/%3E%3Cpath%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%222%22%20fill%3D%22none%22%20fill-rule%3D%22nonzero%22%20transform%3D%22translate%2814%2C14%29%22%20d%3D%22M14.873%201.312l-7.973.07-5.588%205.686.07%207.973%205.686%205.589%207.973-.07%205.589-5.687-.07-7.973-5.687-5.588z%22/%3E%3Cpath%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%222%22%20d%3D%22M31.5%2C18.5%20L18.5%2C31.5%22/%3E%3C/g%3E%3C/svg%3E'); } @function buildIconSmartBlocking($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2250%22%20height%3D%2250%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Ccircle%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%222%22%20fill%3D%22none%22%20cx%3D%2225%22%20cy%3D%2225%22%20r%3D%2223%22/%3E%3Cpath%20fill%3D%22#{url-friendly-colour($stroke-color)}%22%20d%3D%22M31.977%2020.24c-.097%201.677-.697%203.156-1.654%204.514-.43.61-.867%201.217-1.285%201.84-.597.887-1.074%201.832-1.258%202.898-.03.175-.141.162-.263.162l-2.525-.001c-.832%200-1.663-.005-2.497.003-.181.002-.246-.05-.283-.238-.197-1.031-.657-1.954-1.241-2.818-.497-.733-1.015-1.454-1.514-2.187A8.257%208.257%200%200%201%2018.011%2020c-.112-2.82%201.486-5.279%204.185-6.42%203.458-1.462%207.547.004%209.166%203.293.521%201.062.682%202.19.615%203.365zM22.352%2032.3v-.63h5.305v.63h-5.305zm4.76%202.681h-4.216c-.508%200-.602-.108-.536-.653h5.28c.075.537-.022.653-.529.653zm6.238-18.576c-1.449-3.169-3.966-4.928-7.385-5.335-2.913-.348-5.446.61-7.511%202.673-2.305%202.306-2.858%205.124-2.19%208.241.351%201.63%201.149%203.046%202.104%204.39.438.617.869%201.243%201.271%201.883.372.593.635%201.241.661%201.946.03.814.008%201.627.008%202.441h.032c0%20.676-.001%201.351.002%202.027.006%201.204.952%202.22%202.15%202.3.158.01.21.056.25.214a2.322%202.322%200%200%200%204.524-.007c.034-.14.072-.194.225-.206a2.329%202.329%200%200%200%202.174-2.337c0-1.257.01-2.515-.003-3.774-.011-.941.208-1.816.706-2.61.402-.64.832-1.268%201.274-1.88%201.263-1.757%202.155-3.653%202.323-5.844.109-1.423-.018-2.816-.615-4.122z%22/%3E%3Cpath%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%221.5%22%20fill%3D%22none%22%20d%3D%22M25.096%2018.214a.324.324%200%200%200-.192%200l-4.117%201.092a.37.37%200%200%200-.287.364c.02%202.932%201.59%205.652%204.29%207.472a.387.387%200%200%200%20.21.058c.077%200%20.153-.02.21-.058%202.7-1.82%204.27-4.54%204.29-7.472a.37.37%200%200%200-.287-.364l-4.117-1.092z%22/%3E%3C/svg%3E'); } @function buildIconDash($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2210%22%20height%3D%2210%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20stroke-width%3D%223%22%20d%3D%22M1%205h8%22/%3E%3C/svg%3E'); } .sub-component.cliqz-features { @@ -60,7 +60,7 @@ background-repeat: no-repeat; background-position: center center; - background-size: 15px 10px; + background-size: 10px 10px; transition: background-image 0.25s ease-out; background-image: buildIconDash(#c8c7c2); } diff --git a/app/scss/partials/_ghostery_features.scss b/app/scss/partials/_ghostery_features.scss index eb4e3f75f..d099aeb93 100644 --- a/app/scss/partials/_ghostery_features.scss +++ b/app/scss/partials/_ghostery_features.scss @@ -12,11 +12,11 @@ */ @function buildIconTrust($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset%3DUS-ASCII,%3Csvg%20width%3D%2214%22%20height%3D%2214%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22>%3Ccircle%20cx%3D%227%22%20cy%3D%227%22%20r%3D%226%22%20stroke-width%3D%222%22%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20fill%3D%22none%22/%3E%3C/svg%3E'); } @function buildIconRestrict($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset%3DUS-ASCII,%3Csvg%20width%3D%2214%22%20height%3D%2214%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cg%20stroke%3D%22#{url-friendly-colour($stroke-color)}%22%20fill%3D%22none%22%20stroke-width%3D%222%22%3E%3Ccircle%20cx%3D%227%22%20cy%3D%227%22%20r%3D%226%22/%3E%3Cpath%20d%3D%22M3%203l8%208%22/%3E%3C/g%3E%3C/svg%3E'); } .sub-component.ghostery-features { diff --git a/app/scss/partials/_pause_button.scss b/app/scss/partials/_pause_button.scss index 4d132d7fd..8190b3042 100644 --- a/app/scss/partials/_pause_button.scss +++ b/app/scss/partials/_pause_button.scss @@ -12,19 +12,19 @@ */ @function buildIconPause($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width=%2214%22%20height=%2216%22%20xmlns=%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M1%2015h3V1H1v14zM9%201v14h3V1H9z%22%20fill=%22#{url-friendly-colour($stroke-color)}%22/%3E%3C/svg%3E'); } @function buildIconPlay($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width=%2214%22%20height=%2216%22%20xmlns=%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M12.74%207.543a.532.532%200%200%201%200%20.915L1.782%2014.92c-.322.222-.783-.045-.783-.458V1.54c0-.378.44-.693.783-.458l10.956%206.462zM2.043%2013.547L11.435%208%202.044%202.454v11.093z%22%20fill=%22#{url-friendly-colour($stroke-color)}%22/%3E%3C/svg%3E'); } @function buildIconCaretDown($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width=%229%22%20height=%225%22%20xmlns=%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M0%200h9L4.5%205%200%200%22%20fill=%22#{url-friendly-colour($stroke-color)}%22/%3E%3C/svg%3E'); } @function buildIconCircle($stroke-color) { - @return url('data:image/svg+xml;charset=US-ASCII,'); + @return url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width=%224%22%20height=%224%22%20xmlns=%22http%3A//www.w3.org/2000/svg%22%3E%3Ccircle%20cx=%222%22%20cy=%222%22%20r=%222%22%20fill=%22#{url-friendly-colour($stroke-color)}%22/%3E%3C/svg%3E'); } .sub-component.pause-button { @@ -84,6 +84,9 @@ min-width: 41px; max-width: 41px; padding-left: 17px; + .pause-button-icon { + padding: 0 0 0 15px; + } } } .button-caret { @@ -143,7 +146,7 @@ } .dropdown-item.selected { background-color: #ebebeb; - .pause-button-icon { + .dropdown-clickable { padding: 0 0 0 10px; background-repeat: no-repeat; background-position: 0 center; @@ -165,13 +168,11 @@ .button-pause { height: 35px; line-height: 21px; - top: 0; } .button-caret { height: 35px; } .button-pause.smaller { - top: 1px; height: 45px; min-width: 125px; max-width: 125px; @@ -189,7 +190,6 @@ } } .button-pause.smallest { - top: 0; padding-left: 15px; height: 41px; line-height: 27px; diff --git a/app/scss/partials/_summary.scss b/app/scss/partials/_summary.scss index f933ce3b6..d2e3d3f0b 100644 --- a/app/scss/partials/_summary.scss +++ b/app/scss/partials/_summary.scss @@ -15,6 +15,7 @@ position: absolute; height: 479px; width: 100%; + overflow-y: hidden; &.expert { width: 235px; } &.expert.condensed { width: 66px; @@ -49,7 +50,7 @@ } &.expert .page-host { margin-top: 20px; - margin-bottom: 24px; + margin-bottom: 20px; } &.expert.ab-pause .page-host { margin-top: 8px; @@ -82,7 +83,7 @@ color: #4a4a4a; font-size: 24px; font-weight: 600; - margin: 21px 0; + margin: 18px 0; } &.expert.condensed.ab-pause .total-tracker-count { margin: 13px 0; @@ -94,7 +95,7 @@ font-size: 14px; line-height: 21px; font-weight: 600; - margin-bottom: 44px; + margin-bottom: 40px; .blocked-trackers .value { color: #e74055; } .page-load .value { color: #ffc063; } .page-load.fast .value { color: #9ecc42; } @@ -180,6 +181,12 @@ &.expert.condensed.ab-pause .cliqz-features-container { margin-top: 14px; } + &.expert.condensed .cliqz-features-container { + margin-bottom: 0; + .cliqz-feature:last-of-type { + margin-bottom: 0; + } + } .map-these-trackers { text-align: center; diff --git a/package-lock.json b/package-lock.json index 06edad390..f622a1ca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -191,6 +191,11 @@ } } }, + "@cliqz-oss/dexie": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@cliqz-oss/dexie/-/dexie-2.0.3.tgz", + "integrity": "sha512-XHXySmU+9aqlOQkxCE9e0huUrxHS5I63iZOeP2vORSRu4s5mCmVIUZNt0/AnxkMUMorHTWF0eHGnn+p0VAwOBg==" + }, "@cliqz-oss/pouchdb": { "version": "6.3.4-security-error-fix-2", "resolved": "https://registry.npmjs.org/@cliqz-oss/pouchdb/-/pouchdb-6.3.4-security-error-fix-2.tgz", @@ -246,7 +251,17 @@ "resolved": "https://registry.npmjs.org/@cliqz/adblocker/-/adblocker-0.1.7.tgz", "integrity": "sha512-qMurMDwT0+6cSDkrWoriVpJbaffJzLmPRxJIU+7/c7CaWYrOBw96+zpa2zpyL3+2CiLBXiDsqyQ0uTubz/MldA==", "requires": { - "tldjs": "https://github.com/remusao/tld.js/releases/download/v2.2.0/tldjs-2.2.0.tgz" + "tldjs": "2.2.0" + }, + "dependencies": { + "tldjs": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tldjs/-/tldjs-2.2.0.tgz", + "integrity": "sha512-5b5t+HKprfccAFRAsH/fzDR4O+UgO6vStvbaJo10jvMcUavlwxR3Jrn2WmXfjG3k22T7b4pqqfput38nr1RpJQ==", + "requires": { + "punycode": "1.4.1" + } + } } }, "@sindresorhus/is": { @@ -2141,23 +2156,31 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "safe-buffer": "5.1.1" }, "dependencies": { "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "5.1.1" + } } } }, @@ -2357,7 +2380,7 @@ }, "browser-core": { "version": "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.26/1.26.1.tgz", - "integrity": "sha1-fraEQierwRe22FYCQ7pwpLxGJG8=", + "integrity": "sha512-GPxQWku5q27b1WXoVxf2FCRVYi/0BUP7u3P1YVzn9DTuzHXS5RVJ1Iqrf8spVC5HEyJgP26UYJ54Ppq1+/9fyA==", "requires": { "@cliqz-oss/dexie": "2.0.3", "@cliqz-oss/pouchdb": "6.3.4-security-error-fix-2", @@ -2410,21 +2433,6 @@ "yuidoc-bootstrap-theme": "1.0.6" }, "dependencies": { - "@cliqz-oss/dexie": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@cliqz-oss/dexie/-/dexie-2.0.3.tgz", - "integrity": "sha512-XHXySmU+9aqlOQkxCE9e0huUrxHS5I63iZOeP2vORSRu4s5mCmVIUZNt0/AnxkMUMorHTWF0eHGnn+p0VAwOBg==" - }, - "cliqz-history": { - "version": "https://github.com/cliqz-oss/cliqz-history/releases/download/1.0.6/cliqz-history-1.0.6.tgz", - "integrity": "sha1-oE9q/GG20liypXNUCLHb1i1peZY=" - }, - "es6-micro-loader": { - "version": "github:cliqz-oss/es6-micro-loader#145e7bdbd8be2f4582096175482b1411eb56ec79", - "requires": { - "es6-promise": "1.0.0" - } - }, "fs-extra": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", @@ -2435,11 +2443,6 @@ "universalify": "0.1.1" } }, - "jquery": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.0.0.tgz", - "integrity": "sha1-laKpVBKRqfgZ4Bb4W6JHEW0D5Ks=" - }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -2494,29 +2497,10 @@ } } }, - "tldjs": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz", - "integrity": "sha512-W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw==", - "requires": { - "punycode": "1.4.1" - } - }, "ua-parser-js": { "version": "0.7.12", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=" - }, - "ytdl-core": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.20.2.tgz", - "integrity": "sha512-7AAIdhVRJgS3HulFCdT4C4G8FpeKouFinMCa8YA2cvKmEjXoIiNcMJmtnOI1VJil+l57K1Ly4MzEKlvR6H7C0g==", - "requires": { - "html-entities": "1.2.1", - "m3u8stream": "0.2.2", - "miniget": "1.2.0", - "sax": "1.2.4" - } } } }, @@ -2618,7 +2602,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz", "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "requires": { - "caniuse-lite": "1.0.30000823", + "caniuse-lite": "1.0.30000824", "electron-to-chromium": "1.3.42" } }, @@ -2872,9 +2856,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30000823", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz", - "integrity": "sha512-3rrhqUxwBgrwNlWVUEwIJfqdZNwLPX18eTo7MGXb3gueDpbOFW6w5OXyHscdBd6IJcu9wnKmKVd7nSl+r7fmgw==" + "version": "1.0.30000824", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000824.tgz", + "integrity": "sha512-KcgeAvVkpzN05Mjiyz5vf0le5AWRwfRGqGkKXWWsdrLQd4EIBevReSy7mYCdwSq7MqKrmJ0lEQEkUQE2VspRRw==" }, "caseless": { "version": "0.12.0", @@ -3292,6 +3276,10 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "cliqz-history": { + "version": "https://github.com/cliqz-oss/cliqz-history/releases/download/1.0.6/cliqz-history-1.0.6.tgz", + "integrity": "sha512-H5rS5klOQRYSatbQw8QZ7lVwYy1aomTjV324q1Nffzd6aBsmvtN8eyt3ITu34sS2HBF64Cv41GptyVvTBe8f/Q==" + }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", @@ -4882,6 +4870,12 @@ "es6-symbol": "3.1.1" } }, + "es6-micro-loader": { + "version": "github:cliqz-oss/es6-micro-loader#145e7bdbd8be2f4582096175482b1411eb56ec79", + "requires": { + "es6-promise": "1.0.0" + } + }, "es6-promise": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-1.0.0.tgz", @@ -7015,7 +7009,7 @@ "requires": { "after": "0.8.2", "ghrepos": "2.1.0", - "ghutils": "3.2.2", + "ghutils": "3.2.4", "simple-mime": "0.1.0", "url-template": "2.0.8", "xtend": "4.0.1" @@ -7026,13 +7020,13 @@ "resolved": "https://registry.npmjs.org/ghrepos/-/ghrepos-2.1.0.tgz", "integrity": "sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg==", "requires": { - "ghutils": "3.2.2" + "ghutils": "3.2.4" } }, "ghutils": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/ghutils/-/ghutils-3.2.2.tgz", - "integrity": "sha512-6SqTlzs89EtYRlafY8oavTnn/vEErgRSnMsuFDwOzNgK34mpHXTBinh6rTx6xwqei3d3BWyrSTQ8uN9kPpEQtg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ghutils/-/ghutils-3.2.4.tgz", + "integrity": "sha512-6JQVg+iHj/O4bJ/qqk8zc/ULu/I8sgfbFmHb1U12gWblRnXkidKurvBaCZMXTM7W1qAcT//X+hTJX8ZASoJ7BA==", "requires": { "jsonist": "2.1.0", "xtend": "4.0.1" @@ -9440,9 +9434,9 @@ } }, "jquery": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", - "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.0.0.tgz", + "integrity": "sha1-laKpVBKRqfgZ4Bb4W6JHEW0D5Ks=" }, "js-base64": { "version": "2.4.3", @@ -15755,7 +15749,7 @@ "resolved": "https://registry.npmjs.org/tablesorter/-/tablesorter-2.29.2.tgz", "integrity": "sha512-yq9CvkPlekNeyjp/7aNp1S7/JZURBhClnY9h4R0W7LeYgaQ/rl5l3iwfHpAsyIRnOl70miCw9ti7/MM4viwCog==", "requires": { - "jquery": "2.2.4" + "jquery": "3.0.0" } }, "taffydb": { @@ -15798,23 +15792,31 @@ "requires": { "bl": "1.2.2", "end-of-stream": "1.4.1", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "xtend": "4.0.1" }, "dependencies": { "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "5.1.1" + } } } }, @@ -16254,8 +16256,9 @@ "integrity": "sha1-utMnrbGAS0KiMa+nQVMr2ITNCa0=" }, "tldjs": { - "version": "https://github.com/remusao/tld.js/releases/download/v2.2.0/tldjs-2.2.0.tgz", - "integrity": "sha512-ZqE0+8haN/FXKFhCi5q+tcGEEolLbNRp1jg1DZf651bQUZ9JakYjZAglhdZw/wcGjni0xEGM2P0VwlLeBjlmHw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz", + "integrity": "sha512-W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw==", "requires": { "punycode": "1.4.1" } @@ -18366,6 +18369,17 @@ } } }, + "ytdl-core": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.20.2.tgz", + "integrity": "sha512-7AAIdhVRJgS3HulFCdT4C4G8FpeKouFinMCa8YA2cvKmEjXoIiNcMJmtnOI1VJil+l57K1Ly4MzEKlvR6H7C0g==", + "requires": { + "html-entities": "1.2.1", + "m3u8stream": "0.2.2", + "miniget": "1.2.0", + "sax": "1.2.4" + } + }, "yuidoc-bootstrap-theme": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/yuidoc-bootstrap-theme/-/yuidoc-bootstrap-theme-1.0.6.tgz",