Commit c9f73573 authored by liujiaxin's avatar liujiaxin

Merge remote-tracking branch 'origin/master'

parents b7faee30 3bb75a7d
<div class="player-preview-sequence"> <div class="body-bg"></div>
<div class="content-wrap ">
<!-- aspectRatioSizer--> <div class="player-border">
<!-- <svg viewBox="0 0 4 3" style="max-width: 100vmin;max-height: 100vmin;"/>--> <div class="player-preview-sequence">
<!--[style.padding]="randPics.length > 2 && randPics.length <= 4 ? '12% 20% 0' : '15% 5% 0'"--> <div class="content-wrap ">
<div class="item-wrap" #boxContainer> <!-- aspectRatioSizer-->
<div *ngFor="let pic of randPics index as i" <!-- <svg viewBox="0 0 4 3" style="max-width: 100vmin;max-height: 100vmin;"/>-->
class="gutter-row item" <!--[style.padding]="randPics.length > 2 && randPics.length <= 4 ? '12% 20% 0' : '15% 5% 0'"-->
[attr.data-idx]="pic.idx" <div class="item-wrap" #boxContainer>
> <div *ngFor="let pic of randPics index as i"
<div class="item-box"> class="gutter-row item"
<img src="assets/sequence2/seq_item_bg.png" style="width: 100%;height: 100%" alt=""> [attr.data-idx]="pic.idx"
>
<div class="item-pic drop-target" <div class="item-box">
[attr.data-idx]="pic.idx" <img src="assets/sequence2/seq_item_bg.png" style="width: 100%;height: 100%" alt="">
[id]="'tgt'+i"
(click)="checkSelectedIndex($event, pic.idx)" <div class="item-pic drop-target"
[style.background-image]="pic.res_id | backgroundImage "> [attr.data-idx]="pic.idx"
[id]="'tgt'+i"
(click)="checkSelectedIndex($event, pic.idx)"
[style.background-image]="pic.res_id | backgroundImage ">
</div>
<div class="item-label {{'p-font-size-'+randPics.length}}" *ngIf="pic.isRight">{{pic.idx + 1}}</div>
</div> </div>
<div class="item-label {{'p-font-size-'+randPics.length}}" *ngIf="pic.isRight">{{pic.idx + 1}}</div>
</div> </div>
</div> </div>
</div>
<div class="seq-wrap" >
<div class="seq-wrap" > <img class="seq-wrap-bg" src="assets/sequence2/rectangle.png" style="width: 100%;height: 100%" alt="">
<img class="seq-wrap-bg" src="assets/sequence2/rectangle.png" style="width: 100%;height: 100%" alt=""> <div class="seq-num-box" #indexNumBox>
<div class="seq-num-box" #indexNumBox> <img
<img *ngFor="let i of _itemsArr"
*ngFor="let i of _itemsArr" src="assets/sequence2/{{i}}.png" alt="">
src="assets/sequence2/{{i}}.png" alt=""> </div>
</div> <div class="answer-wrap" >
<div class="answer-wrap" > <img class="btn-answer"
<img class="btn-answer" (click)="showRightAnswer()"
(click)="showRightAnswer()" src="assets/sequence2/answer.png" alt="">
src="assets/sequence2/answer.png" alt=""> </div>
</div> </div>
</div> </div>
<!--<div class="bubble-box" #bubbleContainer>-->
<!--<div *ngFor="let pic of randPics index as i"-->
<!--[id]="'bb'+i"-->
<!--[class]="'bubble b'+i+(randPics.length<5 ? ' less4item' : '')" >-->
<!--<div class="bdhandle">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div> </div>
<!--<div class="bubble-box" #bubbleContainer>--> </div>
<!--<div *ngFor="let pic of randPics index as i"-->
<!--[id]="'bb'+i"-->
<!--[class]="'bubble b'+i+(randPics.length<5 ? ' less4item' : '')" >-->
<!--<div class="bdhandle">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
.body-bg {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background-image: url('../../assets/player-bg.png') !important;
background-size: 100%;
}
.player-border{
position: absolute;
left: calc((100% - 100vh * 1.36)/ 2);
top: 5vh;
right: calc((100% - 100vh * 1.36)/ 2);
bottom: 5vh;
text-align: center;
// box-shadow: 0 2px 12px 0 rgba(0,0,0,.3);
border-radius: 11px;
border: 20px solid #23b1c2;
background-color: #fff;
overflow: hidden;
color: #303133;
transition: .3s;
}
.player-preview-sequence{ .player-preview-sequence{
width: 100%; width: 100%;
height: 100%; height: 100%;
......
Markdown is supported
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