Skip to content

Commit 3900081

Browse files
committed
Fix style of the dynamic Android demo + fix offering check time
1 parent 9c86731 commit 3900081

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

demos/dynamic-android/src/components/VideoCard.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ export default {
5555
5656
.video, .v-card, .no-dialog {
5757
width: inherit;
58-
height: 175px;
58+
height: calc(100% - 10px);
5959
background-color: #000000 !important;
6060
}
6161
6262
.v-card {
63-
height: 100%;
64-
width: 320px;
63+
height: inherit;
64+
width: inherit;
65+
min-width: 320px;
6566
}
6667
6768
.video-h264 > canvas {

demos/dynamic-android/src/components/VideoContainer.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default {
2929
justify-content: center;
3030
align-items: center;
3131
position: absolute;
32-
height: 245px;
32+
max-height: 245px;
33+
height: calc(100% - 15px);
3334
background: rgba(0,0,0,0.5) !important;
3435
bottom: 0px;
3536
left: 50%;

demos/dynamic-android/src/workers/check.offering.worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function successFn(event) {
1818
let items = event.Capabilities.contents.offering.map(offering => {
1919
let starTime = 'now';
2020
let endTime = '2055-01-01T00:00:00.00Z';
21-
if (!isDefined(offering.phenomenonTime.beginPosition.indeterminatePosition)) {
21+
if (!isDefined(offering.phenomenonTime.endPosition.indeterminatePosition)) {
2222
starTime = offering.phenomenonTime.beginPosition;
2323
endTime = offering.phenomenonTime.endPosition;
2424
}

source/osh-vue/components/Control.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,11 @@ export default {
301301
}
302302
303303
.control .buttons {
304-
padding: 12px 8px 8px 8px;
305304
color: lightgray;
306-
display: flex;
307-
justify-content: space-between;
308-
align-items: center;
309305
}
310306
311307
.control-btn {
312-
padding: 0px 5px 0px 5px;
308+
padding: 0px 0px 0px 5px;
313309
}
314310
315311
.control-btn:hover {

source/osh-vue/components/video/VideoWithControl.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,13 @@
172172
position: relative;
173173
display: flex;
174174
align-items: center;
175-
padding: 5px 0px 0 0px;
175+
padding: 0px 0px 0 0px;
176176
}
177177
178178
.video-control {
179179
position: absolute;
180180
left: calc(100% - 55px);
181-
bottom: auto;
182-
margin-top: 2px;
181+
flex: auto;
183182
}
184183
185184
.main-video {
@@ -190,7 +189,7 @@
190189
<style>
191190
.v-dialog {
192191
background: rgba(0,0,0,0.85);
193-
height: calc(100% - 52px) !important;
192+
height: calc(100% - 30px) !important;
194193
width: 90% !important;
195194
overflow: hidden;
196195
}

0 commit comments

Comments
 (0)