Merge branch 'master' of git.rubenvandeven.com:r/guest_worker

This commit is contained in:
Ruben van de Ven 2020-01-22 18:15:56 +01:00
commit eea090d265
4 changed files with 36 additions and 28 deletions

View File

@ -14,8 +14,8 @@
<img :src="hit.scan_image">
<div class='credits'>
<span class='worker_id'>test{{hit.assignment.worker_id}}</span>
<span class='country'>test{{hit.assignment.turk_country}}</span>
<span class='worker_id'>{{hit.assignment.worker_id}}</span>
<span class='country'>{{hit.assignment.turk_country}}</span>
<template v-if="hit.preceding_assignments.length">
<div id='collaborators'>
<div id='collab_items'>

View File

@ -38,7 +38,7 @@
body{
background: black;
margin:0;
color:white;
color:#f5f5f5;
font-family: 'bt';
font-size: var(--base-font-size);
line-height: var(--base-font-size)*1.5;
@ -47,8 +47,8 @@ body{
.hit{
position:absolute;
top:var(--pos-y);
left:0;
right:0;
left:24px;
right:21px;
bottom:0;
text-align: center;
transition: opacity 1s;
@ -73,17 +73,16 @@ body{
.hit img{
display: block;
margin: 10vh auto 7vh;
width: 1000px;
height: 500px;
border: solid 1px white;
margin: 6vh auto 7vh;
width: 875px;
}
.credits{
font-size: var(--base-font-size);
text-transform: uppercase;
text-transform: uppercase;
}
.credits::before{
@ -108,12 +107,12 @@ body{
.country::after{content:')';}
#collaborators{
height: 30vh;
width: 1000px;
height: 32vh;
width: 800px;
margin: 0 auto;
}
#collab_items{
text-align: justify;
text-align: justify-center;
}
#collaborators::before{
margin-top: 7vh;

View File

@ -9,7 +9,7 @@
</head>
<body>
<!-- VUE kijken hoe dat werkt bv for loop -->
<div id="wrapper">
<div class='hit' v-for="(hit, hitId) in hits"
@ -41,11 +41,11 @@
</div>
</div>
<!-- TASK FEE en FEE voor amazon (task fee * .2) -->
</div>
<div class='transition' v-if="hit.hit_id">
<div class='transition' v-if="hit.hit_id" :class="[{'no_arrow': !hit.assignment}]">
<p v-if="!hit.assignment">waiting for worker</p>
<template v-else>
<p v-if="hit.assignment.returned_at || hit.assignment.abandoned_at">task abandoned</p>
@ -81,7 +81,7 @@
<div class='state' v-if="hit.assignment.submit_page_at">
<h2>worker input</h2>
<div class="svgcrop" style="height: 110px; overflow: hidden">
<img :src="hit.svg_image" style="margin-top: -60px">
<img :src="hit.svg_image" style="margin-top: 0px">
</div>
<div class='columns'>

View File

@ -78,21 +78,28 @@ html, body{
/* text-align: center; */
animation-duration: 3s;
animation-name: slidein;
margin: 20px 0px;
margin: 10px 0px;
}
.transition p{
margin:2px;
/* height: 100%; */
margin: 12px 2px 2px 2px;
}
.transition::before{
.transition.no_arrow{
padding: 0;
text-align: center;
}
.transition:not(.no_arrow)::before{
content:'⇩'; /*'⇓';*/
display:block;
position:absolute;
font-family:'monospace';
font-size: 80px;
top:10px;
left:calc(50% - 30px);
left:calc(50% - 24px);
line-height:0;
}
@ -107,7 +114,7 @@ html, body{
/* max-height: 200px; */
margin: 2px;
border:solid 2px black;
padding: 4px;
padding: 12px;
}
.state h2{
@ -131,7 +138,7 @@ html, body{
.state .descriptor{
font-family: 'freesans';
font-size: var(--base-font-size);
margin-top: var(--base-font-size);
margin-top: calc(var(--base-font-size)/2);
}
.state.assignment-hidden {
@ -202,8 +209,10 @@ html, body{
.columns .column{
flex-grow: 1;
width: 50%;
}
.scan img{
vertical-align:bottom;
}