Merge pull request #1600 from bechi/temp3

Fixes UI details

css/src/main.css

@@ -159,7 +159,7 @@ header .alt-currency {
   display: block;
   height: 62px;
   width: 140px;
-  padding: 22px 5px;
+  padding: 12px 5px;
   text-align: center;
 }
 
@@ -246,7 +246,8 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
 .side-nav.wallets .avatar-wallet{
   background-color: #7A8C9E;
   color: #213140;
-  padding: 0.35rem 0.7rem;
+  padding: 0.35rem 0.5rem;
+  text-align: center;
   margin-top: 6px;
   width: 35px;
 }
@@ -257,11 +258,12 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
   margin-top: 10px;
   margin-left: 10px;
   margin-right: 8px;
-  padding: 0.5rem 0.8rem;
+  padding: 0.5rem 0.65rem;
   background-color: #fff;
   color: #1ABC9C;
   border-radius: 3px;
   line-height: 24px;
+  text-align: center;
 }
 
 .status {
@@ -329,13 +331,13 @@ a:hover {
 
 .main {
   margin-left: 250px;
-  padding: 80px 1.5rem;
+  padding: 100px 2.5rem;
   background-color: #F8F8FB;
 }
 
 .logo-setup {
   text-align: center;
-  padding: 2rem 0;
+  padding: 7rem 0 5rem;
   color: #fff;
 }
 
@@ -950,6 +952,9 @@ button.warning,
 .button.warning { 
   background-color: #C0392A;
   color: #fff;
+  border-radius: 2px;
+  -moz-box-shadow:    1px 1px 0px 0px #A02F23;
+  box-shadow:         1px 1px 0px 0px #A02F23;
 }
 button.warning:hover, 
 button.warning:focus, 
@@ -1091,11 +1096,26 @@ button.gray:focus,
 .side-nav li.nav-item:hover {
   background-color: #3C4E60;
   overflow: hidden;
-  border-radius: 3px;
 }
 
+.photo-container {
+  margin-right: 10px;
+  padding-top: 0.4rem;
+  display: inline-block;
+  width: 35px;
+  height: 35px;
+  color: #fff;
+  background: #7A8C9E;
+  border-radius: 100%;
+  vertical-align: middle;
+}
 
-.side-nav {padding: 0;}
+a:hover .photo-container  {
+  background: #34495E;
+  color: #fff;
+}
+
+.side-nav {padding-top: 38px;}
 
 .side-nav li {
   font-size: 16px;
@@ -1111,6 +1131,7 @@ button.gray:focus,
 
 .side-nav li>a:first-child:not(.button), .side-nav li a:not(.button) {
   color: #fff;
+  padding-left: 40px;
 }
 
 .side-nav li>a:first-child:not(.button) i {

css/src/mobile.css

@@ -19,6 +19,7 @@
 
   .logo-setup {
     margin: 20px 0;
+    padding: 2rem 0;
   }
 
   .home, .open, .join, .waiting-copayers, .setup, .import, .settings {
@@ -39,7 +40,7 @@
     margin-left: 0;
     margin-bottom: -40px;
     padding-bottom: 60px;
-    padding-top: 20px;
+    padding: 20px 1.2rem;
   }
 
   .tab-bar {

views/addresses.html

@@ -49,13 +49,13 @@
       </div>
     </div>
 
-    <a class="secondary radius" ng-click="toggleShowAll()" ng-show="addrLength > 3">
+    <a class="secondary radius size-12 right" ng-click="toggleShowAll()" ng-show="addrLength > 3">
       <span translate ng-if="!showAll">Show all</span>
       <span translate ng-if="showAll">Show less</span>
     </a>
 
-    <div class="m20t">
-      <a ng-click="newAddr()" ng-disabled="loading">Add <i class="fi-plus"></i></span>
+    <div class="m10t">
+      <a class="button tiny primary text-center" ng-click="newAddr()" ng-disabled="loading"><i class="fi-plus m5r"></i> Add </a>
     </div>
   </div>
 </div>

views/includes/head.html

@@ -4,7 +4,11 @@
 
 <div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()"
   ng-click="hoverMenu = !hoverMenu">
-  <a class="dropdown ellipsis text-gray" ng-class="{'hover': hoverMenu}">{{username}} <i class="icon-arrow-down2 size-16 vm"></i> </a>
+  <a class="dropdown ellipsis text-gray" ng-class="{'hover': hoverMenu}">
+    <span class="photo-container"><i class="fi-torso size-18"></i></span>
+    <span class="m15t">{{username}} </span>
+    <i class="icon-arrow-down2 size-16 vm"></i> 
+  </a>
   <ul ng-show="hoverMenu" ng-class="{'hover': hoverMenu}">
     <li>
       <a href="#!/manage" title="Manage wallets">

views/modals/address-book.html

@@ -1,5 +1,5 @@
 <h2 translate>Address Book</h2>
-<form name="addressBookForm" ng-submit="submitAddressBook(addressBookForm)" novalidate>
+<form class="m0" name="addressBookForm" ng-submit="submitAddressBook(addressBookForm)" novalidate>
   <label for="newaddress"><span translate>Address</span>
     <small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">Required</small>
     <small translate class="is-valid" ng-show="!addressBookForm.newaddress.$invalid && newaddress">Valid</small>
@@ -12,8 +12,8 @@
     <input type="text" id="newlabel" name="newlabel" ng-disabled="loading"
     placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
   </label>
-  <a translate class="button warning small default" ng-click="cancel()">Cancel</a>
-  <input type="submit" class="button small primary right"
+  <a translate class="m0 button warning small default" ng-click="cancel()">Cancel</a>
+  <input type="submit" class="m0 button small primary right"
   ng-disabled="addressBookForm.$invalid || loading" 
   value="{{'Add'|translate}}">
 </form>

views/send.html

@@ -184,7 +184,8 @@
       </div>
     </div>
 
-    <div class="large-12 columns line-dashed">
+    <div class="line-dashed-h m20b"></div>
+    <div class="large-12 columns">
       <h2 translate>Address Book</h2>
       <p translate class="text-gray m15b" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
       <table class="large-12 medium-12 small-12" ng-show="showAddressBook()">
@@ -210,7 +211,7 @@
         </tr>
         </tbody>
       </table>
-      <button translate class="button tiny primary text-center" ng-click="openAddressBookModal()">Add</button>
+      <button translate class="button tiny primary text-center" ng-click="openAddressBookModal()"><i class="fi-plus m5r"></i>Add</button>
     </div>
   </div>
 </div>