Skip to content

Commit

Permalink
feat(evolutions): base for evolutions
Browse files Browse the repository at this point in the history
  • Loading branch information
Ami Wang authored and Robin Joseph committed Apr 11, 2016
1 parent 8b65bc1 commit 05bad11
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 4 deletions.
87 changes: 84 additions & 3 deletions app/styles/tracker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ info {
@include flex-direction(column);

width: 350px;
color: #fff;
}

.info-header {
Expand All @@ -61,7 +62,6 @@ info {
min-height: 76px;
padding: 17px 17px 17px 8px;
border-bottom: 2px solid $brand-secondary-dark;
color: #fff;

img {
margin-right: 3px;
Expand All @@ -83,12 +83,12 @@ info {
}
}

.info-body {
.info-locations {
@include flex-grow(1);
@include overflow-y-scroll;

padding: 30px;
color: #fff;
border-bottom: 2px solid $brand-secondary-dark;

h3 {
margin: 0;
Expand All @@ -111,6 +111,87 @@ info {
}
}

.info-evolutions {
@include flexbox();
@include justify-content(center);

padding: 30px 20px;
text-align: center;
font-size: 13px;

> div {
@include flexbox();
@include flex-direction(column);
@include justify-content(space-around);
}

.evolution-pokemon-column a {
padding: 0 5px;

&:hover {
cursor: pointer;
}
}

.evolution-trigger-column {
@include flex-grow(1);

max-width: 80px;

.evolution-trigger {
@include flexbox();
@include flex-direction(column);
@include justify-content(center);

margin: 10px 0;

> .fa {
margin-bottom: 4px;
}

.tooltip {
display: inline-block;
position: relative;
margin-left: 3px;

.fa-plus-circle {
font-size: 11px;
}

.tooltip-text {
visibility: hidden;
position: absolute;
bottom: 150%;
left: 50%;
margin-left: -($tooltip-width / 2);
z-index: 1;
width: $tooltip-width;
padding: 5px;
border-radius: 5px;
background-color: #fff;
color: black;
text-align: center;

&::after {
content: "";
position: absolute;
top: 100%;
left: 50%;
margin-left: -5px;
border-width: 5px;
border-style: solid;
border-color: #fff transparent transparent transparent;
}
}

&:hover .tooltip-text {
visibility: visible;
}
}
}
}
}

.info-footer {
@include transition(all .1s ease-out);

Expand Down
1 change: 1 addition & 0 deletions app/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ $gray-light: #f1f1f1;
$gray-medium: #d2d2d2;

$pokemon-box-size: 110px;
$tooltip-width: 120px;
37 changes: 36 additions & 1 deletion app/views/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1 [innerHTML]="active.pokemon.name"></h1>
<h2>#{{active.pokemon.national_id | number : '3.0'}}</h2>
</div>

<div class="info-body">
<div class="info-locations">
<h3>Pokémon Omega Ruby</h3>
<ul>
<li *ngFor="#loc of active.pokemon.or_locations">{{loc}}</li>
Expand All @@ -28,6 +28,41 @@ <h3>Pokémon Y</h3>
</ul>
</div>

<div class="info-evolutions">
<div class="evolution-pokemon-column">
<a><img src="http://cdn.bulbagarden.net/upload/e/ec/001MS.png"></a>
<div *ngIf="">Does not evolve</div>
</div>
<div class="evolution-trigger-column">
<div class="evolution-trigger">
<i class="fa fa-long-arrow-right"></i>
<div>Level Up to 7 (random based on personality value)</div>
</div>
</div>
<div class="evolution-pokemon-column">
<a><img src="http://cdn.bulbagarden.net/upload/6/6b/002MS.png"></a>
</div>
<div class="evolution-trigger-column">
<div class="evolution-trigger">
<i class="fa fa-long-arrow-right"></i>
<div>
Level Up
<div class="tooltip">
<i class="fa fa-plus-circle"></i>
<span class="tooltip-text">with 2 affection hearts on pokémon-amie and knowing a fairy-type move</span>
</div>
</div>
</div>
<div class="evolution-trigger">
<i class="fa fa-long-arrow-right"></i>
<div>Level Up to 10</div>
</div>
</div>
<div class="evolution-pokemon-column">
<a><img src="http://cdn.bulbagarden.net/upload/d/df/003MS.png"></a><a><img src="http://cdn.bulbagarden.net/upload/6/6b/002MS.png"></a>
</div>
</div>

<a class="info-footer" [href]="active.pokemon.bulbapedia_url" target="_blank">
<div>View on Bulbapedia <i class="fa fa-long-arrow-right"></i></div>
<i class="fa fa-external-link"></i>
Expand Down

0 comments on commit 05bad11

Please sign in to comment.