Skip to content

Commit

Permalink
Correct tools appearance, fix resizing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dhovart committed Aug 9, 2022
1 parent 39a7db1 commit 8752e98
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 12 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"multer": "^1.4.2",
"mustache-express": "^1.3.0",
"neuroweblab": "github:neuroanatomy/neuroweblab",
"nwl-components": "^1.0.0",
"nwl-components": "^1.0.5",
"pako": "^1.0.11",
"passport": "^0.4.1",
"passport-github": "^1.1.0",
Expand Down
4 changes: 3 additions & 1 deletion view/brainbox/src/components/ProjectPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@on-close="displayOntology = false"
@label-click="handleOntologyLabelClick"
/>
<Editor :title="title">
<Editor :title="title" :dense="!displayChat && !displayScript">
<template v-slot:tools>
<Tools />
</template>
Expand Down Expand Up @@ -87,6 +87,8 @@ const {
title,
displayAdjustSettings,
displayOntology,
displayChat,
displayScript,
currentLabel,
ontology,
currentView,
Expand Down
28 changes: 25 additions & 3 deletions view/brainbox/src/components/Tools.vue
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
</ButtonsGroup>
</Row>

<Row style="flex-grow: 1">
<Row style="flex: 1; min-height:60px; margin: 0 0 30px">
<div class="text">
<Chat
v-if="displayChat"
Expand Down Expand Up @@ -234,11 +234,11 @@ const {
currentPenSize,
totalSlices,
fullscreen,
displayChat,
displayScript
} = useVisualization();
const doFill = ref(false);
const usePreciseCursor = ref(false);
const displayChat = ref(true);
const displayScript = ref(false);
const icons = requireIconsMap();
const sliceChange = (slice) => {
Expand Down Expand Up @@ -359,4 +359,26 @@ button img.icon {
:deep(button) {
flex-grow: 1;
}
:deep #logScript {
height: 100%;
}
</style>

<style>
.resizable-component:after {
content: "";
display: block;
right: 0;
bottom: 0;
position: absolute;
z-index: 100;
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACC2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjE8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx0aWZmOlBob3RvbWV0cmljSW50ZXJwcmV0YXRpb24+MjwvdGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KD0UqkwAAACJJREFUCB1jYMABPn/+/B+rFA0l4EbDGVAXwPlwBroEkA8ARSMmcY29DXYAAAAASUVORK5CYII=");
background-position: bottom right;
background-repeat: no-repeat;
pointer-events: none;
opacity: 0.6;
width: 7px;
height: 7px;
}
</style>
2 changes: 2 additions & 0 deletions view/brainbox/src/store/visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const state = reactive({
receivedMessages: [],
displayAdjustSettings: false,
displayOntology: false,
displayChat: true,
displayScript: false,
ontology: null,
currentLabel: 0,
currentFile: null,
Expand Down

0 comments on commit 8752e98

Please sign in to comment.