mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' of github.com:n8n-io/n8n

Browse Source
This commit is contained in:
Jan Oberhauser
2020-02-07 17:08:03 -08:00
parent bb487c9d96 c877df0fdd
commit b6b5935c57
7 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/editor-ui/src/components/ExpressionEdit.vue
View File

@@ -102,7 +102,7 @@ export default Vue.extend({
margin-top: 1em;
}
/deep/ .expression-dialog {
::v-deep .expression-dialog {
.el-dialog__header {
padding: 0;
}

6
packages/editor-ui/src/components/MultipleParameter.vue
View File

@@ -138,7 +138,7 @@ export default mixins(genericHelpers)
}
}
/deep/ .duplicate-parameter-item {
::v-deep .duplicate-parameter-item {
position: relative;
margin-top: 0.5em;
padding-top: 0.5em;
@@ -148,11 +148,11 @@ export default mixins(genericHelpers)
}
}
/deep/ .duplicate-parameter-input-item {
::v-deep .duplicate-parameter-input-item {
margin: 0.5em 0 0.25em 2em;
}
/deep/ .duplicate-parameter-item + .duplicate-parameter-item {
::v-deep .duplicate-parameter-item + .duplicate-parameter-item {
.collection-parameter-wrapper {
border-top: 1px dashed #999;
padding-top: 0.5em;

2
packages/node-dev/src/Build.ts
View File

@@ -64,7 +64,7 @@ export async function buildFiles (options?: IBuildOptions): Promise<string> {
options = options || {};
// Get the path of the TypeScript cli of this project
const tscPath = join(__dirname, '../../node_modules/typescript/bin/tsc');
const tscPath = join(__dirname, '../../node_modules/.bin/tsc');
const tsconfigData = await createCustomTsconfig();