Skip to content

Commit

Permalink
fix(dashboard): Add ellipsis on brand overflow + k formatter on accuracy
Browse files Browse the repository at this point in the history
Fixes #67
  • Loading branch information
MathieuNls committed Nov 3, 2016
1 parent 2294afc commit 39e5740
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { MobileInput } from '../components/mobile-input/mobile-input';

import {
ArethmeticSign,
KFormatter,
LeadingZero,
TwAPIService,
GAService,
Expand All @@ -49,6 +50,7 @@ import { TranslateModule, TranslateStaticLoader, TranslateLoader } from 'ng2-tra
WatchPage,
TipsPage,
ArethmeticSign,
KFormatter,
LeadingZero,
ClockComponent,
MoonPhasesComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboard/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h3>{{ watch.name }}</h3>

<div id="accuracy">
<span *ngIf="watch.status !== WatchStatus.NeverMeasured && watch.lastCompleteMeasure() !== null">
{{ watch.lastCompleteMeasure().accuracy | arethmeticSign}}
{{ watch.lastCompleteMeasure().accuracy | arethmeticSign | kFormatter}}
<span id="spd">{{'spd-short' | translate }}
</span>
</span>
Expand Down
5 changes: 3 additions & 2 deletions src/pages/dashboard/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

#accuracy{
position:absolute;
width:30%;
max-width: 30%;
float:right;
color:#3B5B7F;
display:block;
Expand Down Expand Up @@ -117,16 +117,17 @@
}

h2{
width:68%;
font-size:1.2em;
color:#2a2a2c;
overflow: hidden;
text-overflow: ellipsis;

}

h3{
width:70%;
overflow: hidden;
text-overflow: ellipsis;

color:#b1b1b3;
}
Expand Down
2 changes: 1 addition & 1 deletion src/share
Submodule share updated from e3193c to c5c01a

0 comments on commit 39e5740

Please sign in to comment.