Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
zh99998 committed Nov 29, 2016
1 parent 4f75bf9 commit 033e49f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
3 changes: 2 additions & 1 deletion app/app-detail.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
padding: 1rem;
}

.main {
.actions {
margin-bottom: 1rem;
}

.list-group {
width: 20rem;
}
Expand Down
6 changes: 3 additions & 3 deletions app/app-detail.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ <h1>{{currentApp.name}}</h1>
<div i18n *ngIf="currentApp.status.status === 'installing'">正在安装...</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>
<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() && 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 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">
<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>
Expand All @@ -24,7 +24,7 @@ <h6 i18n class="dropdown-header">选择服务器</h6>
</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>
<div id="news" *ngFor="let item of news">
<h3>{{item.title}}</h3>
Expand Down
4 changes: 4 additions & 0 deletions app/lobby.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,8 @@ a {

span {
margin-left: 8px;
}

.actions {
margin-bottom: 1em;
}
4 changes: 4 additions & 0 deletions app/ygopro.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,8 @@

.float-left {
float: left;
}

.actions {
margin-bottom: 1em;
}
4 changes: 2 additions & 2 deletions app/ygopro.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form class="form-inline">
<form class="form-inline actions">
<div class="form-group">
<label for="exampleSelect1">卡组</label>
<select class="form-control" id="exampleSelect1" name="deck" [(ngModel)]="current_deck">
Expand All @@ -10,7 +10,7 @@
<button type="submit" (click)="refresh()" class="btn btn-secondary">刷新</button>
</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)="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>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mycard",
"version": "3.0.0-dev.9",
"version": "3.0.0-dev.10",
"description": "mycard",
"keywords": [],
"author": "zh99998 <[email protected]>",
Expand Down

0 comments on commit 033e49f

Please sign in to comment.