Skip to content

Commit f7dc340

Browse files
committed
Update plot titles, intro arrows, bump vdp version
1 parent 6f6389e commit f7dc340

File tree

5 files changed

+27
-45
lines changed

5 files changed

+27
-45
lines changed

src/components/ExplorerMain.vue

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,20 @@
1111
<PlotContainer
1212
:pWidth="(colWidth-150-5)"
1313
:pHeight="200"
14-
:pMarginTop="5"
14+
:pMarginTop="130"
1515
:pMarginLeft="150"
1616
:pMarginRight="5"
17-
:pMarginBottom="150"
17+
:pMarginBottom="5"
1818
>
19+
<Axis
20+
slot="axisTop"
21+
variable="sample_id"
22+
side="top"
23+
:tickRotation="-65"
24+
:maxCharacters="4"
25+
:getScale="getScale"
26+
:getStack="getStack"
27+
/>
1928
<Axis
2029
slot="axisLeft"
2130
variable="mut_count_sum"
@@ -33,14 +42,7 @@
3342
:getData="getData"
3443
:getScale="getScale"
3544
/>
36-
<Axis
37-
slot="axisBottom"
38-
variable="sample_id"
39-
side="bottom"
40-
:tickRotation="-65"
41-
:getScale="getScale"
42-
:getStack="getStack"
43-
/>
45+
4446
</PlotContainer>
4547

4648
<!-- Exposures -->
@@ -185,7 +187,7 @@
185187
:pMarginTop="10"
186188
:pMarginLeft="150"
187189
:pMarginRight="5"
188-
:pMarginBottom="0"
190+
:pMarginBottom="5"
189191
>
190192
<Axis
191193
slot="axisLeft"
@@ -205,23 +207,6 @@
205207
/>
206208
</PlotContainer>
207209

208-
<PlotContainer
209-
:pWidth="(colWidth-150-5)"
210-
:pHeight="0"
211-
:pMarginTop="0"
212-
:pMarginLeft="150"
213-
:pMarginRight="5"
214-
:pMarginBottom="150"
215-
>
216-
<Axis
217-
slot="axisBottom"
218-
variable="sample_id"
219-
side="bottom"
220-
:tickRotation="-65"
221-
:getScale="getScale"
222-
:getStack="getStack"
223-
/>
224-
</PlotContainer>
225210

226211
<!-- Meta -->
227212
<div v-if="showMeta">

src/components/Intro.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<div class="intro-figure">
44
<span id="arrow1" class="arrow"></span>
55
<span id="arrow2" class="arrow"></span>
6+
67
<span id="text1" class="text"><span class="bubble">1</span>Select signatures</span>
78
<span id="text2" class="text"><span class="bubble">2</span>Select samples</span>
89
</div>
@@ -104,28 +105,28 @@ export default {
104105
}
105106
}
106107
#arrow1 {
107-
right: 8.5rem;
108+
right: 17.8rem;
108109
&:before {
109110
height: 100px;
110111
}
111112
&:after {
112113
top: 117px;
113-
width: 7rem;
114+
width: 1.3rem;
114115
}
115116
}
116117
#arrow2 {
117-
right: 1.3rem;
118+
right: 10.8rem;
118119
&:before {
119120
height: 164px;
120121
}
121122
&:after {
122123
top: 181px;
123-
width: 13rem;
124+
width: 7.1rem;
124125
}
125126
}
126127
.text {
127128
display: inline-block;
128-
right: 17.2rem;
129+
right: 20.2rem;
129130
border: 0px solid black;
130131
position: absolute;
131132
text-align: right;

src/components/PlotInfo.vue

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<div>
33
<div class="plot-info">
4-
<h4 class="plot-info-title">{{ title }}</h4>
54
<button @click="modalVisible = true">?</button>
65
</div>
76

@@ -42,17 +41,14 @@ export default {
4241
@import './../style/modal.scss';
4342
4443
.plot-info {
45-
width: 95%;
46-
margin-left: 2.5%;
44+
width: 100%;
4745
margin-bottom: 5px;
48-
padding: 5px;
4946
text-align: center;
50-
h4 {
51-
display: inline-block;
52-
margin: 0;
53-
}
47+
z-index: 3;
48+
position: relative;
5449
button {
55-
float: right;
50+
float: left;
51+
margin-left: 15px;
5652
background-color: $color-gray;
5753
border: none;
5854
color: white;

src/style/modal.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.modal-background {
2-
z-index: 1;
2+
z-index: 4;
33
top: 0;
44
left: 0;
55
position: fixed;

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8243,8 +8243,8 @@ vm-browserify@0.0.4:
82438243
indexof "0.0.1"
82448244

82458245
vue-declarative-plots@^1.0.0:
8246-
version "1.2.9"
8247-
resolved "https://registry.yarnpkg.com/vue-declarative-plots/-/vue-declarative-plots-1.2.9.tgz#feef8c1d5919ab5806ab82e332c9c20141abbff1"
8246+
version "1.2.10"
8247+
resolved "https://registry.yarnpkg.com/vue-declarative-plots/-/vue-declarative-plots-1.2.10.tgz#eaf8a2e19b9faacb17df61920c657f56c0475362"
82488248
dependencies:
82498249
colorjoe "^4.1.0"
82508250
d3 "^5.7.0"

0 commit comments

Comments
 (0)