summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2019-10-08 21:50:51 +0200
committernicolargo <nicolas@nicolargo.com>2019-10-08 21:50:51 +0200
commit29e3c5bfd5ca582fbcd6aeed5e396a6ec1bd4c98 (patch)
tree4cb157bfc937b0a25f032beb7edf0365c49b6a1c
parentf4b5153e75dbc632777e7e6ee174e5650bbc385f (diff)
parent3e7080092091a61055882e850ad1efee3bb66daf (diff)
Merge branch 'develop' of https://github.com/nicolargo/glances into develop
-rw-r--r--glances/outputs/static/js/components/plugin-docker/controller.js2
-rw-r--r--glances/outputs/static/package-lock.json221
-rw-r--r--glances/outputs/static/package.json12
-rw-r--r--glances/outputs/static/public/glances.js495
-rw-r--r--glances/outputs/static/public/glances.map.js2
5 files changed, 438 insertions, 294 deletions
diff --git a/glances/outputs/static/js/components/plugin-docker/controller.js b/glances/outputs/static/js/components/plugin-docker/controller.js
index 9a6392ae..cf60fb40 100644
--- a/glances/outputs/static/js/components/plugin-docker/controller.js
+++ b/glances/outputs/static/js/components/plugin-docker/controller.js
@@ -8,7 +8,7 @@ export default function GlancesPluginDockerController($scope, GlancesStats) {
var stats = data.stats['docker'];
vm.containers = [];
- if (_.isEmpty(stats)) {
+ if (_.isEmpty(stats) || _.isEmpty(stats['containers']) ) {
return;
}
diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json
index 4445a4e1..83f86d17 100644
--- a/glances/outputs/static/package-lock.json
+++ b/glances/outputs/static/package-lock.json
@@ -83,9 +83,9 @@
"dev": true
},
"angular": {
- "version": "1.7.4",
- "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.4.tgz",
- "integrity": "sha512-nYTWc9CpZjTY57l8EA1+DGpQNzI6HewQ34bfRYoGXBYysIoPYjfcgTGWC+Vl3AaeCnhAb3VTkysVESvCBpUIoA=="
+ "version": "1.7.8",
+ "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.8.tgz",
+ "integrity": "sha512-wtef/y4COxM7ZVhddd7JtAAhyYObq9YXKar9tsW7558BImeVYteJiTxCKeJOL45lJ/+7B4wrAC49j8gTFYEthg=="
},
"angular-hotkeys": {
"version": "1.7.0",
@@ -430,9 +430,9 @@
}
},
"bluebird": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz",
- "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==",
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
+ "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
"dev": true
},
"bn.js": {
@@ -442,9 +442,9 @@
"dev": true
},
"bootstrap": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
- "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+ "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
},
"brace-expansion": {
"version": "1.1.11",
@@ -740,9 +740,9 @@
}
},
"chownr": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
- "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+ "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
"dev": true
},
"cipher-base": {
@@ -1004,9 +1004,9 @@
"dev": true
},
"copy-webpack-plugin": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz",
- "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==",
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+ "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
"dev": true,
"requires": {
"cacache": "^10.0.4",
@@ -1218,9 +1218,9 @@
}
},
"cyclist": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
- "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
"dev": true
},
"d": {
@@ -1364,12 +1364,11 @@
}
},
"dir-glob": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
- "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+ "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
"dev": true,
"requires": {
- "arrify": "^1.0.1",
"path-type": "^3.0.0"
}
},
@@ -1380,9 +1379,9 @@
"dev": true
},
"duplexify": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
- "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
"dev": true,
"requires": {
"end-of-stream": "^1.0.0",
@@ -1430,9 +1429,9 @@
"dev": true
},
"end-of-stream": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
- "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
"dev": true,
"requires": {
"once": "^1.4.0"
@@ -1894,13 +1893,13 @@
"dev": true
},
"flush-write-stream": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
- "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
"dev": true,
"requires": {
- "inherits": "^2.0.1",
- "readable-stream": "^2.0.4"
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.3.6"
}
},
"for-in": {
@@ -2532,9 +2531,9 @@
}
},
"fstream": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
- "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
@@ -3382,9 +3381,9 @@
}
},
"less": {
- "version": "3.8.1",
- "resolved": "https://registry.npmjs.org/less/-/less-3.8.1.tgz",
- "integrity": "sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==",
+ "version": "3.10.3",
+ "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz",
+ "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==",
"dev": true,
"requires": {
"clone": "^2.1.2",
@@ -3479,15 +3478,9 @@
}
},
"lodash": {
- "version": "4.17.11",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
- "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
- },
- "lodash.assign": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
- "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
- "dev": true
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
"lodash.camelcase": {
"version": "4.3.0",
@@ -3495,12 +3488,6 @@
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
"dev": true
},
- "lodash.clonedeep": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
- "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
- "dev": true
- },
"lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -3513,12 +3500,6 @@
"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
"dev": true
},
- "lodash.mergewith": {
- "version": "4.6.1",
- "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
- "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
- "dev": true
- },
"lodash.tail": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
@@ -3837,7 +3818,8 @@
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
"integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
- "dev": true
+ "dev": true,
+ "optional": true
},
"nanomatch": {
"version": "1.2.13",
@@ -3966,9 +3948,9 @@
}
},
"node-sass": {
- "version": "4.9.3",
- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
- "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+ "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
"dev": true,
"requires": {
"async-foreach": "^0.1.3",
@@ -3978,84 +3960,23 @@
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
- "lodash.assign": "^4.2.0",
- "lodash.clonedeep": "^4.3.2",
- "lodash.mergewith": "^4.6.0",
+ "lodash": "^4.17.11",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
- "nan": "^2.10.0",
+ "nan": "^2.13.2",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
- "request": "2.87.0",
+ "request": "^2.88.0",
"sass-graph": "^2.2.4",
"stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2"
},
"dependencies": {
- "ajv": {
- "version": "5.5.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
- "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
- "dev": true,
- "requires": {
- "co": "^4.6.0",
- "fast-deep-equal": "^1.0.0",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.3.0"
- }
- },
- "har-validator": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
- "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
- "dev": true,
- "requires": {
- "ajv": "^5.1.0",
- "har-schema": "^2.0.0"
- }
- },
- "oauth-sign": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
- "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
"dev": true
- },
- "request": {
- "version": "2.87.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
- "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
- "dev": true,
- "requires": {
- "aws-sign2": "~0.7.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.3.1",
- "har-validator": "~5.0.3",
- "http-signature": "~1.2.0",
- "is-typedarray": "~1.0.0",
- "isstream": "~0.1.2",
- "json-stringify-safe": "~5.0.1",
- "mime-types": "~2.1.17",
- "oauth-sign": "~0.8.2",
- "performance-now": "^2.1.0",
- "qs": "~6.5.1",
- "safe-buffer": "^5.1.1",
- "tough-cookie": "~2.3.3",
- "tunnel-agent": "^0.6.0",
- "uuid": "^3.1.0"
- }
- },
- "tough-cookie": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
- "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
- "dev": true,
- "requires": {
- "punycode": "^1.4.1"
- }
}
}
},
@@ -4284,12 +4205,12 @@
"dev": true
},
"parallel-transform": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
- "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
"dev": true,
"requires": {
- "cyclist": "~0.2.2",
+ "cyclist": "^1.0.1",
"inherits": "^2.0.3",
"readable-stream": "^2.1.5"
}
@@ -5573,9 +5494,9 @@
"dev": true
},
"serialize-javascript": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
- "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+ "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
"dev": true
},
"set-blocking": {
@@ -6067,13 +5988,13 @@
"dev": true
},
"tar": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
- "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
"dev": true,
"requires": {
"block-stream": "*",
- "fstream": "^1.0.2",
+ "fstream": "^1.0.12",
"inherits": "2"
}
},
@@ -6084,12 +6005,12 @@
"dev": true
},
"through2": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
- "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
"dev": true,
"requires": {
- "readable-stream": "^2.1.5",
+ "readable-stream": "~2.3.6",
"xtend": "~4.0.1"
}
},
@@ -6320,9 +6241,9 @@
}
},
"unique-slug": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
- "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
"dev": true,
"requires": {
"imurmurhash": "^0.1.4"
diff --git a/glances/outputs/static/package.json b/glances/outputs/static/package.json
index e32a5765..2e98b267 100644
--- a/glances/outputs/static/package.json
+++ b/glances/outputs/static/package.json
@@ -1,24 +1,24 @@
{
"private": true,
"dependencies": {
- "angular": "^1.7.4",
+ "angular": "^1.7.8",
"angular-hotkeys": "^1.7.0",
- "bootstrap": "^3.3.7",
+ "bootstrap": "^3.4.1",
"favico.js": "^0.3.10",
- "lodash": "^4.17.11"
+ "lodash": "^4.17.15"
},
"devDependencies": {
"clean-webpack-plugin": "^0.1.19",
- "copy-webpack-plugin": "^4.5.2",
+ "copy-webpack-plugin": "^4.6.0",
"css-loader": "^0.28.11",
"del": "^2.2.1",
"exports-loader": "^0.7.0",
"file-loader": "^1.1.11",
"html-loader": "^0.5.5",
- "less": "^3.8.1",
+ "less": "^3.10.3",
"less-loader": "^4.1.0",
"ngtemplate-loader": "^2.0.1",
- "node-sass": "^4.9.3",
+ "node-sass": "^4.12.0",
"sass-loader": "^6.0.7",
"style-loader": "^0.20.3",
"url-loader": "^0.6.2",
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index ec3c5484..8948ea51 100644
--- a/glances/outputs/static/public/glances.js
+++ b/glances/outputs/static/public/glances.js
@@ -545,7 +545,7 @@ function updateLink (link, options, obj) {
/* WEBPACK VAR INJECTION */(function(global, module) {var __WEBPACK_AMD_DEFINE_RESULT__;/**
* @license
* Lodash <https://lodash.com/>
- * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
* Released under MIT license <https://lodash.com/license>
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -556,7 +556,7 @@ function updateLink (link, options, obj) {
var undefined;
/** Used as the semantic version number. */
- var VERSION = '4.17.11';
+ var VERSION = '4.17.15';
/** Used as the size to enable large array optimizations. */
var LARGE_ARRAY_SIZE = 200;
@@ -3215,16 +3215,10 @@ function updateLink (link, options, obj) {
value.forEach(function(subValue) {
result.add(baseClone(subValue, bitmask, customizer, subValue, value, stack));
});
-
- return result;
- }
-
- if (isMap(value)) {
+ } else if (isMap(value)) {
value.forEach(function(subValue, key) {
result.set(key, baseClone(subValue, bitmask, customizer, key, value, stack));
});
-
- return result;
}
var keysFunc = isFull
@@ -4148,8 +4142,8 @@ function updateLink (link, options, obj) {
return;
}
baseFor(source, function(srcValue, key) {
+ stack || (stack = new Stack);
if (isObject(srcValue)) {
- stack || (stack = new Stack);
baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
}
else {
@@ -5966,7 +5960,7 @@ function updateLink (link, options, obj) {
return function(number, precision) {
number = toNumber(number);
precision = precision == null ? 0 : nativeMin(toInteger(precision), 292);
- if (precision) {
+ if (precision && nativeIsFinite(number)) {
// Shift with exponential notation to avoid floating-point issues.
// See [MDN](https://mdn.io/round#Examples) for more details.
var pair = (toString(number) + 'e').split('e'),
@@ -7149,7 +7143,7 @@ function updateLink (link, options, obj) {
}
/**
- * Gets the value at `key`, unless `key` is "__proto__".
+ * Gets the value at `key`, unless `key` is "__proto__" or "constructor".
*
* @private
* @param {Object} object The object to query.
@@ -7157,6 +7151,10 @@ function updateLink (link, options, obj) {
* @returns {*} Returns the property value.
*/
function safeGet(object, key) {
+ if (key === 'constructor' && typeof object[key] === 'function') {
+ return;
+ }
+
if (key == '__proto__') {
return;
}
@@ -10957,6 +10955,7 @@ function updateLink (link, options, obj) {
}
if (maxing) {
// Handle invocations in a tight loop.
+ clearTimeout(timerId);
timerId = setTimeout(timerExpired, wait);
return invokeFunc(lastCallTime);
}
@@ -15343,9 +15342,12 @@ function updateLink (link, options, obj) {
, 'g');
// Use a sourceURL for easier debugging.
+ // The sourceURL gets injected into the source that's eval-ed, so be careful
+ // with lookup (in case of e.g. prototype pollution), and strip newlines if any.
+ // A newline wouldn't be a valid sourceURL anyway, and it'd enable code injection.
var sourceURL = '//# sourceURL=' +
- ('sourceURL' in options
- ? options.sourceURL
+ (hasOwnProperty.call(options, 'sourceURL')
+ ? (options.sourceURL + '').replace(/[\r\n]/g, ' ')
: ('lodash.templateSources[' + (++templateCounter) + ']')
) + '\n';
@@ -15378,7 +15380,9 @@ function updateLink (link, options, obj) {
// If `variable` is not specified wrap a with-statement around the generated
// code to add the data object to the top of the scope chain.
- var variable = options.variable;
+ // Like with sourceURL, we take care to not check the option's prototype,
+ // as this configuration is a code injection vector.
+ var variable = hasOwnProperty.call(options, 'variable') && options.variable;
if (!variable) {
source = 'with (obj) {\n' + source + '\n}\n';
}
@@ -17583,10 +17587,11 @@ function updateLink (link, options, obj) {
baseForOwn(LazyWrapper.prototype, function(func, methodName) {
var lodashFunc = lodash[methodName];
if (lodashFunc) {
- var key = (lodashFunc.name + ''),
- names = realNames[key] || (realNames[key] = []);
-
- names.push({ 'name': methodName, 'func': lodashFunc });
+ var key = lodashFunc.name + '';
+ if (!hasOwnProperty.call(realNames, key)) {
+ realNames[key] = [];
+ }
+ realNames[key].push({ 'name': methodName, 'func': lodashFunc });
}
});
@@ -17738,7 +17743,7 @@ exports = module.exports = __webpack_require__(1)(false);
// module
-exports.push([module.i, "/*!\n * Bootstrap v3.3.7 (http://getbootstrap.com)\n * Copyright 2011-2016 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\nhtml {\n font-family: sans-serif;\n -ms-text-size-adjust: 100%;\n -webkit-text-size-adjust: 100%;\n}\nbody {\n margin: 0;\n}\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n display: block;\n}\naudio,\ncanvas,\nprogress,\nvideo {\n display: inline-block;\n vertical-align: baseline;\n}\naudio:not([controls]) {\n display: none;\n height: 0;\n}\n[hidden],\ntemplate {\n display: none;\n}\na {\n background-color: transparent;\n}\na:active,\na:hover {\n outline: 0;\n}\nabbr[title] {\n border-bottom: 1px dotted;\n}\nb,\nstrong {\n font-weight: bold;\n}\ndfn {\n font-style: italic;\n}\nh1 {\n font-size: 2em;\n margin: 0.67em 0;\n}\nmark {\n background: #ff0;\n color: #000;\n}\nsmall {\n font-size: 80%;\n}\nsub,\nsup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\nsup {\n top: -0.5em;\n}\nsub {\n bottom: -0.25em;\n}\nimg {\n border: 0;\n}\nsvg:not(:root) {\n overflow: hidden;\n}\nfigure {\n margin: 1em 40px;\n}\nhr {\n box-sizing: content-box;\n height: 0;\n}\npre {\n overflow: auto;\n}\ncode,\nkbd,\npre,\nsamp {\n font-family: monospace, monospace;\n font-size: 1em;\n}\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n color: inherit;\n font: inherit;\n margin: 0;\n}\nbutton {\n overflow: visible;\n}\nbutton,\nselect {\n text-transform: none;\n}\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n -webkit-appearance: button;\n cursor: pointer;\n}\nbutton[disabled],\nhtml input[disabled] {\n cursor: default;\n}\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n border: 0;\n padding: 0;\n}\ninput {\n line-height: normal;\n}\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n box-sizing: border-box;\n padding: 0;\n}\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n height: auto;\n}\ninput[type=\"search\"] {\n -webkit-appearance: textfield;\n box-sizing: content-box;\n}\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n -webkit-appearance: none;\n}\nfieldset {\n border: 1px solid #c0c0c0;\n margin: 0 2px;\n padding: 0.35em 0.625em 0.75em;\n}\nlegend {\n border: 0;\n padding: 0;\n}\ntextarea {\n overflow: auto;\n}\noptgroup {\n font-weight: bold;\n}\ntable {\n border-collapse: collapse;\n border-spacing: 0;\n}\ntd,\nth {\n padding: 0;\n}\n* {\n -webkit-box-sizing: border-box;\n -moz-box-sizing: border-box;\n box-sizing: border-box;\n}\n*:before,\n*:after {\n -webkit-box-sizing: border-box;\n -moz-box-sizing: border-box;\n box-sizing: border-box;\n}\nhtml {\n font-size: 10px;\n -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\nbody {\n font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n font-size: 14px;\n line-height: 1.42857143;\n color: #333333;\n background-color: #fff;\n}\ninput,\nbutton,\nselect,\ntextarea {\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\na {\n color: #337ab7;\n text-decoration: none;\n}\na:hover,\na:focus {\n color: #23527c;\n text-decoration: underline;\n}\na:focus {\n outline: 5px auto -webkit-focus-ring-color;\n outline-offset: -2px;\n}\nfigure {\n margin: 0;\n}\nimg {\n vertical-align: middle;\n}\n.img-responsive {\n display: block;\n max-width: 100%;\n height: auto;\n}\n.img-rounded {\n border-radius: 6px;\n}\n.img-thumbnail {\n padding: 4px;\n line-height: 1.42857143;\n background-color: #fff;\n border: 1px solid #ddd;\n border-radius: 4px;\n -webkit-transition: all 0.2s ease-in-out;\n -o-transition: all 0.2s ease-in-out;\n transition: all 0.2s ease-in-out;\n display: inline-block;\n max-width: 100%;\n height: auto;\n}\n.img-circle {\n border-radius: 50%;\n}\nhr {\n margin-top: 20px;\n margin-bottom: 20px;\n border: 0;\n border-top: 1px solid #eeeeee;\n}\n.sr-only {\n position: absolute;\n width: 1px;\n height: 1px;\n margin: -1px;\n padding: 0;\n overflow: hidden;\n clip: rect(0, 0, 0, 0);\n border: 0;\n}\n.sr-only-focusable:active,\n.sr-only-focusable:focus {\n position: static;\n width: auto;\n height: auto;\n margin: 0;\n overflow: visible;\n clip: auto;\n}\n[role=\"button\"] {\n cursor: pointer;\n}\n.container {\n margin-right: auto;\n margin-left: auto;\n padding-left: 15px;\n padding-right: 15px;\n}\n@media (min-width: 768px) {\n .container {\n width: 750px;\n }\n}\n@media (min-width: 992px) {\n .container {\n width: 970px;\n }\n}\n@media (min-width: 1200px) {\n .container {\n width: 1170px;\n }\n}\n.container-fluid {\n margin-right: auto;\n margin-left: auto;\n padding-left: 15px;\n padding-right: 15px;\n}\n.row {\n margin-left: -15px;\n margin-right: -15px;\n}\n.col-xs-1,\n.col-sm-1,\n.col-md-1,\n.col-lg-1,\n.col-xs-2,\n.col-sm-2,\n.col-md-2,\n.col-lg-2,\n.col-xs-3,\n.col-sm-3,\n.col-md-3,\n.col-lg-3,\n.col-xs-4,\n.col-sm-4,\n.col-md-4,\n.col-lg-4,\n.col-xs-5,\n.col-sm-5,\n.col-md-5,\n.col-lg-5,\n.col-xs-6,\n.col-sm-6,\n.col-md-6,\n.col-lg-6,\n.col-xs-7,\n.col-sm-7,\n.col-md-7,\n.col-lg-7,\n.col-xs-8,\n.col-sm-8,\n.col-md-8,\n.col-lg-8,\n.col-xs-9,\n.col-sm-9,\n.col-md-9,\n.col-lg-9,\n.col-xs-10,\n.col-sm-10,\n.col-md-10,\n.col-lg-10,\n.col-xs-11,\n.col-sm-11,\n.col-md-11,\n.col-lg-11,\n.col-xs-12,\n.col-sm-12,\n.col-md-12,\n.col-lg-12,\n.col-xs-13,\n.col-sm-13,\n.col-md-13,\n.col-lg-13,\n.col-xs-14,\n.col-sm-14,\n.col-md-14,\n.col-lg-14,\n.col-xs-15,\n.col-sm-15,\n.col-md-15,\n.col-lg-15,\n.col-xs-16,\n.col-sm-16,\n.col-md-16,\n.col-lg-16,\n.col-xs-17,\n.col-sm-17,\n.col-md-17,\n.col-lg-17,\n.col-xs-18,\n.col-sm-18,\n.col-md-18,\n.col-lg-18,\n.col-xs-19,\n.col-sm-19,\n.col-md-19,\n.col-lg-19,\n.col-xs-20,\n.col-sm-20,\n.col-md-20,\n.col-lg-20,\n.col-xs-21,\n.col-sm-21,\n.col-md-21,\n.col-lg-21,\n.col-xs-22,\n.col-sm-22,\n.col-md-22,\n.col-lg-22,\n.col-xs-23,\n.col-sm-23,\n.col-md-23,\n.col-lg-23,\n.col-xs-24,\n.col-sm-24,\n.col-md-24,\n.col-lg-24 {\n position: relative;\n min-height: 1px;\n padding-left: 15px;\n padding-right: 15px;\n}\n.col-xs-1,\n.col-xs-2,\n.col-xs-3,\n.col-xs-4,\n.col-xs-5,\n.col-xs-6,\n.col-xs-7,\n.col-xs-8,\n.col-xs-9,\n.col-xs-10,\n.col-xs-11,\n.col-xs-12,\n.col-xs-13,\n.col-xs-14,\n.col-xs-15,\n.col-xs-16,\n.col-xs-17,\n.col-xs-18,\n.col-xs-19,\n.col-xs-20,\n.col-xs-21,\n.col-xs-22,\n.col-xs-23,\n.col-xs-24 {\n float: left;\n}\n.col-xs-24 {\n width: 100%;\n}\n.col-xs-23 {\n width: 95.83333333%;\n}\n.col-xs-22 {\n width: 91.66666667%;\n}\n.col-xs-21 {\n width: 87.5%;\n}\n.col-xs-20 {\n width: 83.33333333%;\n}\n.col-xs-19 {\n width: 79.16666667%;\n}\n.col-xs-18 {\n width: 75%;\n}\n.col-xs-17 {\n width: 70.83333333%;\n}\n.col-xs-16 {\n width: 66.66666667%;\n}\n.col-xs-15 {\n width: 62.5%;\n}\n.col-xs-14 {\n width: 58.33333333%;\n}\n.col-xs-13 {\n width: 54.16666667%;\n}\n.col-xs-12 {\n width: 50%;\n}\n.col-xs-11 {\n width: 45.83333333%;\n}\n.col-xs-10 {\n width: 41.66666667%;\n}\n.col-xs-9 {\n width: 37.5%;\n}\n.col-xs-8 {\n width: 33.33333333%;\n}\n.col-xs-7 {\n width: 29.16666667%;\n}\n.col-xs-6 {\n width: 25%;\n}\n.col-xs-5 {\n width: 20.83333333%;\n}\n.col-xs-4 {\n width: 16.66666667%;\n}\n.col-xs-3 {\n width: 12.5%;\n}\n.col-xs-2 {\n width: 8.33333333%;\n}\n.col-xs-1 {\n width: 4.16666667%;\n}\n.col-xs-pull-24 {\n right: 100%;\n}\n.col-xs-pull-23 {\n right: 95.83333333%;\n}\n.col-xs-pull-22 {\n right: 91.66666667%;\n}\n.col-xs-pull-21 {\n right: 87.5%;\n}\n.col-xs-pull-20 {\n right: 83.33333333%;\n}\n.col-xs-pull-19 {\n right: 79.16666667%;\n}\n.col-xs-pull-18 {\n right: 75%;\n}\n.col-xs-pull-17 {\n right: 70.83333333%;\n}\n.col-xs-pull-16 {\n right: 66.66666667%;\n}\n.col-xs-pull-15 {\n right: 62.5%;\n}\n.col-xs-pull-14 {\n right: 58.33333333%;\n}\n.col-xs-pull-13 {\n right: 54.16666667%;\n}\n.col-xs-pull-12 {\n right: 50%;\n}\n.col-xs-pull-11 {\n right: 45.83333333%;\n}\n.col-xs-pull-10 {\n right: 41.66666667%;\n}\n.col-xs-pull-9 {\n right: 37.5%;\n}\n.col-xs-pull-8 {\n right: 33.33333333%;\n}\n.col-xs-pull-7 {\n right: 29.16666667%;\n}\n.col-xs-pull-6 {\n right: 25%;\n}\n.col-xs-pull-5 {\n right: 20.83333333%;\n}\n.col-xs-pull-4 {\n right: 16.66666667%;\n}\n.col-xs-pull-3 {\n right: 12.5%;\n}\n.col-xs-pull-2 {\n right: 8.33333333%;\n}\n.col-xs-pull-1 {\n right: 4.16666667%;\n}\n.col-xs-pull-0 {\n right: auto;\n}\n.col-xs-push-24 {\n left: 100%;\n}\n.col-xs-push-23 {\n left: 95.83333333%;\n}\n.col-xs-push-22 {\n left: 91.66666667%;\n}\n.col-xs-push-21 {\n left: 87.5%;\n}\n.col-xs-push-20 {\n left: 83.33333333%;\n}\n.col-xs-push-19 {\n left: 79.16666667%;\n}\n.col-xs-push-18 {\n left: 75%;\n}\n.col-xs-push-17 {\n left: 70.83333333%;\n}\n.col-xs-push-16 {\n left: 66.66666667%;\n}\n.col-xs-push-15 {\n left: 62.5%;\n}\n.col-xs-push-14 {\n left: 58.33333333%;\n}\n.col-xs-push-13 {\n left: 54.16666667%;\n}\n.col-xs-push-12 {\n left: 50%;\n}\n.col-xs-push-11 {\n left: 45.83333333%;\n}\n.col-xs-push-10 {\n left: 41.66666667%;\n}\n.col-xs-push-9 {\n left: 37.5%;\n}\n.col-xs-push-8 {\n left: 33.33333333%;\n}\n.col-xs-push-7 {\n left: 29.16666667%;\n}\n.col-xs-push-6 {\n left: 25%;\n}\n.col-xs-push-5 {\n left: 20.83333333%;\n}\n.col-xs-push-4 {\n left: 16.66666667%;\n}\n.col-xs-push-3 {\n left: 12.5%;\n}\n.col-xs-push-2 {\n left: 8.33333333%;\n}\n.col-xs-push-1 {\n left: 4.16666667%;\n}\n.col-xs-push-0 {\n left: auto;\n}\n.col-xs-offset-24 {\n margin-left: 100%;\n}\n.col-xs-offset-23 {\n margin-left: 95.83333333%;\n}\n.col-xs-offset-22 {\n margin-left: 91.66666667%;\n}\n.col-xs-offset-21 {\n margin-left: 87.5%;\n}\n.col-xs-offset-20 {\n margin-left: 83.33333333%;\n}\n.col-xs-offset-19 {\n margin-left: 79.16666667%;\n}\n.col-xs-offset-18 {\n margin-left: 75%;\n}\n.col-xs-offset-17 {\n margin-left: 70.83333333%;\n}\n.col-xs-offset-16 {\n margin-left: 66.66666667%;\n}\n.col-xs-offset-15 {\n margin-left: 62.5%;\n}\n.col-xs-offset-14 {\n margin-left: 58.33333333%;\n}\n.col-xs-offset-13 {\n margin-left: 54.16666667%;\n}\n.col-xs-offset-12 {\n margin-left: 50%;\n}\n.col-xs-offset-11 {\n margin-left: 45.83333333%;\n}\n.col-xs-offset-10 {\n margin-left: 41.66666667%;\n}\n.col-xs-offset-9 {\n margin-left: 37.5%;\n}\n.col-xs-offset-8 {\n margin-left: 33.33333333%;\n}\n.col-xs-offset-7 {\n margin-left: 29.16666667%;\n}\n.col-xs-offset-6 {\n margin-left: 25%;\n}\n.col-xs-offset-5 {\n margin-left: 20.83333333%;\n}\n.col-xs-offset-4 {\n margin-left: 16.66666667%;\n}\n.col-xs-offset-3 {\n margin-left: 12.5%;\n}\n.col-xs-offset-2 {\n margin-left: 8.33333333%;\n}\n.col-xs-offset-1 {\n margin-left: 4.16666667%;\n}\n.col-xs-offset-0 {\n margin-left: 0%;\n}\n@media (min-width: 768px) {\n .col-sm-1,\n .col-sm-2,\n .col-sm-3,\n .col-sm-4,\n .col-sm-5,\n .col-sm-6,\n .col-sm-7,\n .col-sm-8,\n .col-sm-9,\n .col-sm-10,\n .col-sm-11,\n .col-sm-12,\n .col-sm-13,\n .col-sm-14,\n .col-sm-15,\n .col-sm-16,\n .col-sm-17,\n .col-sm-18,\n .col-sm-19,\n .col-sm-20,\n .col-sm-21,\n .col-sm-22,\n .col-sm-23,\n .col-sm-24 {\n float: left;\n }\n .col-sm-24 {\n width: 100%;\n }\n .col-sm-23 {\n width: 95.83333333%;\n }\n .col-sm-22 {\n width: 91.66666667%;\n }\n .col-sm-21 {\n width: 87.5%;\n }\n .col-sm-20 {\n width: 83.33333333%;\n }\n .col-sm-19 {\n width: 79.16666667%;\n }\n .col-sm-18 {\n width: 75%;\n }\n .col-sm-17 {\n width: 70.83333333%;\n }\n .col-sm-16 {\n width: 66.66666667%;\n }\n .col-sm-15 {\n width: 62.5%;\n }\n .col-sm-14 {\n width: 58.33333333%;\n }\n .col-sm-13 {\n width: 54.16666667%;\n }\n .col-sm-12 {\n width: 50%;\n }\n .col-sm-11 {\n width: 45.83333333%;\n }\n .col-sm-10 {\n width: 41.66666667%;\n }\n .col-sm-9 {\n width: 37.5%;\n }\n .col-sm-8 {\n width: 33.33333333%;\n }\n .col-sm-7 {\n width: 29.16666667%;\n }\n .col-sm-6 {\n width: 25%;\n }\n .col-sm-5 {\n width: 20.83333333%;\n }\n .col-sm-4 {\n width: 16.66666667%;\n }\n .col-sm-3 {\n width: 12.5%;\n }\n .col-sm-2 {\n width: 8.33333333%;\n }\n .col-sm-1 {\n width: 4.16666667%;\n }\n .col-sm-pull-24 {\n right: 100%;\n }\n .col-sm-pull-23 {\n right: 95.83333333%;\n }\n .col-sm-pull-22 {\n right: 91.66666667%;\n }\n .col-sm-pull-21 {\n right: 87.5%;\n }\n .col-sm-pull-20 {\n right: 83.33333333%;\n }\n .col-sm-pull-19 {\n right: 79.16666667%;\n }\n .col-sm-pull-18 {\n right: 75%;\n }\n .col-sm-pull-17 {\n right: 70.83333333%;\n }\n .col-sm-pull-16 {\n right: 66.66666667%;\n }\n .col-sm-pull-15 {\n right: 62.5%;\n }\n .col-sm-pull-14 {\n right: 58.33333333%;\n }\n .col-sm-pull-13 {\n right: 54.16666667%;\n }\n .col-sm-pull-12 {\n right: 50%;\n }\n .col-sm-pull-11 {\n right: 45.83333333%;\n }\n .col-sm-pull-10 {\n right: 41.66666667%;\n }\n .col-sm-pull-9 {\n right: 37.5%;\n }\n .col-sm-pull-8 {\n right: 33.33333333%;\n }\n .col-sm-pull-7 {\n right: 29.16666667%;\n }\n .col-sm-pull-6 {\n right: 25%;\n }\n .col-sm-pull-5 {\n right: 20.83333333%;\n }\n .col-sm-pull-4 {\n right: 16.66666667%;\n }\n .col-sm-pull-3 {\n right: 12.5%;\n }\n .col-sm-pull-2 {\n right: 8.33333333%;\n }\n .col-sm-pull-1 {\n right: 4.16666667%;\n }\n .col-sm-pull-0 {\n right: auto;\n }\n .col-sm-push-24 {\n left: 100%;\n }\n .col-sm-push-23 {\n left: 95.83333333%;\n }\n .col-sm-push-22 {\n left: 91.66666667%;\n }\n .col-sm-push-21 {\n left: 87.5%;\n }\n .col-sm-push-20 {\n left: 83.33333333%;\n }\n .col-sm-push-19 {\n left: 79.16666667%;\n }\n .col-sm-push-18 {\n left: 75%;\n }\n .col-sm-push-17 {\n left: 70.83333333%;\n }\n .col-sm-push-16 {\n left: 66.66666667%;\n }\n .col-sm-push-15 {\n left: 62.5%;\n }\n .col-sm-push-14 {\n left: 58.33333333%;\n }\n .col-sm-push-13 {\n left: 54.16666667%;\n }\n .col-sm-push-12 {\n left: 50%;\n }\n .col-sm-push-11 {\n left: 45.83333333%;\n }\n .col-sm-push-10 {\n left: 41.66666667%;\n }\n .col-sm-push-9 {\n left: 37.5%;\n }\n .col-sm-push-8 {\n left: 33.33333333%;\n }\n .col-sm-push-7 {\n left: 29.16666667%;\n }\n .col-sm-push-6 {\n left: 25%;\n }\n .col-sm-push-5 {\n left: 20.83333333%;\n }\n .col-sm-push-4 {\n left: 16.66666667%;\n }\n .col-sm-push-3 {\n left: 12.5%;\n }\n .col-sm-push-2 {\n left: 8.33333333%;\n }\n .col-sm-push-1 {\n left: 4.16666667%;\n }\n .col-sm-push-0 {\n left: auto;\n }\n .col-sm-offset-24 {\n margin-left: 100%;\n }\n .col-sm-offset-23 {\n margin-left: 95.83333333%;\n }\n .col-sm-offset-22 {\n margin-left: 91.66666667%;\n }\n .col-sm-offset-21 {\n margin-left: 87.5%;\n }\n .col-sm-offset-20 {\n margin-left: 83.33333333%;\n }\n .col-sm-offset-19 {\n margin-left: 79.16666667%;\n }\n .col-sm-offset-18 {\n margin-left: 75%;\n }\n .col-sm-offset-17 {\n margin-left: 70.83333333%;\n }\n .col-sm-offset-16 {\n margin-left: 66.66666667%;\n }\n .col-sm-offset-15 {\n margin-left: 62.5%;\n }\n .col-sm-offset-14 {\n margin-left: 58.33333333%;\n }\n .col-sm-offset-13 {\n margin-left: 54.16666667%;\n }\n .col-sm-offset-12 {\n margin-left: 50%;\n }\n .col-sm-offset-11 {\n margin-left: 45.83333333%;\n }\n .col-sm-offset-10 {\n margin-left: 41.66666667%;\n }\n .col-sm-offset-9 {\n margin-left: 37.5%;\n }\n .col-sm-offset-8 {\n margin-left: 33.33333333%;\n }\n .col-sm-offset-7 {\n margin-left: 29.16666667%;\n }\n .col-sm-offset-6 {\n margin-left: 25%;\n }\n .col-sm-offset-5 {\n margin-left: 20.83333333%;\n }\n .col-sm-offset-4 {\n margin-left: 16.66666667%;\n }\n .col-sm-offset-3 {\n margin-left: 12.5%;\n }\n .col-sm-offset-2 {\n margin-left: 8.33333333%;\n }\n .col-sm-offset-1 {\n margin-left: 4.16666667%;\n }\n .col-sm-offset-0 {\n margin-left: 0%;\n }\n}\n@media (min-width: 992px) {\n .col-md-1,\n .col-md-2,\n .col-md-3,\n .col-md-4,\n .col-md-5,\n .col-md-6,\n .col-md-7,\n .col-md-8,\n .col-md-9,\n .col-md-10