Commit 511a3eea authored by dindigala's avatar dindigala
Browse files

Merge branch 'feature/#19-OptimizePanels' into 'develop'

feature/#19: Optimizing Treeview-Panel

See merge request subugoe/emo/Qviewer!22
parents b7c4459d c4e619cd
Pipeline #143705 failed with stages
in 3 minutes and 20 seconds
...@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. ...@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.0.14] - 2020-06-24
### Fixed
- Reverted the changes and fixed the icons to nest inside image.
## [0.0.13] - 2020-06-25 ## [0.0.13] - 2020-06-25
### Added ### Added
......
<template> <template>
<div> <div>
<div class="row iconPosition"> <div class="row iconPosition">
<div style="margin: 16px;"> <div class="content">
<q-btn <q-btn
class="q-mr-sm q-mb-sm cursor-pointer iconPosition" class="q-mr-sm q-mb-sm cursor-pointer"
color="grey-8" color="grey-8"
round
flat flat
round
size="md" size="md"
@click="increase()" @click="increase()"
> >
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/> />
</q-btn> </q-btn>
<q-btn <q-btn
class="q-mr-sm q-mb-sm cursor-pointer iconPosition" class="q-mr-sm q-mb-sm cursor-pointer"
color="grey-8" color="grey-8"
round round
flat flat
......
<template> <template>
<div> <figure id="openseadragon">
<div style="margin: 16px;"> <nav>
<q-btn <q-btn
v-for="(btn, idx) in buttons" :key="idx" v-for="(btn, idx) in buttons" :key="idx"
class="q-mr-sm q-mb-sm" class="q-mr-sm q-mb-sm"
...@@ -12,13 +12,8 @@ ...@@ -12,13 +12,8 @@
> >
<q-icon size="sm" :name="btn.svg" /> <q-icon size="sm" :name="btn.svg" />
</q-btn> </q-btn>
</div> </nav>
<div> </figure>
<figure id="openseadragon">
<nav />
</figure>
</div>
</div>
</template> </template>
<script> <script>
...@@ -77,8 +72,9 @@ export default { ...@@ -77,8 +72,9 @@ export default {
<style scoped> <style scoped>
figure { figure {
height: 50vh; display: inline-block;
margin: 8px; height: 60vh;
overflow: hidden; margin: 16px;
width: 100%;
} }
</style> </style>
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.q-tree__node-collapsible .q-tree__children { .q-tree__node-collapsible .q-tree__children {
> .q-tree__node--parent { > .q-tree__node--parent {
> .q-tree__node-header { > .q-tree__node-header {
background: white;
left: 0; left: 0;
position: sticky; position: sticky;
top: 0; top: 0;
...@@ -18,23 +19,6 @@ ...@@ -18,23 +19,6 @@
} }
.q-tree__children { .q-tree__children {
cursor: pointer; cursor: pointer;
i.q-tree__arrow.q-mr-xs.material-icons.q-icon.notranslate.q-tree__arrow--rotate {
position: static;
transform: none;
&::after {
background-color: white;
box-shadow: 1px 1px 0px #dcdcdc;
content: "";
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}
}
} }
} }
.view-tree::-webkit-scrollbar { .view-tree::-webkit-scrollbar {
......
...@@ -39,11 +39,13 @@ ...@@ -39,11 +39,13 @@
<Toolbar heading="Image" /> <Toolbar heading="Image" />
<q-separator /> <q-separator />
<OpenSeadragon <div style="overflow:hidden">
:key="imageurl" <OpenSeadragon
:imageurl="imageurl" :key="imageurl"
> :imageurl="imageurl"
</OpenSeadragon> >
</OpenSeadragon>
</div>
</template> </template>
<template v-show="panels.metadata" v-slot:after> <template v-show="panels.metadata" v-slot:after>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment