From 7451aa0e8ff385805d2656fee459a5dba6ccf018 Mon Sep 17 00:00:00 2001
From: Marty Alcala <marty@bitpay.com>
Date: Tue, 11 Oct 2016 19:00:16 -0400
Subject: [PATCH] add rejected styling

---
 src/sass/views/includes/txp-details.scss |  8 ++++
 www/views/modals/txp-details.html        | 51 +++++++-----------------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss
index 44d2a9964..09efe3946 100644
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@@ -184,6 +184,14 @@
           font-weight: 600;
           vertical-align: middle;
           color: #09C286;
+
+          &.rejected {
+            background: #E15061;
+            border-color: #E15061;
+            color: #FFFFFF;
+            font-family: "Roboto-Bold";
+            font-size: 19px;
+          }
         }
       }
 
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html
index 080519a96..36bf32cef 100644
--- a/www/views/modals/txp-details.html
+++ b/www/views/modals/txp-details.html
@@ -84,7 +84,7 @@
         <div class="item single-line">
           <span class="label" translate>Created by</span>
           <span class="item-note">
-            {{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
+            {{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
           </span>
         </div>
         <div class="item" ng-show="tx.message">
@@ -131,45 +131,22 @@
         </div>
         <div ng-if="actionList[0]">
           <div class="item item-divider" translate>Timeline</div>
-
-          <div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index">
-            <!-- <div class="row">
-              <div class="col col-10 timeline-icon">
-                <div>{{$index + 1}}</div>
+          <div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' track by $index">
+            <div class="timeline-content">
+              <div class="timeline-content__icon">
+                <div class="rejected" ng-if="a.type === 'reject'">!</div>
+                <div ng-if="a.type !== 'reject'">{{$index + 1}}</div>
               </div>
-              <div class="col timeline-content">
-                <div class="timeline-content__label">
-                  <div class="action">{{a.description}}</div>
-                  <div class="name">{{a.by}}</div>
-                </div>
-                <div>
-                  <span class="item-note">
-                    <time>{{ a.time * 1000 | amDateFormat:'HH:mm a'}}</time>
-                  </span>
-                </div>
+              <div class="timeline-content__label">
+                <div class="action">{{a.description}}</div>
+                <div class="name">{{a.by}}</div>
               </div>
-            </div> -->
-
-            <!-- <div class="row">
-              <div class="col col-10 timeline-icon">
-                <div>{{$index + 1}}</div>
-              </div> -->
-              <div class="timeline-content">
-                <div class="timeline-content__icon">
-                  <div>{{$index + 1}}</div>
-                </div>
-                <div class="timeline-content__label">
-                  <div class="action">{{a.description}}</div>
-                  <div class="name">{{a.by}}</div>
-                </div>
-                <div>
-                  <span class="item-note">
-                    <time>{{ a.time * 1000 | amDateFormat:'HH:mm a'}}</time>
-                  </span>
-                </div>
+              <div>
+                <span class="item-note">
+                  <time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
+                </span>
               </div>
-            <!-- </div> -->
-
+            </div>
           </div>
         </div>
       </div>