apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix tests

Browse Source
pull/10012/head
Karl Prieb 8 years ago
parent a8704adb34
commit 8be9837a72
4 changed files with 77 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 154
      package-lock.json
  2. 2
      package.json
  3. 9
      packages/rocketchat-theme/client/imports/components/contextual-bar.css
  4. 1
      packages/rocketchat-theme/client/imports/general/base_old.css

154
package-lock.json generated
Unescape View File

@ -1,6 +1,6 @@
{
"name": "Rocket.Chat",
"version": "0.62.0-develop",
"version": "0.63.0-develop",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -1732,8 +1732,7 @@
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
"dev": true
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
},
"body-parser": {
"version": "1.13.3",
@ -2130,9 +2129,9 @@
"dev": true
},
"chimp": {
"version": "0.51.0",
"resolved": "https://registry.npmjs.org/chimp/-/chimp-0.51.0.tgz",
"integrity": "sha1-RFr6LHsrtJlaUXWYRu9e4mlfCh0=",
"version": "0.51.1",
"resolved": "https://registry.npmjs.org/chimp/-/chimp-0.51.1.tgz",
"integrity": "sha1-6hIbzfJsidV/jvNBlUDPPCeaPMU=",
"dev": true,
"requires": {
"async": "0.9.2",
@ -2148,7 +2147,7 @@
"chai-as-promised": "6.0.0",
"child-process-debug": "0.0.7",
"chokidar": "1.6.1",
"chromedriver": "2.34.1",
"chromedriver": "2.37.0",
"colors": "1.1.2",
"commander": "2.14.1",
"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
@ -2168,7 +2167,7 @@
"request": "2.83.0",
"requestretry": "1.5.0",
"saucelabs": "1.4.0",
"selenium-standalone": "6.12.0",
"selenium-standalone": "6.13.0",
"underscore": "1.8.3",
"xolvio-ddp": "0.12.3",
"xolvio-jasmine-expect": "1.1.0",
@ -2187,6 +2186,27 @@
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true
},
"cucumber": {
"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
"dev": true,
"requires": {
"camel-case": "3.0.0",
"cli-table": "0.3.1",
"co": "4.6.0",
"colors": "1.1.2",
"commander": "2.14.1",
"duration": "0.2.0",
"fibers": "1.0.15",
"figures": "1.7.0",
"gherkin": "4.0.0",
"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
"is-generator": "1.0.3",
"lodash": "4.17.5",
"meteor-promise": "0.8.6",
"stack-chain": "1.3.7",
"stacktrace-js": "1.3.1"
}
},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@ -2300,9 +2320,9 @@
"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
},
"chromedriver": {
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.34.1.tgz",
"integrity": "sha512-ivXrPKKtnX442J8Lkbhb8hJ5+lelzAqrAI9VjVs3/iujm396JnJYXGGGjniPXvQeLVE3HDIWwsHu8goIUq3rMQ==",
"version": "2.37.0",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.37.0.tgz",
"integrity": "sha512-Dz3ktXp+9T0ygMIEZX3SNL3grXywi2kC1swiD9cjISlLcoenzhOpsj/R/Gr2hJvrC49aGE2BhSpuUevdGq6J4w==",
"dev": true,
"requires": {
"del": "3.0.0",
@ -3130,35 +3150,6 @@
"integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
"dev": true
},
"cucumber": {
"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
"dev": true,
"requires": {
"camel-case": "3.0.0",
"cli-table": "0.3.1",
"co": "4.6.0",
"colors": "1.1.2",
"commander": "2.14.1",
"duration": "0.2.0",
"fibers": "1.0.15",
"figures": "1.7.0",
"gherkin": "4.0.0",
"glob": "7.1.2",
"is-generator": "1.0.3",
"lodash": "4.17.5",
"meteor-promise": "0.8.6",
"stack-chain": "1.3.7",
"stacktrace-js": "1.3.1"
},
"dependencies": {
"colors": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true
}
}
},
"cuid": {
"version": "1.3.8",
"resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
@ -3553,9 +3544,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"ejs": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
"version": "2.5.8",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.8.tgz",
"integrity": "sha512-QIDZL54fyV8MDcAsO91BMH1ft2qGGaHIJsJIA/+t+7uvXol1dm413fPcUgUb4k8F/9457rx4/KFE4XfDifrQxQ==",
"dev": true
},
"electron-to-chromium": {
@ -3608,7 +3599,6 @@
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz",
"integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==",
"optional": true,
"requires": {
"prr": "1.0.1"
}
@ -6920,9 +6910,9 @@
}
},
"http-parser-js": {
"version": "0.4.10",
"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
"integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
"version": "0.4.11",
"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz",
"integrity": "sha512-QCR5O2AjjMW8Mo4HyI1ctFcv+O99j/0g367V3YoVnrNw5hkDvAWZD0lWGcc+F4yN3V55USPCVix4efb75HxFfA==",
"dev": true
},
"http-signature": {
@ -8539,8 +8529,7 @@
"natives": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz",
"integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==",
"optional": true
"integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA=="
},
"natural-compare": {
"version": "1.4.0",
@ -8559,6 +8548,12 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz",
"integrity": "sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g="
},
"nice-try": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
"integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
"dev": true
},
"no-case": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@ -8913,6 +8908,12 @@
"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
"dev": true
},
"path-key": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
"path-parse": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
@ -10107,8 +10108,7 @@
"prr": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
"optional": true
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
},
"pump": {
"version": "2.0.1",
@ -10728,14 +10728,14 @@
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
},
"selenium-standalone": {
"version": "6.12.0",
"resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.12.0.tgz",
"integrity": "sha1-eJcw2wmhBfHM4SxkJNeV0RxUO9Q=",
"version": "6.13.0",
"resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.13.0.tgz",
"integrity": "sha512-JV1+AySJ9RccsAIZlnDb8QUx/SDeVGK8j/zCJcNlbz/LCRiketU3Su0YE5Uc1raaBGpT/venof0+9Ry0oGuvYw==",
"dev": true,
"requires": {
"async": "2.6.0",
"commander": "2.14.1",
"cross-spawn": "5.1.0",
"cross-spawn": "6.0.5",
"debug": "3.1.0",
"lodash": "4.17.5",
"minimist": "1.2.0",
@ -10775,6 +10775,19 @@
"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
"dev": true
},
"cross-spawn": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
"nice-try": "1.0.4",
"path-key": "2.0.1",
"semver": "5.5.0",
"shebang-command": "1.2.0",
"which": "1.2.14"
}
},
"cryptiles": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@ -12866,12 +12879,6 @@
"spdx-expression-parse": "1.0.4"
}
},
"validator": {
"version": "9.1.2",
"resolved": "https://registry.npmjs.org/validator/-/validator-9.1.2.tgz",
"integrity": "sha512-1Tml6crNdsSC61jHssWksQxq6C7MmSFCCmf99Eb+l/V/cwVlw4/Pg3YXBP1WKcHLsyqe3E+iJXUZgoTTQFcqQg==",
"dev": true
},
"vary": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
@ -12978,9 +12985,9 @@
}
},
"webdriverio": {
"version": "4.10.2",
"resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.10.2.tgz",
"integrity": "sha1-DShiKALJZgFa/jSzrFZtwznyLkM=",
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.12.0.tgz",
"integrity": "sha1-40De8nIYPIFopN0LOCMi+de+4Q0=",
"dev": true,
"requires": {
"archiver": "2.1.1",
@ -12988,7 +12995,7 @@
"css-parse": "2.0.0",
"css-value": "0.0.1",
"deepmerge": "2.0.1",
"ejs": "2.5.7",
"ejs": "2.5.8",
"gaze": "1.1.2",
"glob": "7.1.2",
"inquirer": "3.3.0",
@ -13002,7 +13009,6 @@
"safe-buffer": "5.1.1",
"supports-color": "5.0.1",
"url": "0.11.0",
"validator": "9.1.2",
"wdio-dot-reporter": "0.0.9",
"wgxpath": "1.0.0"
},
@ -13019,12 +13025,6 @@
"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
"dev": true
},
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
"dev": true
},
"supports-color": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.0.1.tgz",
@ -13052,7 +13052,7 @@
"integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
"dev": true,
"requires": {
"http-parser-js": "0.4.10",
"http-parser-js": "0.4.11",
"websocket-extensions": "0.1.3"
}
},
@ -13389,12 +13389,6 @@
"mime-db": "1.12.0"
}
},
"node-uuid": {
"version": "1.4.8",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
"dev": true
},
"oauth-sign": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
@ -13496,7 +13490,7 @@
"meteor-promise": "0.8.6",
"underscore": "1.8.3",
"wdio-sync": "0.6.14",
"webdriverio": "4.10.2",
"webdriverio": "4.12.0",
"xolvio-fiber-utils": "2.0.3"
}
},

2
package.json
Unescape View File

@ -89,7 +89,7 @@
"autoprefixer": "^8.0.0",
"babel-mocha-es6-compiler": "^0.1.0",
"babel-plugin-array-includes": "^2.0.3",
"chimp": "^0.51.0",
"chimp": "^0.51.1",
"conventional-changelog-cli": "^1.3.14",
"eslint": "^4.18.1",
"mocha": "^5.0.1",

9
packages/rocketchat-theme/client/imports/components/contextual-bar.css
Unescape View File

@ -31,14 +31,9 @@
overflow: auto;
padding: var(--default-padding);
flex: 1 1 auto;
display: flex;
flex-direction: column;
& .js-back {
margin: auto 0;
width: 100%;
margin-top: 2rem;
}
& .section:not(:last-child) {

1
packages/rocketchat-theme/client/imports/general/base_old.css
Unescape View File

@ -3413,7 +3413,6 @@ body:not(.is-cordova) {
overflow-x: visible;
width: var(--flex-tab-width);
height: calc(100vh - var(--header-height));
& .control {
& .header {

Write Preview
Loading…
Cancel
Save