Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
"OCA\\SoftwareCatalog\\": "lib/"
}
},
"autoload-dev": {
"psr-4": {
"OCA\\OpenRegister\\": "tests/Stubs/"
}
},
"scripts": {
"post-install-cmd": [
"@composer bin all install --ansi"
Expand Down
1 change: 1 addition & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
bootstrap="tests/bootstrap.php"
colors="true"
cacheDirectory=".phpunit.cache"
defaultTestSuite="Unit Tests"
executionOrder="depends,defects"
requireCoverageMetadata="false"
beStrictAboutCoverageMetadata="true"
Expand Down
10 changes: 5 additions & 5 deletions src/modals/Modals.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ export default {
MigrationObject,
MergeObject,
},
setup() {
return {
navigationStore,
}
},
computed: {
/**
* Returns the object type if the current modal matches a generic object type,
Expand All @@ -71,10 +76,5 @@ export default {
return GENERIC_MODAL_OBJECT_TYPES.includes(modal) ? modal : null
},
},
setup() {
return {
navigationStore,
}
},
}
</script>
22 changes: 17 additions & 5 deletions src/modals/object/DownloadObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export default {

<style scoped>
.json-editor {
position: relative;
position: relative;
margin-bottom: 2.5rem;
}

Expand All @@ -133,12 +133,15 @@ export default {
border-radius: 0 !important;
border: none !important;
}

.codeMirrorContainer :deep(.cm-editor) {
outline: none !important;
}

.codeMirrorContainer.light > .vue-codemirror {
border: 1px dotted silver;
}

.codeMirrorContainer.dark > .vue-codemirror {
border: 1px dotted grey;
}
Expand All @@ -148,6 +151,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼe) {
color: #448c27;
}

.codeMirrorContainer.dark :deep(.ͼe) {
color: #88c379;
}
Expand All @@ -156,6 +160,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼc) {
color: #221199;
}

.codeMirrorContainer.dark :deep(.ͼc) {
color: #8d64f7;
}
Expand All @@ -164,6 +169,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼb) {
color: #770088;
}

.codeMirrorContainer.dark :deep(.ͼb) {
color: #be55cd;
}
Expand All @@ -172,6 +178,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼd) {
color: #d19a66;
}

.codeMirrorContainer.dark :deep(.ͼd) {
color: #9d6c3a;
}
Expand All @@ -185,26 +192,29 @@ export default {
.codeMirrorContainer.light :deep(.cm-line)::selection,
.codeMirrorContainer.light :deep(.cm-line) ::selection {
background-color: #d7eaff !important;
color: black;
color: black;
}

.codeMirrorContainer.dark :deep(.cm-line)::selection,
.codeMirrorContainer.dark :deep(.cm-line) ::selection {
background-color: #8fb3e6 !important;
color: black;
color: black;
}

/* string */
.codeMirrorContainer.light :deep(.cm-line .ͼe)::selection {
color: #2d770f;
color: #2d770f;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼe)::selection {
color: #104e0c;
color: #104e0c;
}

/* boolean */
.codeMirrorContainer.light :deep(.cm-line .ͼc)::selection {
color: #221199;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼc)::selection {
color: #4026af;
}
Expand All @@ -213,6 +223,7 @@ export default {
.codeMirrorContainer.light :deep(.cm-line .ͼb)::selection {
color: #770088;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼb)::selection {
color: #770088;
}
Expand All @@ -221,6 +232,7 @@ export default {
.codeMirrorContainer.light :deep(.cm-line .ͼd)::selection {
color: #8c5c2c;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼd)::selection {
color: #623907;
}
Expand Down
14 changes: 10 additions & 4 deletions src/modals/object/MergeObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼd) {
color: #d19a66;
}

.codeMirrorContainer.dark :deep(.ͼd) {
color: #9d6c3a;
}
Expand All @@ -1070,26 +1071,29 @@ export default {
.codeMirrorContainer.light :deep(.cm-line)::selection,
.codeMirrorContainer.light :deep(.cm-line) ::selection {
background-color: #d7eaff !important;
color: black;
color: black;
}

.codeMirrorContainer.dark :deep(.cm-line)::selection,
.codeMirrorContainer.dark :deep(.cm-line) ::selection {
background-color: #8fb3e6 !important;
color: black;
color: black;
}

/* string */
.codeMirrorContainer.light :deep(.cm-line .ͼe)::selection {
color: #2d770f;
color: #2d770f;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼe)::selection {
color: #104e0c;
color: #104e0c;
}

/* boolean */
.codeMirrorContainer.light :deep(.cm-line .ͼc)::selection {
color: #221199;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼc)::selection {
color: #4026af;
}
Expand All @@ -1098,6 +1102,7 @@ export default {
.codeMirrorContainer.light :deep(.cm-line .ͼb)::selection {
color: #770088;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼb)::selection {
color: #770088;
}
Expand All @@ -1106,6 +1111,7 @@ export default {
.codeMirrorContainer.light :deep(.cm-line .ͼd)::selection {
color: #8c5c2c;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼd)::selection {
color: #623907;
}
Expand Down
26 changes: 16 additions & 10 deletions src/modals/object/MigrationObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ export default {
.codeMirrorContainer.light :deep(.ͼd) {
color: #d19a66;
}

.codeMirrorContainer.dark :deep(.ͼd) {
color: #9d6c3a;
}
Expand All @@ -995,43 +996,48 @@ export default {
.codeMirrorContainer.light :deep(.cm-line)::selection,
.codeMirrorContainer.light :deep(.cm-line) ::selection {
background-color: #d7eaff !important;
color: black;
color: black;
}

.codeMirrorContainer.dark :deep(.cm-line)::selection,
.codeMirrorContainer.dark :deep(.cm-line) ::selection {
background-color: #8fb3e6 !important;
color: black;
color: black;
}

/* string */
.codeMirrorContainer.light :deep(.cm-line .ͼe)::selection {
color: #2d770f;
color: #2d770f;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼe)::selection {
color: #104e0c;
color: #104e0c;
}

/* boolean */
.codeMirrorContainer.light :deep(.cm-line .ͼc)::selection {
color: #221199;
color: #221199;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼc)::selection {
color: #4026af;
color: #4026af;
}

/* null */
.codeMirrorContainer.light :deep(.cm-line .ͼb)::selection {
color: #770088;
color: #770088;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼb)::selection {
color: #770088;
color: #770088;
}

/* number */
.codeMirrorContainer.light :deep(.cm-line .ͼd)::selection {
color: #8c5c2c;
color: #8c5c2c;
}

.codeMirrorContainer.dark :deep(.cm-line .ͼd)::selection {
color: #623907;
color: #623907;
}
</style>
Loading
Loading