Skip to content

Commit

Permalink
feat(box): base for mark whole box
Browse files Browse the repository at this point in the history
  • Loading branch information
Ami Wang committed Apr 12, 2016
1 parent 9d0d482 commit d6234c4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 7 deletions.
28 changes: 22 additions & 6 deletions app/styles/tracker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,28 @@ box {
margin: 60px auto 0;
width: 6 * $pokemon-box-size + 2;

h1 {
margin: 0 0 10px;
font-family: $font-secondary;
font-size: 25px;
font-weight: 700;
text-transform: uppercase;
.box-header {
@include flexbox();

margin-bottom: 10px;

h1 {
@include flex(1 0 auto);

margin: 0;
font-family: $font-secondary;
font-size: 25px;
font-weight: 700;
text-transform: uppercase;
}

button {
display: inline-block;
height: auto;
width: auto;
padding: 8px 12px;
font-size: 10px;
}
}

.box-container {
Expand Down
5 changes: 4 additions & 1 deletion app/views/box.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<h1>{{captures[0].pokemon.national_id | number : '3.0'}} - {{captures[captures.length - 1].pokemon.national_id | number : '3.0'}}</h1>
<div class="box-header">
<h1>{{captures[0].pokemon.national_id | number : '3.0'}} - {{captures[captures.length - 1].pokemon.national_id | number : '3.0'}}</h1>
<button>Mark All</button>
</div>
<div class="box-container">
<pokemon *ngFor="#capture of captures" (activeChange)="capture.pokemon.is(region) && activeChange.emit($event)" (collapsedChange)="capture.pokemon.is(region) && collapsedChange.emit($event)" [class.captured]="capture.captured" [class.disabled]="!capture.pokemon.is(region)" [class.viewing]="_session.user?.id !== user.id" [capture]="capture" [region]="region"></pokemon>
<pokemon *ngFor="#capture of empties" [capture]="capture" class="empty"></pokemon>
Expand Down

0 comments on commit d6234c4

Please sign in to comment.