Merge pull request #2736 from bechi/button-round

change buttons style

public/views/backup.html

@@ -29,23 +29,23 @@
         name="password" ng-model="backup.repeatpassword">
       </div>
 
-      <button class="black radius expand" ng-click="backup.downloadWalletBackup()" 
+      <button class="black round expand" ng-click="backup.downloadWalletBackup()"
         ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
         ng-style="{'background-color':index.backgroundColor}"
         ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
         <span translate>Download backup</span></button>
-      <button class="black radius expand" ng-click="backup.viewWalletBackup()"
+      <button class="black round expand" ng-click="backup.viewWalletBackup()"
         ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
         ng-style="{'background-color':index.backgroundColor}"
         ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
         <span translate>View backup</span></button>
       <div ng-show="backup.isCordova">
         <h4 translate>Backup options</h4>
-        <button class="black radius expand"  ng-disabled="(!backup.password || backup.password != backup.repeatpassword)" 
+        <button class="black round expand"  ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
           ng-style="{'background-color':index.backgroundColor}"
           ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
           <span translate>Copy to clipboard</span></button>
-        <button class="black radius expand"  ng-disabled="(!backup.password || backup.password != backup.repeatpassword)" 
+        <button class="black round expand"  ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
           ng-style="{'background-color':index.backgroundColor}"
           ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
           <span translate>Send by email</span></button>

public/views/create.html

@@ -89,7 +89,7 @@
         </div>
 
 
-        <button type="submit" class="button black expand radius m0" ng-disabled="setupForm.$invalid">
+        <button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid">
           <span translate>Create</span>
           {{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span>
         </button>

public/views/import.html

@@ -49,7 +49,7 @@
               <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
               name="password" ng-model="import.password">
             </div>
-            <button translate type="submit" class="button radius expand black" 
+            <button translate type="submit" class="button round expand black"
               ng-disabled="importForm.$invalid || !import.password">
               Import backup
             </button>
@@ -57,7 +57,7 @@
 
     <div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
       <p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
-      <button class=" outline dark-gray tiny" translate> Import here
+      <button class=" outline dark-gray tiny round" translate> Import here
         <i class="icon-arrow-right3 size-14"></i>
       </button>
 

public/views/importLegacy.html

@@ -50,7 +50,7 @@
           </label>
 
           <button translate type="submit"
-            class="button black radius expand m0" 
+            class="button black round expand m0"
             ng-disabled="deviceForm.$invalid">
             Import
           </button>
@@ -65,7 +65,7 @@
         </form>
 
     <div class="text-center p20v">
-      <a class="m20t  tiny button outline light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
+      <a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
          Learn more about Wallet Migration
       </a>
     </div>
@@ -76,4 +76,3 @@
 
     </div>
 </div>
-

public/views/includes/password.html

@@ -21,13 +21,13 @@
   </div>
   <div class="row">
     <div class="small-6 columns">
-      <button class="radius small-6 columns outline dark-gray expand"  ng-click="pass.close(index.askPassword.callback)" translate>
+      <button class="round small-6 columns outline dark-gray expand"  ng-click="pass.close(index.askPassword.callback)" translate>
         CANCEL
       </button>
     </div>
 
     <div class="small-6 columns">
-      <button class="radius expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password" 
+      <button class="round expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"
         ng-style="{'background-color':index.backgroundColor}">
         <span translate ng-if="index.askPassword.isSetup" translate>SET</span>
         <span translate ng-if="!index.askPassword.isSetup" translate>ENTER</span>

public/views/join.html

@@ -83,7 +83,7 @@
               </label>
             </div>
           </div>
-          <button translate type="submit" class="button expand black m0 radius" ng-disabled="joinForm.$invalid">Join</button>
+          <button translate type="submit" class="button expand black m0 round" ng-disabled="joinForm.$invalid">Join</button>
       </form>
     </div>
   </div>

public/views/modals/tx-details.html

@@ -82,7 +82,7 @@
 
   <div ng-show="btx.txid" class="tx-details-blockchain">
     <div class="text-center m20t">
-      <button class="button outline dark-gray tiny" ng-click="$root.openExternalLink('https://' +
+      <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' +
         (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
         <span class="text-gray" translate>See it on the blockchain</span>
       </button>

public/views/modals/tx-status.html

@@ -5,7 +5,7 @@
     <span translate>Payment Sent</span>
   </div>
   <div class="text-center">
-    <a class="button outline white small-5" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline round white tiny small-4" ng-click="cancel()" translate>OKAY</a>
   </div>
 </div>
 
@@ -15,7 +15,7 @@
     {{statusStr|translate}}
   </div>
   <div class="text-center">
-    <a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
   </div>
 </div>
 
@@ -25,6 +25,6 @@
     {{statusStr|translate}}
   </div>
   <div class="text-center">
-    <a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline light-gray round tiny small-4" ng-click="cancel()" translate>OKAY</a>
   </div>
 </div>

public/views/modals/txp-details.html

@@ -92,14 +92,14 @@
 
   <div class="row m20t" ng-if="tx.pendingForUs">
     <div class="large-5 medium-5 small-6 columns">
-      <button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
+      <button class="button outline round dark-gray m0 expand" ng-click="reject(tx);"
         ng-disabled="loading">
         <i class="fi-x"></i>
         <span translate>Reject</span>
       </button>
     </div>
     <div class="large-5 medium-5 small-6 columns text-right">
-      <button class="button primary m0 expand" ng-click="sign(tx)"
+      <button class="button primary round m0 expand" ng-click="sign(tx)"
         ng-style="{'background-color':color}"
         ng-disabled="loading">
         <i class="fi-check"></i>
@@ -116,7 +116,7 @@
     <div class="m10t"
       ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
       <div translate>But not broadcasted. Try to send manually</div>
-      <button class="primary"
+      <button class="primary round"
         ng-click="broadcast(tx)"
         ng-disabled="loading"> <i class="fi-upload-cloud"></i>
         <span translate>Broadcast Transaction</span>
@@ -136,7 +136,7 @@
     <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
       * Only transactions created by yourself with no peer signatures can be removed
     </div>
-    <button class="tiny expand outline dark-gray" ng-click="remove(tx)"
+    <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
       ng-disabled="loading" ng-show="tx.couldRemove">
       <i class="fi-trash size-14 m5r"></i>
       <span translate>Remove transaction</span>

public/views/preferencesAlias.html

@@ -10,7 +10,7 @@
   <form name="settingsAliasForm" ng-submit="prefAlias.save()" class="columns">
     <label>Alias for <i>{{index.walletName}}</i></label>
     <input type="text" id="alias2" type="text" name="alias2" ng-model="prefAlias.alias">
-    <input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
+    <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}">
   </form>
 <p class="text-gray text-center columns size-14"> Changing wallet alias only afects the local wallet name.

public/views/preferencesBwsUrl.html

@@ -10,7 +10,7 @@
   <form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
     <label>Bitcore Wallet Service URL</label>
     <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
-    <input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
+    <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}">
   </form>
 </div>

public/views/preferencesDeleteWallet.html

@@ -14,7 +14,7 @@
   </div>
   <div class="columns text-center m10t">
     <p translate class="size-14 text-gray">Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED</p>
-    <button class="button expand warning" ng-click="preferences.deleteWallet()" translate>
+    <button class="button round expand warning" ng-click="preferences.deleteWallet()" translate>
       Delete wallet
     </button>
   </div>

public/views/walletHome.html

@@ -12,7 +12,7 @@
     <button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
 
     <div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
-      <button class=" outline dark-gray tiny" translate> Preferences </button>
+      <button class=" outline round dark-gray tiny" translate> Preferences </button>
     </div>
   </div>
 
@@ -105,7 +105,7 @@
             ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}
           </div>
           <div class="right">
-            <a ng-click="$root.go('preferences')" class="button outline light-gray tiny m0">
+            <a ng-click="$root.go('preferences')" class="button outline round light-gray tiny preferences-icon m0">
               <i class="fi-widget size-18 vm"></i>
               <span class="show-for-medium-up" translate>Preferences</span>
             </a>
@@ -143,7 +143,7 @@
           This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
         </div>
         <div class="text-center m10t ">
-          <span class="button outline dark-gray tiny"
+          <span class="button outline round dark-gray tiny"
             ng-click="index.recreate()">
             <span translate>Recreate</span>
           </span>
@@ -195,13 +195,13 @@
         </div>
 
         <div class="small-6 columns m20t">
-          <span class="button expand outline dark-gray tiny"
+          <span class="button expand outline round dark-gray tiny"
             ng-click="home.skipBackup = true">
             <span translate>SKIP BACKUP</span>
           </span>
         </div>
         <div class="small-6 columns m20t">
-          <span class="button black expand radius tiny"
+          <span class="button black expand round tiny"
             ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" >
             <span translate>Backup now</span>
           </span>
@@ -236,7 +236,7 @@
             </div>
 
             <div class="m10t text-center" ng-show="index.isCordova">
-              <span class="button outline dark-gray tiny"
+              <span class="button outline dark-gray tiny round"
                 ng-click="home.shareAddress(home.addr)">
                 <i class="fi-share"></i>
                 <span translate>Share address</span>
@@ -249,7 +249,7 @@
         </div>
         <div class="row m20t">
           <div class="large-12 columns">
-            <button class="button black expand radius" ng-click="home.setNewAddress()"
+            <button class="button black expand round" ng-click="home.setNewAddress()"
               ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
               Generate new address
             </button>
@@ -378,10 +378,10 @@
 
             <div class="row" ng-show="!home.onGoingProcess">
               <div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress)">
-                <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray" translate>Cancel</a>
+                <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
               </div>
               <div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress)}">
-                <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || home.blockUx ||  index.isOffline"
+                <button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx ||  index.isOffline"
                   ng-style="{'background-color':index.backgroundColor}"  translate>
                   Send
                 </button>
@@ -449,7 +449,7 @@
           </div>
         </div>
         <div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
-          <button class="outline light-gray small expand m0"
+          <button class="outline light-gray round small expand m0"
             ng-click="index.updateTxHistory(index.skipHistory)"
             ng-if="!index.updatingTxHistory">
             <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>

src/css/main.css

@@ -610,7 +610,6 @@ table tbody tr:last-child td {
 button.outline,
 button.outline:hover,
 button.outline:focus {
-  border-radius: 3px;
   background: transparent;
 }
 
@@ -620,7 +619,6 @@ button.outline:focus {
 button.outline.tiny,
 button.outline.tiny:hover,
 button.outline.tiny:focus {
-  border-radius: 3px;
   background: transparent;
 }
 
@@ -662,7 +660,6 @@ button.secondary:focus,
 .button.secondary:focus {
   background-color: #008CC1;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* PRIMARY */
@@ -674,7 +671,6 @@ button.primary:focus,
 .button.primary:focus {
   background-color: #1ABC9C;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* WARNING */
@@ -686,7 +682,6 @@ button.warning:focus,
 .button.warning:focus {
   background-color: #ED4A43;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* WHITE */
@@ -710,6 +705,10 @@ button.gray,
   color: #2C3E50;
 }
 
+button.disabled, button[disabled], .button.disabled, .button[disabled] {
+  border-color: transparent;
+}
+
 button.disabled.black,
 button[disabled].black,
 .button.disabled.black,
@@ -1138,6 +1137,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   cursor: pointer !important;
 }
 
+.preferences-icon {
+  padding: 0.6rem 0.8rem !important;
+}
+
 .passModal {
   background: #FFFFFF;
   box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50);

src/css/mobile.css

@@ -256,6 +256,7 @@ a.missing-copayers {
 
 .button, button {
   padding: 1rem 1.2rem 1.0625rem;
+  border: 1px solid transparent;
 }
 
 .box-setup {

src/js/services/notificationsService.js

@@ -52,7 +52,7 @@ angular.module('copayApp.services')
 
       var config = configService.getSync();
       config.colorFor = config.colorFor || {};
-      var color = config.colorFor[walletId] || '#2C3E50';
+      var color = config.colorFor[walletId] || '#7A8C9E';
       var name = config.aliasFor[walletId] || walletName;
 
       switch (notificationData.type) {