From 033e49fc4ef3190773c26c875ef95e4d84ed6b1d Mon Sep 17 00:00:00 2001
From: zh99998 <zh99998@gmail.com>
Date: Tue, 29 Nov 2016 13:27:53 +0800
Subject: [PATCH] fix

---
 app/app-detail.component.css  | 3 ++-
 app/app-detail.component.html | 6 +++---
 app/lobby.component.css       | 4 ++++
 app/ygopro.component.css      | 4 ++++
 app/ygopro.component.html     | 4 ++--
 package.json                  | 2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/app-detail.component.css b/app/app-detail.component.css
index 27c3f219..f4c490f2 100644
--- a/app/app-detail.component.css
+++ b/app/app-detail.component.css
@@ -5,9 +5,10 @@
     padding: 1rem;
 }
 
-.main {
+.actions {
     margin-bottom: 1rem;
 }
+
 .list-group {
     width: 20rem;
 }
diff --git a/app/app-detail.component.html b/app/app-detail.component.html
index 4fa85360..505ced75 100644
--- a/app/app-detail.component.html
+++ b/app/app-detail.component.html
@@ -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>
@@ -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>
diff --git a/app/lobby.component.css b/app/lobby.component.css
index 76c75ceb..bbc1dc59 100644
--- a/app/lobby.component.css
+++ b/app/lobby.component.css
@@ -38,4 +38,8 @@ a {
 
 span {
     margin-left: 8px;
+}
+
+.actions {
+    margin-bottom: 1em;
 }
\ No newline at end of file
diff --git a/app/ygopro.component.css b/app/ygopro.component.css
index 4bdf01d5..f6940ec2 100644
--- a/app/ygopro.component.css
+++ b/app/ygopro.component.css
@@ -75,4 +75,8 @@
 
 .float-left {
     float: left;
+}
+
+.actions {
+    margin-bottom: 1em;
 }
\ No newline at end of file
diff --git a/app/ygopro.component.html b/app/ygopro.component.html
index 830c1dce..c4fe2592 100644
--- a/app/ygopro.component.html
+++ b/app/ygopro.component.html
@@ -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">
@@ -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>
diff --git a/package.json b/package.json
index 0a14d6a5..3280108f 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mycard",
-  "version": "3.0.0-dev.9",
+  "version": "3.0.0-dev.10",
   "description": "mycard",
   "keywords": [],
   "author": "zh99998 <zh99998@gmail.com>",