From 55dab2cdba6afea296bad3c2e153359bc112c762 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 30 Jul 2018 22:12:09 -0400
Subject: [PATCH] move updated and password history to box footer

---
 jslib                               |  2 +-
 src/popup/scss/misc.scss            |  4 ++++
 src/popup/vault/view.component.html | 30 +++++++++++++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jslib b/jslib
index cfa4664b318..13769a7fcba 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit cfa4664b3182840ec3f8dac6da8e8562d11468d3
+Subproject commit 13769a7fcba0d6ba67519b78e590019573776993
diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index b3defe115c6..94112f5c381 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -50,6 +50,10 @@ small, .small {
     text-align: center;
 }
 
+.font-weight-semibold {
+    font-weight: 600;
+}
+
 p.lead {
     font-size: $font-size-large;
     margin-bottom: 20px;
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index e512938f3b2..d164dd26c2b 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -256,25 +256,21 @@
         </div>
     </div>
     <div class="box">
-        <div class="box-header">
-            {{'other' | i18n}}
-        </div>
-        <div class="box-content">
-            <div class="box-content-row">
-                <span class="row-label">{{'dateUpdated' | i18n}}</span>
+        <div class="box-footer">
+            <div>
+                <b class="font-weight-semibold">{{'dateUpdated' | i18n}}:</b>
                 {{cipher.revisionDate | date:'medium'}}
             </div>
-            <div class="box-content-row box-content-row-flex" *ngIf="cipher.passwordRevisionDisplayDate">
-                <div class="row-main">
-                    <span class="row-label">{{'datePasswordUpdated' | i18n}}</span>
-                    {{cipher.passwordRevisionDisplayDate | date:'medium'}}
-                </div>
-                <div class="action-buttons" *ngIf="cipher.hasPasswordHistory">
-                    <a class="row-btn" routerLink="/cipher-password-history" [queryParams]="{cipherId: cipher.id}"
-                       appStopClick title="{{'passwordHistory' | i18n}}">
-                        <i class="fa fa-lg fa-clock-o"></i>
-                    </a>
-                </div>
+            <div *ngIf="cipher.passwordRevisionDisplayDate">
+                <b class="font-weight-semibold">{{'datePasswordUpdated' | i18n}}:</b>
+                {{cipher.passwordRevisionDisplayDate | date:'medium'}}
+            </div>
+            <div *ngIf="cipher.hasPasswordHistory">
+                <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b> 
+                <a routerLink="/cipher-password-history" [queryParams]="{cipherId: cipher.id}"
+                   appStopClick title="{{'passwordHistory' | i18n}}" class="text-muted">
+                    {{cipher.passwordHistory.length}}
+                </a>
             </div>
         </div>
     </div>