Merge pull request #2523 from bechi/layout-details-01

fix some details

public/views/history.html

@@ -18,7 +18,7 @@
   <div ng-show="index.txHistory[0]" class="scroll">
     <div ng-repeat="btx in index.txHistory" 
       ng-click="history.openTxModal(btx)" 
-      class="row last-transactions-content">
+      class="row collapse last-transactions-content">
       <div class="large-3 medium-3 small-3 columns">
         <span class="label tu" ng-show="btx.action == 'received'" 
           ng-style="{'background-color':index.backgroundColor}">Received</span>
@@ -27,7 +27,7 @@
       </div>
 
       <div class="large-5 medium-5 small-5 columns">
-        <span class="size-18">
+        <span class="size-16">
           <span ng-if="btx.action == 'received'">+</span>
           <span ng-if="btx.action == 'sent'">-</span>
           {{btx.amountStr}}

public/views/send.html

@@ -137,15 +137,16 @@
 
 
           <div class="row" ng-show="!send.onGoingProcess">
+            <div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
+              <a ng-click="send.resetForm(sendForm)" class="button expand outline dark-gray" translate>Cancel</a>
+            </div>
             <div class="columns" ng-class="{'small-6 medium-6 large-6':(send._paypro || send.lockAddress)}">
               <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx" 
                 ng-style="{'background-color':index.backgroundColor}"  translate>
                 Send
               </button>
             </div>
-            <div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
+            
-              <a ng-click="send.resetForm(sendForm)" class="button expand warning" translate>Cancel</a>
-            </div>
           </div>
       </form>
     </div>

src/css/main.css

@@ -468,8 +468,9 @@ input[type=number]::-webkit-outer-spin-button {
 .label.gray {background-color: #4B6178;}
 
 .history .label  {
-  width: 69px;
+  width: 57px;
   text-align: center;
+  font-size: 65%;
 }
 
 .bg-alert {
@@ -639,14 +640,6 @@ button.secondary:focus,
   border-radius: 3px;
 }
 
-button.disabled.secondary, 
-button[disabled].secondary, 
-.button.disabled.secondary, 
-.button[disabled].secondary {
-  background-color: #E4E8EC;
-  color: #A5B2BF;
-}
-
 /* PRIMARY */
 button.primary, 
 button.primary:hover, 
@@ -659,14 +652,6 @@ button.primary:focus,
   border-radius: 3px;
 }
 
-button.disabled.primary, 
-button[disabled].primary, 
-.button.disabled.primary, 
-.button[disabled].primary {
-  background-color: #95a5a6;
-  color: #E6E6E6;
-}
-
 /* WARNING */
 button.warning, 
 .button.warning,
@@ -679,14 +664,6 @@ button.warning:focus,
   border-radius: 3px;
 }
 
-button.disabled.warning, 
-button[disabled].warning, 
-.button.disabled.warning, 
-.button[disabled].warning {
-  background-color: #95a5a6;
-  color: #E6E6E6;
-}
-
 /* WHITE */
 button.white, 
 .button.white { 
@@ -694,14 +671,6 @@ button.white,
   color: #2C3E50;
 }
 
-button.disabled.white, 
-button[disabled].white, 
-.button.disabled.white, 
-.button[disabled].white {
-  background-color: #95a5a6;
-  color: #E6E6E6;
-}
-
 /* BLACK */
 button.black, 
 .button.black { 
@@ -709,14 +678,6 @@ button.black,
   color: #fff;
 }
 
-button.disabled.black, 
-button[disabled].black, 
-.button.disabled.black, 
-.button[disabled].black {
-  background-color: #95a5a6;
-  color: #E6E6E6;
-}
-
 /* GRAY */
 button.gray, 
 .button.gray { 
@@ -724,6 +685,31 @@ button.gray,
   color: #2C3E50;
 }
 
+button.disabled.black, 
+button[disabled].black, 
+.button.disabled.black, 
+.button[disabled].black,
+button.disabled.white, 
+button[disabled].white, 
+.button.disabled.white, 
+.button[disabled].white,
+button.disabled.warning, 
+button[disabled].warning, 
+.button.disabled.warning, 
+.button[disabled].warning,
+button.disabled.primary, 
+button[disabled].primary, 
+.button.disabled.primary, 
+.button[disabled].primary,
+button.disabled.secondary, 
+button[disabled].secondary, 
+.button.disabled.secondary, 
+.button[disabled].secondary {
+  background-color: #A5B2BF !important;
+  color: #fff;
+}
+
+
 .button, button {
   text-transform: uppercase;
 }
@@ -881,7 +867,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 .text-primary {color: #1ABC9C;}
 .text-secondary {color: #3498DB;}
 .text-white {color: #fff;}
-.text-warning {color: #CA5649;}
+.text-warning {color: #ED4A43;}
 .text-success {color: #1ABC9C;}
 
 .panel {

src/css/mobile.css

@@ -1,3 +1,4 @@
+
 /*
  *
  * Copay mobile CSS
@@ -616,7 +617,7 @@ a.pin-button:active {
 
 .popup-txrejected i {
   font-size: 5rem;
-  background-color: #CA5649;
+  background-color: #ED4A43;
   color: #fff;
   border-radius: 100%;
   width: 150px;

src/js/controllers/preferencesColor.js

@@ -4,12 +4,14 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
   function($scope, configService, profileService, go) {
     var config = configService.getSync();
     this.colorOpts = [
-      '#1ABC9C',
+      '#F38F12',
+      '#F4D03F',
       '#4A90E2',
-      '#F39C12',
+      '#484ED3',
-      '#FF3366',
       '#9B59B6',
-      '#213140',
+      '#E856EF',
+      '#F883B4',
+      '#2C3E50',
     ];
 
     var fc = profileService.focusedClient;