From ccd537751b488ae7c11f0a65844639e3d2095440 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 31 Jul 2014 15:46:20 -0300
Subject: [PATCH] fix icon-status

---
 css/main.css            | 36 ++++++++++++++++++++++++------------
 views/join.html         |  4 ++--
 views/transactions.html |  5 ++++-
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/css/main.css b/css/main.css
index 4d141325b..ff3c5f725 100644
--- a/css/main.css
+++ b/css/main.css
@@ -280,36 +280,35 @@ a:hover {
 }
 
 .last-transactions-content .box-status {
-  text-align: center;
-  font-size: 14px;
+  font-size: 13px;
+  width: 35px;
 }
 
 .last-transactions-content .box-copayer {
-  width: 60px;
+  width: 100px;
   margin-right: 20px;
   float: left;
   text-align: center;
 }
 
 .last-transactions-content .copayer-ico {
-  width: 30px;
-  height: 30px;
-}
-
-.last-transactions-content .box-copayer .icon-inactive {
-  color: #4C5B69;
+  width: 45px;
+  height: 45px;
+  border: 2px solid #7A8C9B;
 }
 
 .last-transactions-content .box-copayer .icon-active {
-  color: #ccc;
+  color: #fff;
 }
 
 .last-transactions-content .box-copayer .icon-active-check {
-  color: #3FBC9C;
+  background-color: #3FBC9C;
+  color: #fff;
 }
 
 .last-transactions-content .box-copayer .icon-active-x {
-  color: #C0392B;
+  background-color: #C0392B;
+  color: #fff;
 }
 
 .input-note {
@@ -944,6 +943,19 @@ button, .button, p {
   padding: 0.2rem 0.4rem;
 }
 
+.box-status {
+  float: right;
+}
+
+.icon-status { 
+  background-color: #34495E;
+  color: #7A8C9E;
+  border-radius: 100%;
+  padding: 0.17rem 0.3rem;
+  float: left;
+  margin-bottom: 0.2rem;
+}
+
 .has-error {
   color: #C0392A;
 }
diff --git a/views/join.html b/views/join.html
index 8a7d140c0..179d89f48 100644
--- a/views/join.html
+++ b/views/join.html
@@ -9,7 +9,7 @@
     </div>
     <div class="large-8 columns line-dashed-setup-v">
         <div class="box-setup">
-        <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
+          <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
           <form name="joinForm" ng-submit="join(joinForm)" novalidate>
             <label for="connectionId"> Wallet Setting </label>
             <input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;">
@@ -38,7 +38,7 @@
               </div>
             </div>
 
-            <label for="joinPassword"> User info</label>
+            <label for="joinPassword"> User info </label>
             <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
             <input type="password" class="form-control"
             placeholder="Choose your password" name="joinPassword"
diff --git a/views/transactions.html b/views/transactions.html
index a6626e288..a49bfbfc6 100644
--- a/views/transactions.html
+++ b/views/transactions.html
@@ -52,6 +52,9 @@
                 <a ng-if="action == 'seen'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
                   <i class="fi-eye icon-status icon-active"></i>
                 </a>
+                <a ng-if="action == 'asd'" href="#!/transactions" class="icon-status">
+                  <i class="fi-loop icon-rotate"></i>
+                </a>
                 <a ng-if="action == 'sign'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
                   <i class="fi-check icon-status icon-active-check"></i>
                 </a>
@@ -62,7 +65,7 @@
             </div>
 
             <div class="text-center">
-              <p class="size-12 text-gray">
+              <p class="size-12 text-gray ellipsis">
                 {{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}}
               </p>
             </div>