Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rounded corners for Vega plots (#394, #405) #406

Merged
merged 1 commit into from
Jan 22, 2024
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
2 changes: 1 addition & 1 deletion frontend/src/components/GeneDetails/ExpressionCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const vegaLayer = [
Tissue-Specific Gene Expression from GTeX
</v-card-subtitle>
<v-card-text class="pt-3 pb-0">
<v-sheet color="background">
<v-sheet color="background" class="pa-2">
<VegaPlot
data-name="expression"
:data-values="vegaData"
Expand Down
19 changes: 14 additions & 5 deletions frontend/src/components/SeqvarDetails/ClinsigCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ component via the `errorDisplay` event and are handled there.

<script setup lang="ts">
import { computed, onMounted, ref, watch } from 'vue'
import { useTheme } from 'vuetify'

import DocsLink from '@/components/DocsLink.vue'
import CriterionSwitch from '@/components/SeqvarDetails/ClinsigCard/CriterionSwitch.vue'
Expand All @@ -33,6 +34,9 @@ interface Props {
/** Define component's props. */
const props = defineProps<Props>()

/** Vuetify theme. */
const theme = useTheme()

/** Define emits. */
const emit = defineEmits<{
/** Display error to user. */
Expand Down Expand Up @@ -150,6 +154,11 @@ const currentConflicts = computed<Conflict[]>(() => {
return result
})

/** Return font color for genome build based on current theme. */
const fontColor = computed(() => {
return theme.global.current.value.dark ? 'white' : 'black'
})

/** Re-compute ACMG rating from InterVar when the sequence variant changed. */
watch(
() => [props.seqvar, acmgRatingStore.storeState],
Expand Down Expand Up @@ -239,7 +248,7 @@ onMounted(async () => {
</template>
</div>
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
:prepend-icon="showTerse ? 'mdi-playlist-remove' : 'mdi-playlist-check'"
Expand All @@ -248,7 +257,7 @@ onMounted(async () => {
{{ showTerse ? 'Hide' : 'Show' }} terse mode
</v-btn>
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
:prepend-icon="showFailed ? 'mdi-eye-off-outline' : 'mdi-eye-outline'"
Expand All @@ -270,7 +279,7 @@ onMounted(async () => {
<v-col cols="3">
<div class="d-flex flex-column">
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
prepend-icon="mdi-cloud-upload-outline"
Expand All @@ -280,7 +289,7 @@ onMounted(async () => {
Save to Server
</v-btn>
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
prepend-icon="mdi-cloud-download-outline"
Expand All @@ -290,7 +299,7 @@ onMounted(async () => {
Load from Server
</v-btn>
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
prepend-icon="mdi-cloud-remove-outline"
Expand Down
14 changes: 12 additions & 2 deletions frontend/src/components/SeqvarDetails/ClinsigCard/SummarySheet.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<script setup lang="ts">
import { computed } from 'vue'
import { useTheme } from 'vuetify'

import { classColor } from '@/lib/utils'

interface Props {
Expand All @@ -12,7 +15,14 @@ const props = withDefaults(defineProps<Props>(), {
interVaravailable: false
})

const theme = useTheme()

const emit = defineEmits(['clearAll', 'resetToAuto'])

/** Return font color for genome build based on current theme. */
const fontColor = computed(() => {
return theme.global.current.value.dark ? 'white' : 'black'
})
</script>

<template>
Expand All @@ -27,7 +37,7 @@ const emit = defineEmits(['clearAll', 'resetToAuto'])

<div class="mt-3 d-flex flex-row">
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
prepend-icon="mdi-file-outline"
Expand All @@ -36,7 +46,7 @@ const emit = defineEmits(['clearAll', 'resetToAuto'])
Clear
</v-btn>
<v-btn
color="black"
:color="fontColor"
variant="text"
rounded="sm"
prepend-icon="mdi-file-restore-outline"
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/components/VegaPlot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,16 @@ defineExpose({
</script>

<template>
<div ref="plotDivRef" />
<div ref="plotDivRef" class="vega-embed" />
</template>

<style>
.vega-embed {
padding-top: 2px;
padding-left: 2px;
border-radius: 8px;
background-color: #eeeeee;
}
/* .vega-embed summary {
top: -25px !important;
left: -5px;
Expand Down
Loading