Skip to content

Commit

Permalink
feat: remove unused layout
Browse files Browse the repository at this point in the history
  • Loading branch information
phodal committed Mar 10, 2020
1 parent ca59fb9 commit c00b296
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 56 deletions.
2 changes: 1 addition & 1 deletion src/app/features/atom/atom.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(mouseenter)="debounceMouseEnter()"
(mouseleave)="debounceMouseLeave()"
>
<p class="category">{{data.phase}}</p>
<p class="category">{{ data.phase }}</p>
<p class="atomic">{{ data.number }}</p>
<p
class="symbol"
Expand Down
6 changes: 4 additions & 2 deletions src/app/features/atom/atom.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@import '../../variables';

:host {
border: 2px solid $border-color;
//border: 2px solid $border-color;
padding: 2px;
}

$selected-color: #fff;
Expand All @@ -10,8 +11,9 @@ $selected-color: #fff;
display: flex;
flex-direction: column;
cursor: pointer;
height: 100%;
padding-left: 3px;
width: 64px;
height: 64px;

p {
margin: 0;
Expand Down
77 changes: 25 additions & 52 deletions src/app/features/periodic-table/periodic-table.component.html
Original file line number Diff line number Diff line change
@@ -1,45 +1,18 @@
<div class="periodic-container">
<div class="periodic-grid">
<div class="periodic-col-num">&nbsp;</div>
<div
class="periodic-col-num"
*ngFor="let o of colHeader"
(mouseenter)="updateColHeaderSelected(o.index, true)"
(mouseleave)="updateColHeaderSelected(o.index, false)"
[class.selected]="o.selected"
>
<span class="index">{{ o.index }}</span> <span class="description">{{ o.description }}</span>
</div>

<div
*ngFor="let o of rowHeader"
class="periodic-row-num {{ o.className }}"
(mouseenter)="updateRowHeaderSelected(o.index, true)"
(mouseleave)="updateRowHeaderSelected(o.index, false)"
[class.selected]="o.selected"
>
<span class="index">{{ o.index }}</span>
</div>

<app-atom-details
class="atom-details"
[class.show]="currentAtom !== null"
[data]="currentAtom"
></app-atom-details>

<div class="phase-row-1 col-1">
<app-phase
[type]="'solid'"
[selected]="selectedPhase === 'solid'"
[symbol]="'C'"
(enter)="enterPhase($event)"
[type]="'solid'"
[selected]="selectedPhase === 'solid'"
[symbol]="'C'"
(enter)="enterPhase($event)"
></app-phase>
<app-phase
class="gap"
[type]="'liquid'"
[selected]="selectedPhase === 'liquid'"
[symbol]="'Hg'"
(enter)="enterPhase($event)"
class="gap"
[type]="'liquid'"
[selected]="selectedPhase === 'liquid'"
[symbol]="'Hg'"
(enter)="enterPhase($event)"
></app-phase>
</div>
<div class="phase-row-1 col-2">
Expand All @@ -48,17 +21,17 @@
</div>
<div class="phase-row-2 col-1">
<app-phase
[type]="'gas'"
[selected]="selectedPhase === 'gas'"
[symbol]="'H'"
(enter)="enterPhase($event)"
[type]="'gas'"
[selected]="selectedPhase === 'gas'"
[symbol]="'H'"
(enter)="enterPhase($event)"
></app-phase>
<app-phase
class="gap"
[type]="'unknown'"
[selected]="selectedPhase === 'unknown'"
[symbol]="'Rf'"
(enter)="enterPhase($event)"
class="gap"
[type]="'unknown'"
[selected]="selectedPhase === 'unknown'"
[symbol]="'Rf'"
(enter)="enterPhase($event)"
></app-phase>
</div>
<div class="phase-row-2 col-2">
Expand All @@ -68,13 +41,13 @@

<ng-container *ngIf="(atoms$ | async) as atoms">
<app-atom
*ngFor="let atom of atoms"
class="periodic-atom-{{ atom.number }}"
[data]="atom"
[selectedPhase]="selectedPhase"
[metalSelected]="metalClass"
(hoverAtom)="showAtomDetails($event)"
(click)="open(atom.name)"
*ngFor="let atom of atoms"
class="periodic-atom-{{ atom.number }}"
[data]="atom"
[selectedPhase]="selectedPhase"
[metalSelected]="metalClass"
(hoverAtom)="showAtomDetails($event)"
(click)="open(atom.name)"
></app-atom>
</ng-container>
<app-atom class="description" [data]="description"></app-atom>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@import '../../variables';

$square: 60px;
$square: 64px;
$heading-color: #000088;
$grid-gap: 4px;
$selected-color: #fff;
Expand Down

0 comments on commit c00b296

Please sign in to comment.