Commit 48af7b16 authored by 神楽坂玲奈's avatar 神楽坂玲奈

格式化

parent 6e316b31
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-origin: content-box; background-origin: content-box;
background-position:right top; background-position: right top;
background-size: 48px; background-size: 48px;
} }
div{ div {
box-sizing:content-box; box-sizing: content-box;
} }
.panel-my{ .panel-my {
border: 1px solid #eceeef; border: 1px solid #eceeef;
border-radius: 6px; border-radius: 6px;
background: rgba(255, 255, 255, .7); background: rgba(255, 255, 255, .7);
...@@ -47,6 +47,6 @@ div{ ...@@ -47,6 +47,6 @@ div{
position: relative; position: relative;
} }
.clear{ .clear {
clear: both; clear: both;
} }
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
<div class="panel-footer"> <div class="panel-footer">
<div class="achievement-border" *ngFor="let ac of acLocks" [title]="getTitle(ac)"> <div class="achievement-border" *ngFor="let ac of acLocks" [title]="getTitle(ac)">
<div class="achievement ac-progress" [style.background-image]="'url('+ac.image+')'"> <div class="achievement ac-progress" [style.background-image]="'url('+ac.image+')'">
<div class="gray" [style.background-image]="'url('+ac.image+')'" <div class="gray" [style.background-image]="'url('+ac.image+')'" [style.width]="ac.progress_max ? 100-ac.progress_value/ac.progress_max*100+'%':'100%' "></div>
[style.width]="ac.progress_max ? 100-ac.progress_value/ac.progress_max*100+'%':'100%' "></div>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
......
/** /**
* Created by zh99998 on 16/9/2. * Created by zh99998 on 16/9/2.
*/ */
import {Component, Input, OnChanges, SimpleChanges} from '@angular/core'; import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import {Achievement, Cube} from '../cube'; import { Achievement, Cube } from '../cube';
@Component({ @Component({
...@@ -26,7 +26,7 @@ export class CubeAchievementsComponent implements OnChanges { ...@@ -26,7 +26,7 @@ export class CubeAchievementsComponent implements OnChanges {
this.acLocks = []; this.acLocks = [];
this.acUnlocks = []; this.acUnlocks = [];
console.log(this.currentCube) console.log(this.currentCube);
console.log(Cube); console.log(Cube);
for (let ac of this.currentCube.achievements) { for (let ac of this.currentCube.achievements) {
let title = ac.name + '\n' + ac.description + '\n' + (ac.progress_max ? ac.progress_value + '' + let title = ac.name + '\n' + ac.description + '\n' + (ac.progress_max ? ac.progress_value + '' +
......
...@@ -384,7 +384,7 @@ export class CubeLocal { ...@@ -384,7 +384,7 @@ export class CubeLocal {
for (let [k, v] of Object.entries(this.files)) { for (let [k, v] of Object.entries(this.files)) {
t[k] = v; t[k] = v;
} }
return {path: this.path, version: this.version, files: t}; return { path: this.path, version: this.version, files: t };
} }
} }
......
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