Commit 033e49fc authored by 神楽坂玲奈's avatar 神楽坂玲奈

fix

parent 4f75bf99
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
padding: 1rem; padding: 1rem;
} }
.main { .actions {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.list-group { .list-group {
width: 20rem; width: 20rem;
} }
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<div i18n *ngIf="currentApp.status.status === 'installing'">正在安装...</div> <div i18n *ngIf="currentApp.status.status === 'installing'">正在安装...</div>
<div i18n *ngIf="currentApp.status.status==='waiting'">等待安装...</div> <div i18n *ngIf="currentApp.status.status==='waiting'">等待安装...</div>
<progress *ngIf="currentApp.status.status === 'downloading'" class="progress progress-striped progress-animated" value="{{currentApp.status.progress}}" max="{{currentApp.status.total}}"></progress> <progress *ngIf="currentApp.status.status === 'downloading'" class="progress progress-striped progress-animated" value="{{currentApp.status.progress}}" max="{{currentApp.status.total}}"></progress>
<div class="main" *ngIf="currentApp.status.status==='ready' && (currentApp.id != 'ygopro')"> <div class="actions" *ngIf="currentApp.status.status==='ready' && (currentApp.id != 'ygopro')">
<button i18n *ngIf="currentApp.runable()" (click)="runApp(currentApp)" type="button" class="btn btn-primary">运行</button> <button i18n *ngIf="currentApp.runable()" (click)="runApp(currentApp)" type="button" class="btn btn-primary">运行</button>
<button i18n *ngIf="currentApp.runable() && currentApp.actions.get('custom')" (click)="custom(currentApp)" type="button" class="btn btn-secondary">设置</button> <button i18n *ngIf="currentApp.runable() && currentApp.actions.get('custom')" (click)="custom(currentApp)" type="button" class="btn btn-secondary">设置</button>
<div id="network" *ngIf="currentApp.network && currentApp.network.protocol == 'maotama'"> <div id="network" *ngIf="currentApp.network && currentApp.network.protocol == 'maotama'">
<div class="input-group"> <div class="input-group">
<input *ngIf="appsService.connections.get(currentApp)" [value]="appsService.connections.get(currentApp).address || 'Loading...'" readonly type="text" class="form-control"> <input *ngIf="appsService.connections.get(currentApp)" [value]="appsService.connections.get(currentApp).address || 'Loading...'" readonly type="text" class="form-control" title="address">
<div class="input-group-btn"> <div class="input-group-btn">
<button i18n *ngIf="!appsService.connections.get(currentApp)" (click)="appsService.network(currentApp, currentApp.network.servers[0])" type="button" class="btn btn-secondary">联机</button> <button i18n *ngIf="!appsService.connections.get(currentApp)" (click)="appsService.network(currentApp, currentApp.network.servers[0])" type="button" class="btn btn-secondary">联机</button>
<button i18n *ngIf="appsService.connections.get(currentApp)" (click)="copy(appsService.connections.get(currentApp).address)" [disabled]="!appsService.connections.get(currentApp).address" type="button" class="btn btn-secondary">复制</button> <button i18n *ngIf="appsService.connections.get(currentApp)" (click)="copy(appsService.connections.get(currentApp).address)" [disabled]="!appsService.connections.get(currentApp).address" type="button" class="btn btn-secondary">复制</button>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
</div> </div>
</div> </div>
<ygopro class="main" *ngIf="currentApp.status.status==='ready'&& (currentApp.id == 'ygopro')" [app]="currentApp"></ygopro> <ygopro *ngIf="currentApp.status.status==='ready'&& (currentApp.id == 'ygopro')" [app]="currentApp"></ygopro>
<h2 i18n *ngIf="news && news.length">新闻</h2> <h2 i18n *ngIf="news && news.length">新闻</h2>
<div id="news" *ngFor="let item of news"> <div id="news" *ngFor="let item of news">
<h3>{{item.title}}</h3> <h3>{{item.title}}</h3>
......
...@@ -38,4 +38,8 @@ a { ...@@ -38,4 +38,8 @@ a {
span { span {
margin-left: 8px; margin-left: 8px;
}
.actions {
margin-bottom: 1em;
} }
\ No newline at end of file
...@@ -75,4 +75,8 @@ ...@@ -75,4 +75,8 @@
.float-left { .float-left {
float: left; float: left;
}
.actions {
margin-bottom: 1em;
} }
\ No newline at end of file
<form class="form-inline"> <form class="form-inline actions">
<div class="form-group"> <div class="form-group">
<label for="exampleSelect1">卡组</label> <label for="exampleSelect1">卡组</label>
<select class="form-control" id="exampleSelect1" name="deck" [(ngModel)]="current_deck"> <select class="form-control" id="exampleSelect1" name="deck" [(ngModel)]="current_deck">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<button type="submit" (click)="refresh()" class="btn btn-secondary">刷新</button> <button type="submit" (click)="refresh()" class="btn btn-secondary">刷新</button>
</form> </form>
<div> <div class="actions">
<button (click)="request_match('athletic')" *ngIf="matching_arena != 'athletic'" [disabled]="matching" type="button" class="btn btn-primary">竞技匹配</button> <button (click)="request_match('athletic')" *ngIf="matching_arena != 'athletic'" [disabled]="matching" type="button" class="btn btn-primary">竞技匹配</button>
<button (click)="cancel_match()" *ngIf="matching_arena == 'athletic'" type="button" class="btn btn-primary">取消等待</button> <button (click)="cancel_match()" *ngIf="matching_arena == 'athletic'" type="button" class="btn btn-primary">取消等待</button>
<button (click)="request_match('entertain')" *ngIf="matching_arena != 'entertain'" [disabled]="matching" type="button" class="btn btn-secondary">娱乐匹配</button> <button (click)="request_match('entertain')" *ngIf="matching_arena != 'entertain'" [disabled]="matching" type="button" class="btn btn-secondary">娱乐匹配</button>
......
{ {
"name": "mycard", "name": "mycard",
"version": "3.0.0-dev.9", "version": "3.0.0-dev.10",
"description": "mycard", "description": "mycard",
"keywords": [], "keywords": [],
"author": "zh99998 <zh99998@gmail.com>", "author": "zh99998 <zh99998@gmail.com>",
......
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