From a0d12e091ad0ae5e90c9088a7333b571c3732ffb Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 12 Jul 2014 12:52:39 +0200 Subject: [PATCH] Revert "Add summary placeholder chars experiment." This reverts commit c254534cb40d88ebf18a13806b972ec95cf7a04a. Conflicts: app/styles/layout/base.scss --- app/partials/views/components/summary.jade | 15 +++++---------- app/styles/layout/base.scss | 6 ------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/app/partials/views/components/summary.jade b/app/partials/views/components/summary.jade index 4abc5b98..7283a2f0 100644 --- a/app/partials/views/components/summary.jade +++ b/app/partials/views/components/summary.jade @@ -2,22 +2,17 @@ div.summary div.summary-progress-bar div.current-progress div.data - span.number(tg-bind-html="stats.completedPercentage") - span.placeholderx ͿͿ% + span.number(ng-bind="stats.completedPercentage") ul li - span.number(tg-bind-html="stats.total_points") - span.placeholderx ͿͿͿ + span.number(ng-bind="stats.total_points|default:'--'") span.description project
points li - span.number(tg-bind-html="stats.defined_points") - span.placeholderx ͿͿͿ + span.number(ng-bind="stats.defined_points|default:'--'") span.description defined
points li - span.number(tg-bind-html="stats.assigned_points") - span.placeholderx ͿͿͿ + span.number(ng-bind="stats.assigned_points|default:'--'") span.description assigned
points li - span.number(tg-bind-html="stats.closed_points") - span.placeholderx ͿͿ % + span.number(ng-bind="stats.closed_points|default:'-- %'") span.description closed
points diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 84c1fc38..ad2b6d64 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -89,9 +89,3 @@ body { .hidden { display: none; } - -//TODO If no reverted do refactor. Font-size should extend from previous font sizes in dependencies/typography.scss -.placeholder { - color: #888; - font-size: 28px; -}